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/H5Goh.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/H5Goh.c')
| -rw-r--r-- | src/H5Goh.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5Goh.c b/src/H5Goh.c index fc7a1df..d306836 100644 --- a/src/H5Goh.c +++ b/src/H5Goh.c @@ -108,7 +108,7 @@ H5O_group_get_copy_file_udata(void) { void *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_group_get_copy_file_udata) + FUNC_ENTER_NOAPI_NOINIT /* Allocate space for the 'copy file' user data for copying groups. * Currently this is only a ginfo, so there is no specific struct type for @@ -139,7 +139,7 @@ H5O_group_free_copy_file_udata(void *_udata) { H5G_copy_file_ud_t *udata = (H5G_copy_file_ud_t *)_udata; - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_group_free_copy_file_udata) + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Sanity check */ HDassert(udata); @@ -178,7 +178,7 @@ H5O_group_isa(struct H5O_t *oh) htri_t linfo_exists; /* Whether the 'linfo' message is in the object header */ htri_t ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_group_isa) + FUNC_ENTER_NOAPI_NOINIT HDassert(oh); @@ -214,7 +214,7 @@ H5O_group_open(const H5G_loc_t *obj_loc, hid_t UNUSED lapl_id, hid_t dxpl_id, hb H5G_t *grp = NULL; /* Group opened */ hid_t ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_group_open) + FUNC_ENTER_NOAPI_NOINIT HDassert(obj_loc); @@ -255,7 +255,7 @@ H5O_group_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id) H5G_t *grp = NULL; /* New group created */ void *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_group_create) + FUNC_ENTER_NOAPI_NOINIT /* Sanity checks */ HDassert(f); @@ -303,7 +303,7 @@ H5O_group_get_oloc(hid_t obj_id) H5G_t *grp; /* Group opened */ H5O_loc_t *ret_value; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT(H5O_group_get_oloc) + FUNC_ENTER_NOAPI_NOINIT /* Get the group */ if(NULL == (grp = (H5G_t *)H5I_object(obj_id))) @@ -340,7 +340,7 @@ H5O_group_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info) H5B2_t *bt2_corder = NULL; /* v2 B-tree handle for creation order index */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI_NOINIT_TAG(H5O_group_bh_info, dxpl_id, oh->cache_info.addr, FAIL) + FUNC_ENTER_NOAPI_NOINIT_TAG(dxpl_id, oh->cache_info.addr, FAIL) /* Sanity check */ HDassert(f); |