summaryrefslogtreecommitdiffstats
path: root/src/H5Fint.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-12-14 19:19:19 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-12-14 19:19:19 (GMT)
commit61cee5f91a60fa369165f378fe51ca677a300e74 (patch)
tree54a13a6c7d3c46aadb5d75466dc37da58509c11b /src/H5Fint.c
parentddd91a7b1932d7efebcaba60d13beb5f237fc95d (diff)
downloadhdf5-61cee5f91a60fa369165f378fe51ca677a300e74.zip
hdf5-61cee5f91a60fa369165f378fe51ca677a300e74.tar.gz
hdf5-61cee5f91a60fa369165f378fe51ca677a300e74.tar.bz2
[svn-r28646] Minor normalization with revise_chunks.
Also purged obsolete /*ARGSUSED*/ from the library. Tested on: Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1 serial only (these changes have been in revise_chunks for a long time)
Diffstat (limited to 'src/H5Fint.c')
-rw-r--r--src/H5Fint.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/H5Fint.c b/src/H5Fint.c
index c17267d..94a5488 100644
--- a/src/H5Fint.c
+++ b/src/H5Fint.c
@@ -130,7 +130,7 @@ H5F_get_access_plist(H5F_t *f, hbool_t app_ref)
H5FD_driver_prop_t driver_prop; /* Property for driver ID & info */
hbool_t driver_prop_copied = FALSE; /* Whether the driver property has been set up */
unsigned efc_size = 0;
- hid_t ret_value = SUCCEED;
+ hid_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(FAIL)
@@ -1052,6 +1052,7 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id,
if(H5G_mkroot(file, dxpl_id, TRUE) < 0)
HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, NULL, "unable to create/open root group")
} else if (1 == shared->nrefs) {
+
/* Read the superblock if it hasn't been read before. */
if(H5F__super_read(file, dxpl_id) < 0)
HGOTO_ERROR(H5E_FILE, H5E_READERROR, NULL, "unable to read superblock")
@@ -1099,8 +1100,8 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id,
done:
if(!ret_value && file)
- if(H5F_dest(file, dxpl_id, FALSE) < 0)
- HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, NULL, "problems closing file")
+ if(H5F_dest(file, dxpl_id, FALSE) < 0)
+ HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, NULL, "problems closing file")
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5F_open() */