summaryrefslogtreecommitdiffstats
path: root/src/H5AC.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2012-07-16 19:54:26 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2012-07-16 19:54:26 (GMT)
commit75f4e51a1a076ea2f1602619e2a7d7bcce13c2f1 (patch)
treeb6e08ce3ecbd535ffe74269d7e44c905e19b137d /src/H5AC.c
parent2e3ab09a520ff87ec709b5997273ce7f3b99d9ed (diff)
downloadhdf5-75f4e51a1a076ea2f1602619e2a7d7bcce13c2f1.zip
hdf5-75f4e51a1a076ea2f1602619e2a7d7bcce13c2f1.tar.gz
hdf5-75f4e51a1a076ea2f1602619e2a7d7bcce13c2f1.tar.bz2
[svn-r22582] Description:
Refactor ID class registration to be more like how other "class"s in the library are registered, and clean up compiler warnings. Tested on: Mac OSX/64 10.7.4 (amazon) w/debug (Too minor to require h5comittest)
Diffstat (limited to 'src/H5AC.c')
-rw-r--r--src/H5AC.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5AC.c b/src/H5AC.c
index 51c4ce5..99caf28 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -342,14 +342,14 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
#else /* H5_HAVE_PARALLEL */
- FUNC_ENTER_NOAPI_NOINIT
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
- assert(H5P_LST_DATASET_XFER_g!=(-1));
+ HDassert(H5P_LST_DATASET_XFER_g!=(-1));
- H5AC_dxpl_id=H5P_DATASET_XFER_DEFAULT;
- H5AC_noblock_dxpl_id=H5P_DATASET_XFER_DEFAULT;
- H5AC_ind_dxpl_id=H5P_DATASET_XFER_DEFAULT;
+ H5AC_dxpl_id = H5P_DATASET_XFER_DEFAULT;
+ H5AC_noblock_dxpl_id = H5P_DATASET_XFER_DEFAULT;
+ H5AC_ind_dxpl_id = H5P_DATASET_XFER_DEFAULT;
FUNC_LEAVE_NOAPI(SUCCEED)
#endif /* H5_HAVE_PARALLEL */
@@ -376,7 +376,7 @@ H5AC_term_interface(void)
{
int n = 0;
- FUNC_ENTER_NOAPI_NOINIT
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if (H5_interface_initialize_g) {
#ifdef H5_HAVE_PARALLEL