diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2012-02-10 19:48:08 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-02-10 19:48:08 (GMT) |
commit | 5f94d17285913b2497d169cadfb639f300773407 (patch) | |
tree | f4a96b86d8ac5d13411ca897e1377fb2f1808cb3 /src/H5HLcache.c | |
parent | f16098f402139aa4e258542661c3003389803de9 (diff) | |
download | hdf5-5f94d17285913b2497d169cadfb639f300773407.zip hdf5-5f94d17285913b2497d169cadfb639f300773407.tar.gz hdf5-5f94d17285913b2497d169cadfb639f300773407.tar.bz2 |
[svn-r21925] Description:
Bring r21919-21924 from trunk to 1.8 branch: cleanup FUNC_ENTER macros,
etc.
Also removed Subversion mergeinfo tags from a few directories and files.
These are artifacts from non-root merges using pre-1.6 Subversion clients. (This
should fix the problem of unchanged directories looking "changed" during
checkins.)
Tested on:
Mac OSX/64 10.7.3 (amazon) w/debug & production
(daily tested on trunk)
Diffstat (limited to 'src/H5HLcache.c')
-rw-r--r-- | src/H5HLcache.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/H5HLcache.c b/src/H5HLcache.c index 34673d5..aadae11 100644 --- a/src/H5HLcache.c +++ b/src/H5HLcache.c @@ -138,7 +138,7 @@ H5HL_fl_deserialize(H5HL_t *heap) hsize_t free_block; /* Offset of free block */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5HL_fl_deserialize) + FUNC_ENTER_NOAPI_NOINIT /* check arguments */ HDassert(heap); @@ -208,7 +208,7 @@ H5HL_fl_serialize(const H5HL_t *heap) { H5HL_free_t *fl; /* Pointer to heap free list node */ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_fl_serialize) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* check arguments */ HDassert(heap); @@ -258,7 +258,7 @@ H5HL_prefix_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) haddr_t eoa; /* Relative end of file address */ H5HL_prfx_t *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5HL_prefix_load) + FUNC_ENTER_NOAPI_NOINIT /* check arguments */ HDassert(f); @@ -396,7 +396,7 @@ H5HL_prefix_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, uint8_t heap_buf[H5HL_SPEC_READ_SIZE]; /* Buffer for heap */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5HL_prefix_flush) + FUNC_ENTER_NOAPI_NOINIT /* check arguments */ HDassert(f); @@ -497,7 +497,7 @@ H5HL_prefix_dest(H5F_t *f, void *thing) H5HL_prfx_t *prfx = (H5HL_prfx_t *)thing; /* Local heap prefix to destroy */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5HL_prefix_dest) + FUNC_ENTER_NOAPI_NOINIT /* check arguments */ HDassert(prfx); @@ -553,7 +553,7 @@ H5HL_prefix_clear(H5F_t UNUSED *f, void *thing, hbool_t destroy) H5HL_prfx_t *prfx = (H5HL_prfx_t *)thing; /* The local heap prefix to operate on */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5HL_prefix_clear) + FUNC_ENTER_NOAPI_NOINIT /* check arguments */ HDassert(prfx); @@ -589,7 +589,7 @@ H5HL_prefix_size(const H5F_t UNUSED *f, const void *thing, size_t *size_ptr) { const H5HL_prfx_t *prfx = (const H5HL_prfx_t *)thing; /* Pointer to local heap prefix to query */ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_prefix_size) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* check arguments */ HDassert(prfx); @@ -628,7 +628,7 @@ H5HL_datablock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) H5HL_cache_dblk_ud_t *udata = (H5HL_cache_dblk_ud_t *)_udata; /* User data for callback */ H5HL_dblk_t *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5HL_datablock_load) + FUNC_ENTER_NOAPI_NOINIT /* check arguments */ HDassert(f); @@ -694,7 +694,7 @@ H5HL_datablock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HL_dblk_t *dblk = (H5HL_dblk_t *)_thing; /* Pointer to the local heap data block */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5HL_datablock_flush) + FUNC_ENTER_NOAPI_NOINIT /* check arguments */ HDassert(f); @@ -748,7 +748,7 @@ H5HL_datablock_dest(H5F_t *f, void *_thing) H5HL_dblk_t *dblk = (H5HL_dblk_t *)_thing; /* Pointer to the local heap data block */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5HL_datablock_dest) + FUNC_ENTER_NOAPI_NOINIT /* check arguments */ HDassert(dblk); @@ -798,7 +798,7 @@ H5HL_datablock_clear(H5F_t *f, void *_thing, hbool_t destroy) H5HL_dblk_t *dblk = (H5HL_dblk_t *)_thing; /* Pointer to the local heap data block */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5HL_datablock_clear) + FUNC_ENTER_NOAPI_NOINIT /* check arguments */ HDassert(dblk); @@ -834,7 +834,7 @@ H5HL_datablock_size(const H5F_t UNUSED *f, const void *_thing, size_t *size_ptr) { const H5HL_dblk_t *dblk = (const H5HL_dblk_t *)_thing; /* Pointer to the local heap data block */ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_datablock_size) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* check arguments */ HDassert(dblk); |