summaryrefslogtreecommitdiffstats
path: root/src/H5I.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2012-02-09 03:13:27 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2012-02-09 03:13:27 (GMT)
commit9c9ee2008c10801c11bce8563894d9a30ba9a959 (patch)
treec2b89df08fa3895d3fae1a4ad87353f9aabee598 /src/H5I.c
parenteb0e5f8c4ea29e674c97a8be048814e26379d4c1 (diff)
downloadhdf5-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/H5I.c')
-rw-r--r--src/H5I.c88
1 files changed, 44 insertions, 44 deletions
diff --git a/src/H5I.c b/src/H5I.c
index 8e024ff..09d5dde 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -147,7 +147,7 @@ DESCRIPTION
static herr_t
H5I_init_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5I_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5I_init_interface() */
@@ -176,7 +176,7 @@ H5I_term_interface(void)
H5I_type_t type;
int n = 0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5I_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(H5_interface_initialize_g) {
/* How many types are still being used? */
@@ -228,7 +228,7 @@ H5Iregister_type(size_t hash_size, unsigned reserved, H5I_free_t free_func)
{
H5I_type_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Iregister_type, H5I_BADID)
+ FUNC_ENTER_API(H5I_BADID)
H5TRACE3("It", "zIux", hash_size, reserved, free_func);
/* Call H5I_register_type with a value of 0 to get a new type */
@@ -270,7 +270,7 @@ H5I_register_type(H5I_type_t type_id, size_t hash_size, unsigned reserved,
H5I_id_type_t *type_ptr = NULL; /*ptr to the atomic type*/
H5I_type_t ret_value = H5I_BADID; /* type ID to return */
- FUNC_ENTER_NOAPI(H5I_register_type, H5I_BADID)
+ FUNC_ENTER_NOAPI(H5I_BADID)
/* Check that type_id is either a library type or zero */
if(type_id < 0 || type_id >= H5I_NTYPES)
@@ -371,7 +371,7 @@ H5Itype_exists(H5I_type_t type)
{
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_API(H5Itype_exists, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("t", "It", type);
if(type <= H5I_BADID || type >= H5I_next_type)
@@ -407,7 +407,7 @@ H5Inmembers(H5I_type_t type, hsize_t *num_members)
{
int ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Inmembers, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "It*h", type, num_members);
if(H5I_IS_LIB_TYPE(type))
@@ -457,7 +457,7 @@ H5I_nmembers(H5I_type_t type)
H5I_id_type_t *type_ptr = NULL;
int ret_value;
- FUNC_ENTER_NOAPI(H5I_nmembers, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if(type <= H5I_BADID || type >= H5I_next_type)
HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
@@ -493,7 +493,7 @@ H5Iclear_type(H5I_type_t type, hbool_t force)
{
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Iclear_type, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "Itb", type, force);
if(H5I_IS_LIB_TYPE(type))
@@ -546,7 +546,7 @@ H5I_clear_type(H5I_type_t type, hbool_t force, hbool_t app_ref)
unsigned i; /* Local index variable */
int ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5I_clear_type, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if(type <= H5I_BADID || type >= H5I_next_type)
HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
@@ -673,7 +673,7 @@ H5Idestroy_type(H5I_type_t type)
{
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Idestroy_type, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "It", type);
if(H5I_IS_LIB_TYPE(type))
@@ -707,7 +707,7 @@ H5I_destroy_type(H5I_type_t type)
H5I_id_type_t *type_ptr; /* ptr to the atomic type */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5I_destroy_type, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if(type <= H5I_BADID || type >= H5I_next_type)
HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
@@ -748,7 +748,7 @@ H5Iregister(H5I_type_t type, const void *object)
{
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Iregister, H5I_INVALID_HID)
+ FUNC_ENTER_API(H5I_INVALID_HID)
H5TRACE2("i", "It*x", type, object);
if(H5I_IS_LIB_TYPE(type))
@@ -798,7 +798,7 @@ H5I_register(H5I_type_t type, const void *object, hbool_t app_ref)
unsigned i; /*counter */
hid_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOAPI(H5I_register, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments */
if(type <= H5I_BADID || type >= H5I_next_type)
@@ -903,7 +903,7 @@ H5I_subst(hid_t id, const void *new_object)
H5I_id_info_t *id_ptr; /* Ptr to the atom */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_subst, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* General lookup of the ID */
if(NULL == (id_ptr = H5I_find_id(id)))
@@ -940,7 +940,7 @@ H5I_object(hid_t id)
H5I_id_info_t *id_ptr; /*ptr to the new atom */
void *ret_value = NULL; /*return value */
- FUNC_ENTER_NOAPI(H5I_object, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* General lookup of the ID */
if(NULL != (id_ptr = H5I_find_id(id))) {
@@ -976,7 +976,7 @@ H5Iobject_verify(hid_t id, H5I_type_t id_type)
{
void * ret_value; /* Return value */
- FUNC_ENTER_API(H5Iobject_verify, NULL)
+ FUNC_ENTER_API(NULL)
if(H5I_IS_LIB_TYPE(id_type))
HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, NULL, "cannot call public function on library type")
@@ -1012,7 +1012,7 @@ H5I_object_verify(hid_t id, H5I_type_t id_type)
H5I_id_info_t *id_ptr = NULL; /*ptr to the new atom */
void *ret_value = NULL; /*return value */
- FUNC_ENTER_NOAPI(H5I_object_verify, NULL)
+ FUNC_ENTER_NOAPI(NULL)
HDassert(id_type >= 1 && id_type < H5I_next_type);
@@ -1049,7 +1049,7 @@ H5I_get_type(hid_t id)
{
H5I_type_t ret_value = H5I_BADID;
- FUNC_ENTER_NOAPI(H5I_get_type, H5I_BADID)
+ FUNC_ENTER_NOAPI(H5I_BADID)
if(id > 0)
ret_value = H5I_TYPE(id);
@@ -1081,7 +1081,7 @@ H5Iget_type(hid_t id)
{
H5I_type_t ret_value = H5I_BADID; /* Return value */
- FUNC_ENTER_API(H5Iget_type, H5I_BADID)
+ FUNC_ENTER_API(H5I_BADID)
H5TRACE1("It", "i", id);
ret_value = H5I_get_type(id);
@@ -1116,7 +1116,7 @@ H5Iremove_verify(hid_t id, H5I_type_t id_type)
{
void * ret_value; /* Return value */
- FUNC_ENTER_API(H5Iremove_verify, NULL)
+ FUNC_ENTER_API(NULL)
if(H5I_IS_LIB_TYPE(id_type))
HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, NULL, "cannot call public function on library type")
@@ -1150,7 +1150,7 @@ H5I_remove_verify(hid_t id, H5I_type_t id_type)
{
void * ret_value = NULL; /*return value */
- FUNC_ENTER_NOAPI(H5I_remove_verify, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Argument checking will be performed by H5I_remove() */
@@ -1188,7 +1188,7 @@ H5I_remove(hid_t id)
unsigned hash_loc; /*atom's hash table location */
void * ret_value = NULL; /*return value */
- FUNC_ENTER_NOAPI(H5I_remove, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Check arguments */
type = H5I_TYPE(id);
@@ -1255,7 +1255,7 @@ H5Idec_ref(hid_t id)
{
int ret_value; /* Return value */
- FUNC_ENTER_API(H5Idec_ref, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Is", "i", id);
/* Check arguments */
@@ -1296,7 +1296,7 @@ H5I_dec_ref(hid_t id)
H5I_id_info_t *id_ptr; /*ptr to the new ID */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_dec_ref, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(id >= 0);
@@ -1367,7 +1367,7 @@ H5I_dec_app_ref(hid_t id)
H5I_id_info_t *id_ptr; /*ptr to the new ID */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_dec_app_ref, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(id >= 0);
@@ -1414,7 +1414,7 @@ H5I_dec_app_ref_always_close(hid_t id)
{
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_dec_app_ref_always_close, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(id >= 0);
@@ -1458,7 +1458,7 @@ H5Iinc_ref(hid_t id)
{
int ret_value; /* Return value */
- FUNC_ENTER_API(H5Iinc_ref, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Is", "i", id);
/* Check arguments */
@@ -1502,7 +1502,7 @@ H5I_inc_ref(hid_t id, hbool_t app_ref)
H5I_id_info_t *id_ptr; /*ptr to the ID */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_inc_ref, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(id >= 0);
@@ -1550,7 +1550,7 @@ H5Iget_ref(hid_t id)
{
int ret_value; /* Return value */
- FUNC_ENTER_API(H5Iget_ref, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Is", "i", id);
/* Check arguments */
@@ -1594,7 +1594,7 @@ H5I_get_ref(hid_t id, hbool_t app_ref)
H5I_id_info_t *id_ptr; /*ptr to the ID */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_get_ref, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(id >= 0);
@@ -1638,7 +1638,7 @@ H5Iinc_type_ref(H5I_type_t type)
{
int ret_value; /* Return value */
- FUNC_ENTER_API(H5Iinc_type_ref, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Is", "It", type);
/* Check arguments */
@@ -1677,7 +1677,7 @@ H5I_inc_type_ref(H5I_type_t type)
H5I_id_type_t *type_ptr; /* ptr to the type */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_inc_type_ref, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(type > 0 && type < H5I_next_type);
@@ -1722,7 +1722,7 @@ H5Idec_type_ref(H5I_type_t type)
{
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Idec_type_ref, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "It", type);
if(H5I_IS_LIB_TYPE(type))
@@ -1761,7 +1761,7 @@ H5I_dec_type_ref(H5I_type_t type)
H5I_id_type_t *type_ptr; /* Pointer to the ID type */
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_dec_type_ref, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if(type <= H5I_BADID || type >= H5I_next_type)
HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
@@ -1809,7 +1809,7 @@ H5Iget_type_ref(H5I_type_t type)
{
int ret_value; /* Return value */
- FUNC_ENTER_API(H5Iget_type_ref, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Is", "It", type);
/* Check arguments */
@@ -1849,7 +1849,7 @@ H5I_get_type_ref(H5I_type_t type)
H5I_id_type_t *type_ptr; /*ptr to the type */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_get_type_ref, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(type >= 0);
@@ -1888,7 +1888,7 @@ H5Iis_valid(hid_t id)
H5I_id_info_t *id_ptr; /* ptr to the ID */
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_API(H5Iis_valid, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("t", "i", id);
/* Find the ID */
@@ -1933,7 +1933,7 @@ H5Isearch(H5I_type_t type, H5I_search_func_t func, void *key)
{
void * ret_value; /* Return value */
- FUNC_ENTER_API(H5Isearch, NULL)
+ FUNC_ENTER_API(NULL)
if(H5I_IS_LIB_TYPE(type))
HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, NULL, "cannot call public function on library type")
@@ -1978,7 +1978,7 @@ H5I_search(H5I_type_t type, H5I_search_func_t func, void *key, hbool_t app_ref)
H5I_id_type_t *type_ptr; /*ptr to the type */
void *ret_value = NULL; /*return value */
- FUNC_ENTER_NOAPI(H5I_search, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Check arguments */
if(type <= H5I_BADID || type >= H5I_next_type)
@@ -2036,7 +2036,7 @@ H5I_find_id(hid_t id)
unsigned hash_loc; /*bucket pointer */
H5I_id_info_t *ret_value; /*return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5I_find_id)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
type = H5I_TYPE(id);
@@ -2106,7 +2106,7 @@ H5Iget_name(hid_t id, char *name/*out*/, size_t size)
H5G_loc_t loc; /* Object location */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Iget_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("Zs", "ixz", id, name, size);
/* Get object location */
@@ -2142,7 +2142,7 @@ H5Iget_file_id(hid_t obj_id)
{
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Iget_file_id, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", obj_id);
if((ret_value = H5I_get_file_id(obj_id, TRUE)) < 0)
@@ -2173,7 +2173,7 @@ H5I_get_file_id(hid_t obj_id, hbool_t app_ref)
H5I_type_t type; /* ID type */
hid_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5I_get_file_id)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get object type */
type = H5I_TYPE(obj_id);
@@ -2228,7 +2228,7 @@ H5I_debug(H5I_type_t type)
unsigned int iu;
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
fprintf(stderr, "Dumping ID type %d\n", (int)type);
type_ptr = H5I_id_type_list_g[type];