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/H5HFdbg.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/H5HFdbg.c')
| -rw-r--r-- | src/H5HFdbg.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5HFdbg.c b/src/H5HFdbg.c index 151ab7b..1709231 100644 --- a/src/H5HFdbg.c +++ b/src/H5HFdbg.c @@ -115,7 +115,7 @@ static herr_t H5HF_dtable_debug(H5HF_dtable_t *dtable, FILE *stream, static herr_t H5HF_dtable_debug(H5HF_dtable_t *dtable, FILE *stream, int indent, int fwidth) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dtable_debug) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* * Check arguments. @@ -190,7 +190,7 @@ H5HF_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, H5HF_hdr_t *hdr = NULL; /* Fractal heap header info */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5HF_hdr_debug, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* * Check arguments. @@ -310,7 +310,7 @@ H5HF_dblock_debug_cb(const H5FS_section_info_t *_sect, void *_udata) haddr_t sect_start, sect_end; /* Section's beginning and ending offsets */ haddr_t dblock_start, dblock_end; /* Direct block's beginning and ending offsets */ - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dblock_debug_cb) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* * Check arguments. @@ -397,7 +397,7 @@ H5HF_dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, uint8_t *marker = NULL; /* Track free space for block */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5HF_dblock_debug, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* * Check arguments. @@ -527,7 +527,7 @@ H5HF_iblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, size_t u, v; /* Local index variable */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5HF_iblock_debug, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* * Check arguments. @@ -656,7 +656,7 @@ H5HF_sects_debug_cb(const H5FS_section_info_t *_sect, void *_udata) H5HF_debug_iter_ud2_t *udata = (H5HF_debug_iter_ud2_t *)_udata; /* User data for callbacks */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5HF_sects_debug_cb) + FUNC_ENTER_NOAPI_NOINIT /* * Check arguments. @@ -711,7 +711,7 @@ H5HF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr, H5HF_hdr_t *hdr = NULL; /* Fractal heap header info */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5HF_sects_debug, FAIL) + FUNC_ENTER_NOAPI(FAIL) /* * Check arguments. |