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/H5CS.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/H5CS.c')
-rw-r--r-- | src/H5CS.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -79,7 +79,7 @@ H5CS_get_stack(void) { H5CS_t *fstack; - FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_get_stack); + FUNC_ENTER_NOAPI_NOERR_NOFS fstack = H5TS_get_thread_local_value(H5TS_funcstk_key_g); if (!fstack) { @@ -123,7 +123,7 @@ H5CS_print_stack(const H5CS_t *fstack, FILE *stream) int i; /* Local index ariable */ /* Don't push this function on the function stack... :-) */ - FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_print_stack); + FUNC_ENTER_NOAPI_NOERR_NOFS /* Sanity check */ HDassert(fstack); @@ -170,7 +170,7 @@ H5CS_print(FILE *stream) H5CS_t *fstack = H5CS_get_my_stack (); /* Get the correct function stack */ /* Don't push this function on the function stack... :-) */ - FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_print); + FUNC_ENTER_NOAPI_NOERR_NOFS /* Sanity check */ assert(fstack); @@ -202,7 +202,7 @@ H5CS_push(const char *func_name) H5CS_t *fstack = H5CS_get_my_stack (); /* Don't push this function on the function stack... :-) */ - FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_push); + FUNC_ENTER_NOAPI_NOERR_NOFS /* Sanity check */ assert (fstack); @@ -239,7 +239,7 @@ H5CS_pop(void) H5CS_t *fstack = H5CS_get_my_stack (); /* Don't push this function on the function stack... :-) */ - FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_pop); + FUNC_ENTER_NOAPI_NOERR_NOFS /* Sanity check */ assert (fstack); @@ -273,7 +273,7 @@ H5CS_copy_stack(H5CS_t *new_stack) unsigned u; /* Local index variable */ /* Don't push this function on the function stack... :-) */ - FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_copy_stack); + FUNC_ENTER_NOAPI_NOERR_NOFS /* Sanity check */ HDassert (old_stack); @@ -307,7 +307,7 @@ H5CS_close_stack(H5CS_t *stack) unsigned u; /* Local index variable */ /* Don't push this function on the function stack... :-) */ - FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_close_stack); + FUNC_ENTER_NOAPI_NOERR_NOFS /* Sanity check */ HDassert (stack); |