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/H5Orefcount.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/H5Orefcount.c')
| -rw-r--r-- | src/H5Orefcount.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5Orefcount.c b/src/H5Orefcount.c index e3c6981..399c8da 100644 --- a/src/H5Orefcount.c +++ b/src/H5Orefcount.c @@ -96,7 +96,7 @@ H5O_refcount_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh H5O_refcount_t *refcount = NULL; /* Reference count */ void *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_refcount_decode) + FUNC_ENTER_NOAPI_NOINIT /* check args */ HDassert(f); @@ -142,7 +142,7 @@ H5O_refcount_encode(H5F_t UNUSED *f, hbool_t UNUSED disable_shared, uint8_t *p, { const H5O_refcount_t *refcount = (const H5O_refcount_t *)_mesg; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_refcount_encode) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* check args */ HDassert(f); @@ -181,7 +181,7 @@ H5O_refcount_copy(const void *_mesg, void *_dest) H5O_refcount_t *dest = (H5O_refcount_t *) _dest; void *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_refcount_copy) + FUNC_ENTER_NOAPI_NOINIT /* check args */ HDassert(refcount); @@ -221,7 +221,7 @@ H5O_refcount_size(const H5F_t UNUSED *f, hbool_t UNUSED disable_shared, { size_t ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_refcount_size) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Set return value */ ret_value = 1 /* Version */ @@ -246,7 +246,7 @@ H5O_refcount_size(const H5F_t UNUSED *f, hbool_t UNUSED disable_shared, static herr_t H5O_refcount_free(void *mesg) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_refcount_free) + FUNC_ENTER_NOAPI_NOINIT_NOERR HDassert(mesg); @@ -274,7 +274,7 @@ static herr_t H5O_refcount_pre_copy_file(H5F_t UNUSED *file_src, const void UNUSED *native_src, hbool_t *deleted, const H5O_copy_t UNUSED *cpy_info, void UNUSED *udata) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_refcount_pre_copy_file) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* check args */ HDassert(deleted); @@ -308,7 +308,7 @@ H5O_refcount_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FIL { const H5O_refcount_t *refcount = (const H5O_refcount_t *) _mesg; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_refcount_debug) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* check args */ HDassert(f); |