summaryrefslogtreecommitdiffstats
path: root/src/H5HLint.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2012-03-21 15:10:17 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2012-03-21 15:10:17 (GMT)
commiteb89d7b53ab95623ab454186a602e1cafc7391f0 (patch)
treeceafe458b3011e38853e765352d3c7e59bbecce1 /src/H5HLint.c
parent3e468e6ff65d540a439e99ea568a6bff7add7cea (diff)
downloadhdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.zip
hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.tar.gz
hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.tar.bz2
[svn-r22105] Description:
Bring r20557:22085 from trunk to this branch, also fixing some other issues/failures in the branch simultaneously. The h5repack tests are still failing, but Neil will be checking into those, so the branch can be fully functional again. Tested on: Mac OSX/64 10.7.3 (amazon) w/debug
Diffstat (limited to 'src/H5HLint.c')
-rw-r--r--src/H5HLint.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/H5HLint.c b/src/H5HLint.c
index c6d6839..d5238eb 100644
--- a/src/H5HLint.c
+++ b/src/H5HLint.c
@@ -104,7 +104,7 @@ H5HL_new(size_t sizeof_size, size_t sizeof_addr, size_t prfx_size)
H5HL_t *heap = NULL; /* New local heap */
H5HL_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_new, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check arguments */
HDassert(sizeof_size > 0);
@@ -145,7 +145,7 @@ done:
static herr_t
H5HL_inc_rc(H5HL_t *heap)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_inc_rc)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(heap);
@@ -174,7 +174,7 @@ H5HL_inc_rc(H5HL_t *heap)
static herr_t
H5HL_dec_rc(H5HL_t *heap)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_dec_rc)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(heap);
@@ -206,7 +206,7 @@ H5HL_dec_rc(H5HL_t *heap)
herr_t
H5HL_dest(H5HL_t *heap)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5HL_dest)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(heap);
@@ -252,7 +252,7 @@ H5HL_prfx_new(H5HL_t *heap)
H5HL_prfx_t *prfx = NULL; /* New local heap prefix */
H5HL_prfx_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_prfx_new, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check arguments */
HDassert(heap);
@@ -296,7 +296,7 @@ H5HL_prfx_dest(H5HL_prfx_t *prfx)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_prfx_dest, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(prfx);
@@ -342,7 +342,7 @@ H5HL_dblk_new(H5HL_t *heap)
H5HL_dblk_t *dblk = NULL; /* New local heap data block */
H5HL_dblk_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_dblk_new, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check arguments */
HDassert(heap);
@@ -386,7 +386,7 @@ H5HL_dblk_dest(H5HL_dblk_t *dblk)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_dblk_dest, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(dblk);