summaryrefslogtreecommitdiffstats
path: root/src/H5SMtest.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2011-07-21 14:57:40 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2011-07-21 14:57:40 (GMT)
commit400e415d76fb1a64cb15fe013299707f194b34a0 (patch)
tree7cefd75d68a2829bb515a1ca7b9327089c2f7004 /src/H5SMtest.c
parenta42f3b9ddaca2f2d566f38bebdd419a3c941669a (diff)
downloadhdf5-400e415d76fb1a64cb15fe013299707f194b34a0.zip
hdf5-400e415d76fb1a64cb15fe013299707f194b34a0.tar.gz
hdf5-400e415d76fb1a64cb15fe013299707f194b34a0.tar.bz2
[svn-r21136] Description:
Bring r21135 from trunk to 1.8 branch: More code cleanups to reduce coupling with the H5F package. Tested on: FreeBSD/32 8.2 (loyalty) w/gcc4.6, w/C++ & FORTRAN, in debug mode (h5committested on trunk)
Diffstat (limited to 'src/H5SMtest.c')
-rw-r--r--src/H5SMtest.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5SMtest.c b/src/H5SMtest.c
index a22e9cc..d754f62 100644
--- a/src/H5SMtest.c
+++ b/src/H5SMtest.c
@@ -17,7 +17,6 @@
/* Module Setup */
/****************/
-#define H5F_PACKAGE /*suppress error about including H5Fpkg */
#define H5SM_PACKAGE /*suppress error about including H5SMpkg */
#define H5SM_TESTING /*suppress warning about H5SM testing funcs*/
@@ -28,7 +27,8 @@
#include "H5private.h" /* Generic Functions */
#include "H5ACprivate.h" /* Metadata cache */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Fpkg.h" /* File access */
+#include "H5Fprivate.h" /* File access */
+#include "H5FLprivate.h" /* Free Lists */
#include "H5SMpkg.h" /* Shared object header messages */
@@ -89,7 +89,7 @@ H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id,
HDassert(mesg_count);
/* Check for shared messages being enabled */
- if(H5F_addr_defined(f->shared->sohm_addr)) {
+ if(H5F_addr_defined(H5F_SOHM_ADDR(f))) {
H5SM_index_header_t *header; /* Index header for message type */
H5SM_table_cache_ud_t cache_udata; /* User-data for callback */
ssize_t index_num; /* Table index for message type */
@@ -98,7 +98,7 @@ H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id,
cache_udata.f = f;
/* 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, &cache_udata, H5AC_READ)))
+ if(NULL == (table = (H5SM_master_table_t *)H5AC_protect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), &cache_udata, H5AC_READ)))
HGOTO_ERROR(H5E_SOHM, H5E_CANTPROTECT, FAIL, "unable to load SOHM master table")
/* Find the correct index for this message type */
@@ -115,7 +115,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)
+ if(table && H5AC_unprotect(f, dxpl_id, H5AC_SOHM_TABLE, H5F_SOHM_ADDR(f), table, H5AC__NO_FLAGS_SET) < 0)
HDONE_ERROR(H5E_SOHM, H5E_CANTUNPROTECT, FAIL, "unable to close SOHM master table")
FUNC_LEAVE_NOAPI(ret_value)