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/H5Olayout.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/H5Olayout.c')
| -rw-r--r-- | src/H5Olayout.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/H5Olayout.c b/src/H5Olayout.c index 4a119ac..e4d6486 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -103,7 +103,7 @@ H5O_layout_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh, unsigned u; void *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_layout_decode) + FUNC_ENTER_NOAPI_NOINIT /* check args */ HDassert(f); @@ -295,7 +295,7 @@ H5O_layout_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const voi unsigned u; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_layout_encode) + FUNC_ENTER_NOAPI_NOINIT /* check args */ HDassert(f); @@ -373,7 +373,7 @@ H5O_layout_copy(const void *_mesg, void *_dest) H5O_layout_t *dest = (H5O_layout_t *) _dest; void *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_layout_copy) + FUNC_ENTER_NOAPI_NOINIT /* check args */ HDassert(mesg); @@ -433,7 +433,7 @@ H5O_layout_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void *_mesg const H5O_layout_t *mesg = (const H5O_layout_t *) _mesg; size_t ret_value; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_layout_size) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* check args */ HDassert(f); @@ -465,7 +465,7 @@ H5O_layout_reset(void *_mesg) { H5O_layout_t *mesg = (H5O_layout_t *)_mesg; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_layout_reset) + FUNC_ENTER_NOAPI_NOINIT_NOERR if(mesg) { /* Free the compact storage buffer */ @@ -498,7 +498,7 @@ H5O_layout_free(void *_mesg) H5O_layout_t *mesg = (H5O_layout_t *) _mesg; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_layout_free) + FUNC_ENTER_NOAPI_NOINIT HDassert(mesg); @@ -531,7 +531,7 @@ H5O_layout_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg) H5O_layout_t *mesg = (H5O_layout_t *) _mesg; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_layout_delete) + FUNC_ENTER_NOAPI_NOINIT /* check args */ HDassert(f); @@ -590,7 +590,7 @@ H5O_layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst, hbool_t copied = FALSE; /* Whether the data was copied */ void *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_layout_copy_file) + FUNC_ENTER_NOAPI_NOINIT /* check args */ HDassert(file_src); @@ -680,7 +680,7 @@ H5O_layout_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, const H5O_layout_t *mesg = (const H5O_layout_t *) _mesg; unsigned u; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_layout_debug) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* check args */ HDassert(f); |