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/H5Fsuper_cache.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/H5Fsuper_cache.c')
| -rw-r--r-- | src/H5Fsuper_cache.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Fsuper_cache.c b/src/H5Fsuper_cache.c index 834c1c5..a437451 100644 --- a/src/H5Fsuper_cache.c +++ b/src/H5Fsuper_cache.c @@ -129,7 +129,7 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, void *_udata) hbool_t *dirtied = (hbool_t *)_udata; /* Set up dirtied out value */ H5F_super_t *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5F_sblock_load) + FUNC_ENTER_NOAPI_NOINIT /* check arguments */ HDassert(f); @@ -599,7 +599,7 @@ H5F_sblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t UNUSED addr, { herr_t ret_value = SUCCEED; - FUNC_ENTER_NOAPI_NOINIT(H5F_sblock_flush) + FUNC_ENTER_NOAPI_NOINIT /* check arguments */ HDassert(f); @@ -797,7 +797,7 @@ H5F_sblock_dest(H5F_t UNUSED *f, H5F_super_t* sblock) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5F_sblock_dest) + FUNC_ENTER_NOAPI_NOINIT /* Sanity check */ HDassert(sblock); @@ -828,7 +828,7 @@ H5F_sblock_clear(H5F_t *f, H5F_super_t *sblock, hbool_t destroy) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5F_sblock_clear) + FUNC_ENTER_NOAPI_NOINIT /* * Check arguments. @@ -862,7 +862,7 @@ done: static herr_t H5F_sblock_size(const H5F_t *f, const H5F_super_t *sblock, size_t *size_ptr) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sblock_size) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* check arguments */ HDassert(f); |