summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2014-07-21 17:50:47 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2014-07-21 17:50:47 (GMT)
commit65aed6681bd788ca5fef80c8aa9242ae7915d00f (patch)
treed8a61b72af9e480b3bc63e66876d6fcc77cc1dcf /src
parentd4b53e37e12e4e2406953c504c6ec6915a771124 (diff)
downloadhdf5-65aed6681bd788ca5fef80c8aa9242ae7915d00f.zip
hdf5-65aed6681bd788ca5fef80c8aa9242ae7915d00f.tar.gz
hdf5-65aed6681bd788ca5fef80c8aa9242ae7915d00f.tar.bz2
[svn-r25454] Description:
Bring change from trunk to 1.8 branch: r25450: Initial tweaks to align with VOL branch. Tested on: Mac OSX/64 10.9.3 (amazon) w/gcc 4.9 (h5committest not required, too small)
Diffstat (limited to 'src')
-rw-r--r--src/H5Fefc.c7
-rw-r--r--src/H5Ipublic.h4
2 files changed, 5 insertions, 6 deletions
diff --git a/src/H5Fefc.c b/src/H5Fefc.c
index 08d27a1..9916002 100644
--- a/src/H5Fefc.c
+++ b/src/H5Fefc.c
@@ -36,7 +36,6 @@
#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
-
/* Special values for the "tag" field below */
#define H5F_EFC_TAG_DEFAULT -1
#define H5F_EFC_TAG_LOCK -2
@@ -164,7 +163,7 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id,
* on the state of the efc. */
if(!efc) {
if(NULL == (ret_value = H5F_open(name, flags, fcpl_id, fapl_id,
- dxpl_id)))
+ dxpl_id)))
HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "can't open file")
/* Increment the number of open objects to prevent the file from being
@@ -237,7 +236,7 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id,
else {
/* Cannot cache file, just open file and return */
if(NULL == (ret_value = H5F_open(name, flags, fcpl_id, fapl_id,
- dxpl_id)))
+ dxpl_id)))
HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "can't open file")
/* Increment the number of open objects to prevent the file from
@@ -259,7 +258,7 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id,
/* Open the file */
if(NULL == (ent->file = H5F_open(name, flags, fcpl_id, fapl_id,
- dxpl_id)))
+ dxpl_id)))
HGOTO_ERROR(H5E_FILE, H5E_CANTOPENFILE, NULL, "can't open file")
open_file = TRUE;
diff --git a/src/H5Ipublic.h b/src/H5Ipublic.h
index d630556..5160434 100644
--- a/src/H5Ipublic.h
+++ b/src/H5Ipublic.h
@@ -36,8 +36,8 @@
typedef enum H5I_type_t {
H5I_UNINIT = (-2), /*uninitialized type */
H5I_BADID = (-1), /*invalid Type */
- H5I_FILE = 1, /*type ID for File objects */
- H5I_GROUP, /*type ID for Group objects */
+ H5I_FILE = 1, /*type ID for File objects */
+ H5I_GROUP, /*type ID for Group objects */
H5I_DATATYPE, /*type ID for Datatype objects */
H5I_DATASPACE, /*type ID for Dataspace objects */
H5I_DATASET, /*type ID for Dataset objects */