summaryrefslogtreecommitdiffstats
path: root/src/H5SMtest.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2009-11-14 05:07:27 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2009-11-14 05:07:27 (GMT)
commitb6e30d9c7951829b16e6b56a0fdc8eacc72b0c48 (patch)
tree2fa0da529498a379248304b59415184d0b641d7f /src/H5SMtest.c
parent437b17f2b45d4b1afb9606ae444338b5abd40b79 (diff)
downloadhdf5-b6e30d9c7951829b16e6b56a0fdc8eacc72b0c48.zip
hdf5-b6e30d9c7951829b16e6b56a0fdc8eacc72b0c48.tar.gz
hdf5-b6e30d9c7951829b16e6b56a0fdc8eacc72b0c48.tar.bz2
[svn-r17892] Decription:
Bring r17891 from trunk to 1.8 branch: Switch the shared object header messages code to use the refactored v2 B-tree routines. (this should be the interface that is using them) Tested on: FreeBSD/32 6.3 (duty) in debug mode (h5committested on trunk)
Diffstat (limited to 'src/H5SMtest.c')
-rw-r--r--src/H5SMtest.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5SMtest.c b/src/H5SMtest.c
index 8412a89..582bc0e 100644
--- a/src/H5SMtest.c
+++ b/src/H5SMtest.c
@@ -95,7 +95,7 @@ H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id,
/* Look up the master SOHM table */
if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, NULL, NULL, H5AC_READ)))
- HGOTO_ERROR(H5E_CACHE, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
+ HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
/* Find the correct index for this message type */
if((index_num = H5SM_get_index(table, type_id)) < 0)
@@ -112,7 +112,7 @@ H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id,
done:
/* Release resources */
if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, f->shared->sohm_addr, table, H5AC__NO_FLAGS_SET) < 0)
- HDONE_ERROR(H5E_CACHE, H5E_CANTRELEASE, FAIL, "unable to close SOHM master table")
+ HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5SM_get_mesg_count_test() */