diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2014-11-17 22:21:40 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2014-11-17 22:21:40 (GMT) |
| commit | fc31e90ca50fa6792a838e4debbce8f3f6fb044a (patch) | |
| tree | 3aa2a9e5fce3d751bf0ae0cb262d6ba5281c371c /src/H5Fefc.c | |
| parent | 44c62d3d0a549a6e63dc900d4aa251b5b764d14b (diff) | |
| download | hdf5-fc31e90ca50fa6792a838e4debbce8f3f6fb044a.zip hdf5-fc31e90ca50fa6792a838e4debbce8f3f6fb044a.tar.gz hdf5-fc31e90ca50fa6792a838e4debbce8f3f6fb044a.tar.bz2 | |
[svn-r25819] Bring revisions #25440 - #25484 from trunk to revise_chunks.
h5committested.
(Revision #25439 is skipped because it was backed out later on 11/3/2104.)
Diffstat (limited to 'src/H5Fefc.c')
| -rw-r--r-- | src/H5Fefc.c | 7 |
1 files changed, 3 insertions, 4 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; |