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/H5Ocont.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/H5Ocont.c')
-rw-r--r-- | src/H5Ocont.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/H5Ocont.c b/src/H5Ocont.c index 8ba22cc..b609bfd 100644 --- a/src/H5Ocont.c +++ b/src/H5Ocont.c @@ -96,7 +96,7 @@ H5O_cont_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh, H5O_cont_t *cont = NULL; void *ret_value; - FUNC_ENTER_NOAPI_NOINIT(H5O_cont_decode) + FUNC_ENTER_NOAPI_NOINIT /* check args */ HDassert(f); @@ -137,7 +137,7 @@ H5O_cont_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const void { const H5O_cont_t *cont = (const H5O_cont_t *) _mesg; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_cont_encode) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* check args */ HDassert(f); @@ -176,7 +176,7 @@ H5O_cont_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void UNUSED * { size_t ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_cont_size) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Set return value */ ret_value = H5F_SIZEOF_ADDR(f) + /* Continuation header address */ @@ -201,7 +201,7 @@ H5O_cont_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void UNUSED * static herr_t H5O_cont_free(void *mesg) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_cont_free) + FUNC_ENTER_NOAPI_NOINIT_NOERR HDassert(mesg); @@ -229,7 +229,7 @@ H5O_cont_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg) H5O_cont_t *mesg = (H5O_cont_t *) _mesg; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_cont_delete) + FUNC_ENTER_NOAPI_NOINIT /* check args */ HDassert(f); @@ -266,7 +266,7 @@ H5O_cont_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE * { const H5O_cont_t *cont = (const H5O_cont_t *) _mesg; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_cont_debug) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* check args */ HDassert(f); |