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/H5Toffset.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/H5Toffset.c')
-rw-r--r-- | src/H5Toffset.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Toffset.c b/src/H5Toffset.c index 17351f4..bea8d2b 100644 --- a/src/H5Toffset.c +++ b/src/H5Toffset.c @@ -49,7 +49,7 @@ DESCRIPTION static herr_t H5T_init_offset_interface(void) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_offset_interface) + FUNC_ENTER_NOAPI_NOINIT_NOERR FUNC_LEAVE_NOAPI(H5T_init()) } /* H5T_init_offset_interface() */ @@ -90,7 +90,7 @@ H5Tget_offset(hid_t type_id) H5T_t *dt; int ret_value; - FUNC_ENTER_API(H5Tget_offset, -1) + FUNC_ENTER_API(-1) H5TRACE1("Is", "i", type_id); /* Check args */ @@ -140,7 +140,7 @@ H5T_get_offset(const H5T_t *dt) { int ret_value; - FUNC_ENTER_NOAPI(H5T_get_offset, -1) + FUNC_ENTER_NOAPI(-1) /* Defer to parent*/ while(dt->shared->parent) @@ -201,7 +201,7 @@ H5Tset_offset(hid_t type_id, size_t offset) H5T_t *dt; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Tset_offset, FAIL) + FUNC_ENTER_API(FAIL) H5TRACE2("e", "iz", type_id, offset); /* Check args */ @@ -269,7 +269,7 @@ H5T_set_offset(const H5T_t *dt, size_t offset) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5T_set_offset, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* Check args */ assert(dt); |