summaryrefslogtreecommitdiffstats
path: root/src/H5Fsuper.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-12-19 05:45:56 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-12-19 05:45:56 (GMT)
commitcccd3d26d61348db189ec262548fab26f062a427 (patch)
treeae599a7ab23d0330d1d92e85551c058ec42ba0cd /src/H5Fsuper.c
parent856b2e2c259e94516c9b04e57368018fd44f58cf (diff)
downloadhdf5-cccd3d26d61348db189ec262548fab26f062a427.zip
hdf5-cccd3d26d61348db189ec262548fab26f062a427.tar.gz
hdf5-cccd3d26d61348db189ec262548fab26f062a427.tar.bz2
[svn-r18038] Description:
Bring r18037 from trunk to 1.8 branch: Bring r18035 from merge_metadata_journaling branch to trunk: More "brush clearing" convergence between metadata_journaling branch and the trunk. Tested on: Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x, w/C++ & FORTRAN, in production mode (h5committested on trunk)
Diffstat (limited to 'src/H5Fsuper.c')
-rw-r--r--src/H5Fsuper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index 8bbf333..16139de 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -264,7 +264,7 @@ H5F_super_ext_close(H5F_t *f, H5O_loc_t *ext_ptr)
/* Twiddle the number of open objects to avoid closing the file. */
f->nopen_objs++;
if(H5O_close(ext_ptr) < 0)
- HGOTO_ERROR(H5E_OHDR, H5E_CANTCLOSEOBJ, FAIL, "unable to close superblock extension")
+ HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEOBJ, FAIL, "unable to close superblock extension")
f->nopen_objs--;
done:
@@ -528,7 +528,7 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id)
* extension.
*/
if(H5F_super_ext_create(f, dxpl_id, &ext_loc) < 0)
- HGOTO_ERROR(H5E_FILE, H5E_CANTRELEASE, FAIL, "unable to start file's superblock extension")
+ HGOTO_ERROR(H5E_FILE, H5E_CANTCREATE, FAIL, "unable to create superblock extension")
/* Create the Shared Object Header Message table and register it with
* the metadata cache, if this file supports shared messages.