diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2012-02-09 03:13:27 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-02-09 03:13:27 (GMT) |
commit | 9c9ee2008c10801c11bce8563894d9a30ba9a959 (patch) | |
tree | c2b89df08fa3895d3fae1a4ad87353f9aabee598 /src/H5HFiter.c | |
parent | eb0e5f8c4ea29e674c97a8be048814e26379d4c1 (diff) | |
download | hdf5-9c9ee2008c10801c11bce8563894d9a30ba9a959.zip hdf5-9c9ee2008c10801c11bce8563894d9a30ba9a959.tar.gz hdf5-9c9ee2008c10801c11bce8563894d9a30ba9a959.tar.bz2 |
[svn-r21919] Description:
Refactor function name macros and simplify the FUNC_ENTER macros, to clear
away the cruft and prepare for further cleanups.
Tested on:
Mac OSX/64 10.7.3 (amazon) w/debug, production & parallel
Diffstat (limited to 'src/H5HFiter.c')
-rw-r--r-- | src/H5HFiter.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/H5HFiter.c b/src/H5HFiter.c index f7178a1..0f2f7a4 100644 --- a/src/H5HFiter.c +++ b/src/H5HFiter.c @@ -95,7 +95,7 @@ H5FL_DEFINE(H5HF_block_loc_t); herr_t H5HF_man_iter_init(H5HF_block_iter_t *biter) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_man_iter_init) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* * Check arguments. @@ -138,7 +138,7 @@ H5HF_man_iter_start_offset(H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t root_block = TRUE; /* Flag to indicate the current block is the root indirect block */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iter_start_offset) + FUNC_ENTER_NOAPI_NOINIT /* * Check arguments. @@ -281,7 +281,7 @@ done: herr_t H5HF_man_iter_set_entry(const H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, unsigned entry) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_man_iter_set_entry) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* * Check arguments. @@ -318,7 +318,7 @@ H5HF_man_iter_start_entry(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, H5HF_block_loc_t *new_loc = NULL; /* Pointer to new block location */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iter_start_entry) + FUNC_ENTER_NOAPI_NOINIT /* * Check arguments. @@ -376,7 +376,7 @@ H5HF_man_iter_reset(H5HF_block_iter_t *biter) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iter_reset) + FUNC_ENTER_NOAPI_NOINIT /* * Check arguments. @@ -434,7 +434,7 @@ done: herr_t H5HF_man_iter_next(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, unsigned nentries) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_man_iter_next) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* * Check arguments. @@ -473,7 +473,7 @@ H5HF_man_iter_up(H5HF_block_iter_t *biter) H5HF_block_loc_t *up_loc; /* Pointer to 'up' block location */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iter_up) + FUNC_ENTER_NOAPI_NOINIT /* * Check arguments. @@ -521,7 +521,7 @@ H5HF_man_iter_down(H5HF_block_iter_t *biter, H5HF_indirect_t *iblock) H5HF_block_loc_t *down_loc = NULL; /* Pointer to new 'down' block location */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iter_down) + FUNC_ENTER_NOAPI_NOINIT /* * Check arguments. @@ -574,7 +574,7 @@ herr_t H5HF_man_iter_curr(H5HF_block_iter_t *biter, unsigned *row, unsigned *col, unsigned *entry, H5HF_indirect_t **block) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_man_iter_curr) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* * Check arguments. @@ -614,7 +614,7 @@ H5HF_man_iter_offset(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, hsize_t *offset) { hsize_t curr_offset; /* For computing offset in heap */ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_man_iter_offset) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* * Check arguments. @@ -652,7 +652,7 @@ H5HF_man_iter_offset(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, hsize_t *offset) hbool_t H5HF_man_iter_ready(H5HF_block_iter_t *biter) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_man_iter_ready) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* * Check arguments. |