mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-04-18 17:40:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r21919] Description:

Browse Source 
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
This commit is contained in:
Quincey Koziol 2012-02-08 22:13:27 -05:00
parent eb0e5f8c4e
commit 9c9ee2008c
234 changed files with 3509 additions and 4756 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/H5.c
View File

@ -108,7 +108,7 @@ H5_init_library(void)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5_init_library, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Make sure the package information is updated.
*/
@ -364,7 +364,7 @@ H5dont_atexit(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API_NOINIT_NOERR_NOFS(H5dont_atexit)
FUNC_ENTER_API_NOINIT_NOERR_NOFS
H5TRACE0("e","");
if(H5_dont_atexit_g)
@ -403,7 +403,7 @@ H5garbage_collect(void)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_API(H5garbage_collect, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE0("e","");
/* Call the garbage collection routines in the library */
@ -455,7 +455,7 @@ H5set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_lim,
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_API(H5set_free_list_limits, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE6("e", "IsIsIsIsIsIs", reg_global_lim, reg_list_lim, arr_global_lim,
arr_list_lim, blk_global_lim, blk_list_lim);
@ -598,7 +598,7 @@ H5get_libversion(unsigned *majnum, unsigned *minnum, unsigned *relnum)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_API(H5get_libversion, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "*Iu*Iu*Iu", majnum, minnum, relnum);
/* Set the version information */
@ -653,7 +653,7 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
static const char *version_mismatch_warning = VERSION_MISMATCH_WARNING;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API_NOINIT_NOERR_NOFS(H5check_version)
FUNC_ENTER_API_NOINIT_NOERR_NOFS
H5TRACE3("e", "IuIuIu", majnum, minnum, relnum);
/* Don't check again, if we already have */
@ -767,7 +767,7 @@ H5open(void)
{
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_API_NOCLEAR(H5open, FAIL)
FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE0("e","");
/* all work is done by FUNC_ENTER() */
done:
@ -797,7 +797,7 @@ H5close(void)
* whole library just to release it all right away. It is safe to call
* this function for an uninitialized library.
*/
FUNC_ENTER_API_NOINIT_NOERR_NOFS(H5close)
FUNC_ENTER_API_NOINIT_NOERR_NOFS
H5TRACE0("e","");
H5_term_library();

84
src/H5A.c
View File

@ -113,7 +113,7 @@ H5A_init(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5A_init, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
@ -138,7 +138,7 @@ H5A_init_interface(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_init_interface)
FUNC_ENTER_NOAPI_NOINIT
/*
* Create attribute ID type.
@ -172,7 +172,7 @@ H5A_term_interface(void)
{
int n = 0;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_term_interface)
FUNC_ENTER_NOAPI_NOINIT
if(H5_interface_initialize_g) {
if((n = H5I_nmembers(H5I_ATTR))>0) {
@ -225,7 +225,7 @@ H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id,
H5S_t *space; /* Dataspace to use for attribute */
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Acreate2, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE6("i", "i*siiii", loc_id, attr_name, type_id, space_id, acpl_id, aapl_id);
/* check arguments */
@ -296,7 +296,7 @@ H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
H5S_t *space; /* Dataspace to use for attribute */
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Acreate_by_name, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE8("i", "i*s*siiiii", loc_id, obj_name, attr_name, type_id, space_id,
acpl_id, aapl_id, lapl_id);
@ -369,7 +369,7 @@ H5A_create(const H5G_loc_t *loc, const char *name, const H5T_t *type,
htri_t tri_ret; /* htri_t return value */
hid_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_TAG(H5A_create, dxpl_id, loc->oloc->addr, FAIL)
FUNC_ENTER_NOAPI_NOINIT_TAG(dxpl_id, loc->oloc->addr, FAIL)
/* check args */
HDassert(loc);
@ -534,7 +534,7 @@ H5Aopen(hid_t loc_id, const char *attr_name, hid_t UNUSED aapl_id)
H5A_t *attr = NULL; /* Attribute opened */
hid_t ret_value;
FUNC_ENTER_API(H5Aopen, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("i", "i*si", loc_id, attr_name, aapl_id);
/* check arguments */
@ -596,7 +596,7 @@ H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
H5A_t *attr = NULL; /* Attribute opened */
hid_t ret_value;
FUNC_ENTER_API(H5Aopen_by_name, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE5("i", "i*s*sii", loc_id, obj_name, attr_name, aapl_id, lapl_id);
/* check arguments */
@ -664,7 +664,7 @@ H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
H5G_loc_t loc; /* Object location */
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Aopen_by_idx, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE7("i", "i*sIiIohii", loc_id, obj_name, idx_type, order, n, aapl_id,
lapl_id);
@ -726,7 +726,7 @@ H5A_open_common(const H5G_loc_t *loc, H5A_t *attr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_open_common)
FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(loc);
@ -783,7 +783,7 @@ H5A_open_by_idx(const H5G_loc_t *loc, const char *obj_name, H5_index_t idx_type,
H5A_t *attr = NULL; /* Attribute from object header */
H5A_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_open_by_idx)
FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(loc);
@ -847,7 +847,7 @@ H5A_open_by_name(const H5G_loc_t *loc, const char *obj_name, const char *attr_na
H5A_t *attr = NULL; /* Attribute from object header */
H5A_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5A_open_by_name, NULL)
FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(loc);
@ -912,7 +912,7 @@ H5Awrite(hid_t attr_id, hid_t dtype_id, const void *buf)
H5T_t *mem_type; /* Memory datatype */
herr_t ret_value; /* Return value */
FUNC_ENTER_API(H5Awrite, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ii*x", attr_id, dtype_id, buf);
/* check arguments */
@ -963,7 +963,7 @@ H5A_write(H5A_t *attr, const H5T_t *mem_type, const void *buf, hid_t dxpl_id)
size_t buf_size; /* desired buffer size */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT_TAG(H5A_write, dxpl_id, attr->oloc.addr, FAIL)
FUNC_ENTER_NOAPI_NOINIT_TAG(dxpl_id, attr->oloc.addr, FAIL)
HDassert(attr);
HDassert(mem_type);
@ -1069,7 +1069,7 @@ H5Aread(hid_t attr_id, hid_t dtype_id, void *buf)
H5T_t *mem_type; /* Memory datatype */
herr_t ret_value; /* Return value */
FUNC_ENTER_API(H5Aread, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ii*x", attr_id, dtype_id, buf);
/* check arguments */
@ -1119,7 +1119,7 @@ H5A_read(const H5A_t *attr, const H5T_t *mem_type, void *buf, hid_t dxpl_id)
size_t buf_size; /* desired buffer size */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5A_read)
FUNC_ENTER_NOAPI_NOINIT
HDassert(attr);
HDassert(mem_type);
@ -1215,7 +1215,7 @@ H5Aget_space(hid_t attr_id)
H5S_t *ds = NULL; /* Copy of dataspace for attribute */
hid_t ret_value;
FUNC_ENTER_API(H5Aget_space, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", attr_id);
/* check arguments */
@ -1261,7 +1261,7 @@ H5Aget_type(hid_t attr_id)
H5T_t *dt = NULL; /* Copy of attribute's datatype */
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Aget_type, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", attr_id);
/* check arguments */
@ -1330,7 +1330,7 @@ H5Aget_create_plist(hid_t attr_id)
H5P_genplist_t *new_plist; /* ACPL to return */
hid_t ret_value;
FUNC_ENTER_API(H5Aget_create_plist, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", attr_id);
HDassert(H5P_LST_ATTRIBUTE_CREATE_g != -1);
@ -1385,7 +1385,7 @@ H5Aget_name(hid_t attr_id, size_t buf_size, char *buf)
H5A_t *my_attr; /* Attribute object for ID */
ssize_t ret_value;
FUNC_ENTER_API(H5Aget_name, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("Zs", "iz*s", attr_id, buf_size, buf);
/* check arguments */
@ -1425,7 +1425,7 @@ H5A_get_name(H5A_t *attr, size_t buf_size, char *buf)
size_t copy_len, nbytes;
ssize_t ret_value;
FUNC_ENTER_NOAPI(H5A_get_name, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* get the real attribute length */
nbytes = HDstrlen(attr->shared->name);
@ -1476,7 +1476,7 @@ H5Aget_name_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
H5A_t *attr = NULL; /* Attribute object for name */
ssize_t ret_value; /* Return value */
FUNC_ENTER_API(H5Aget_name_by_idx, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE8("Zs", "i*sIiIohxzi", loc_id, obj_name, idx_type, order, n, name, size,
lapl_id);
@ -1543,7 +1543,7 @@ H5Aget_storage_size(hid_t attr_id)
H5A_t *attr; /* Attribute object for ID */
hsize_t ret_value; /* Return value */
FUNC_ENTER_API(H5Aget_storage_size, 0)
FUNC_ENTER_API(0)
H5TRACE1("h", "i", attr_id);
/* Check args */
@ -1577,7 +1577,7 @@ H5Aget_info(hid_t attr_id, H5A_info_t *ainfo)
H5A_t *attr; /* Attribute object for name */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Aget_info, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*x", attr_id, ainfo);
/* Check args */
@ -1614,7 +1614,7 @@ H5Aget_info_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
H5A_t *attr = NULL; /* Attribute object for name */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Aget_info_by_name, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE5("e", "i*s*s*xi", loc_id, obj_name, attr_name, ainfo, lapl_id);
/* Check args */
@ -1673,7 +1673,7 @@ H5Aget_info_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
H5A_t *attr = NULL; /* Attribute object for name */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Aget_info_by_idx, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE7("e", "i*sIiIoh*xi", loc_id, obj_name, idx_type, order, n, ainfo,
lapl_id);
@ -1731,7 +1731,7 @@ H5A_get_info(const H5A_t *attr, H5A_info_t *ainfo)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5A_get_info, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(attr);
@ -1773,7 +1773,7 @@ H5Arename(hid_t loc_id, const char *old_name, const char *new_name)
H5G_loc_t loc; /* Object location */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Arename, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*s*s", loc_id, old_name, new_name);
/* check arguments */
@ -1819,7 +1819,7 @@ H5Arename_by_name(hid_t loc_id, const char *obj_name, const char *old_attr_name,
hbool_t loc_found = FALSE; /* Entry at 'obj_name' found */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Arename_by_name, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE5("e", "i*s*s*si", loc_id, obj_name, old_attr_name, new_attr_name,
lapl_id);
@ -1916,7 +1916,7 @@ H5Aiterate2(hid_t loc_id, H5_index_t idx_type, H5_iter_order_t order,
hsize_t last_attr; /* Index of last attribute examined */
herr_t ret_value; /* Return value */
FUNC_ENTER_API(H5Aiterate2, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE6("e", "iIiIo*hx*x", loc_id, idx_type, order, idx, op, op_data);
/* check arguments */
@ -2004,7 +2004,7 @@ H5Aiterate_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
hsize_t last_attr; /* Index of last attribute examined */
herr_t ret_value; /* Return value */
FUNC_ENTER_API(H5Aiterate_by_name, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE8("e", "i*sIiIo*hx*xi", loc_id, obj_name, idx_type, order, idx, op,
op_data, lapl_id);
@ -2085,7 +2085,7 @@ H5Adelete(hid_t loc_id, const char *name)
H5G_loc_t loc; /* Object location */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Adelete, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*s", loc_id, name);
/* check arguments */
@ -2132,7 +2132,7 @@ H5Adelete_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
hbool_t loc_found = FALSE; /* Entry at 'obj_name' found */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Adelete_by_name, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*s*si", loc_id, obj_name, attr_name, lapl_id);
/* check arguments */
@ -2208,7 +2208,7 @@ H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
hbool_t loc_found = FALSE; /* Entry at 'obj_name' found */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Adelete_by_idx, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE6("e", "i*sIiIohi", loc_id, obj_name, idx_type, order, n, lapl_id);
/* check arguments */
@ -2271,7 +2271,7 @@ H5Aclose(hid_t attr_id)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Aclose, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", attr_id);
/* check arguments */
@ -2312,7 +2312,7 @@ H5A_copy(H5A_t *_new_attr, const H5A_t *old_attr)
hbool_t allocated_attr = FALSE; /* Whether the attribute was allocated */
H5A_t *ret_value = NULL; /* Return value */
FUNC_ENTER_NOAPI(H5A_copy, NULL)
FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(old_attr);
@ -2374,7 +2374,7 @@ H5A_free(H5A_t *attr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5A_free, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(attr);
@ -2422,7 +2422,7 @@ H5A_close(H5A_t *attr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5A_close, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(attr);
HDassert(attr->shared);
@ -2478,7 +2478,7 @@ H5A_oloc(H5A_t *attr)
{
H5O_loc_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5A_oloc, NULL)
FUNC_ENTER_NOAPI(NULL)
HDassert(attr);
@ -2510,7 +2510,7 @@ H5A_nameof(H5A_t *attr)
{
H5G_name_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5A_nameof, NULL)
FUNC_ENTER_NOAPI(NULL)
HDassert(attr);
@ -2542,7 +2542,7 @@ H5Aexists(hid_t obj_id, const char *attr_name)
H5G_loc_t loc; /* Object location */
htri_t ret_value; /* Return value */
FUNC_ENTER_API(H5Aexists, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("t", "i*s", obj_id, attr_name);
/* check arguments */
@ -2586,7 +2586,7 @@ H5Aexists_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
hbool_t loc_found = FALSE; /* Entry at 'obj_name' found */
htri_t ret_value; /* Return value */
FUNC_ENTER_API(H5Aexists_by_name, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE4("t", "i*s*si", loc_id, obj_name, attr_name, lapl_id);
/* check arguments */

114
src/H5AC.c
View File

@ -232,7 +232,7 @@ H5AC_init(void)
{
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_init, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
@ -263,7 +263,7 @@ H5AC_init_interface(void)
H5FD_mpio_xfer_t xfer_mode; /* I/O transfer mode property value */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5AC_init_interface)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(H5P_CLS_DATASET_XFER_g!=(-1));
@ -342,7 +342,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
#else /* H5_HAVE_PARALLEL */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_init_interface)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
assert(H5P_LST_DATASET_XFER_g!=(-1));
@ -376,7 +376,7 @@ H5AC_term_interface(void)
{
int n = 0;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_term_interface)
FUNC_ENTER_NOAPI_NOINIT
if (H5_interface_initialize_g) {
#ifdef H5_HAVE_PARALLEL
@ -473,7 +473,7 @@ H5AC_create(const H5F_t *f,
#endif /* H5_HAVE_PARALLEL */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_create, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(NULL == f->shared->cache);
@ -659,7 +659,7 @@ H5AC_dest(H5F_t *f, hid_t dxpl_id)
#endif /* H5_HAVE_PARALLEL */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_dest, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@ -738,7 +738,7 @@ H5AC_expunge_entry(H5F_t *f,
#endif /* H5AC__TRACE_FILE_ENABLED */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_expunge_entry, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@ -823,7 +823,7 @@ H5AC_flush(H5F_t *f, hid_t dxpl_id)
#endif /* H5AC__TRACE_FILE_ENABLED */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_flush, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@ -897,7 +897,7 @@ H5AC_get_entry_status(const H5F_t *f,
unsigned status = 0;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_get_entry_status, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if((f == NULL) || (!H5F_addr_defined(addr)) || (status_ptr == NULL))
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad param(s) on entry.")
@ -953,7 +953,7 @@ H5AC_insert_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t add
#endif /* H5AC__TRACE_FILE_ENABLED */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_insert_entry, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@ -1052,7 +1052,7 @@ H5AC_mark_entry_dirty(void *thing)
#endif /* H5AC__TRACE_FILE_ENABLED */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_mark_entry_dirty, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(thing);
@ -1123,7 +1123,7 @@ H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t ne
#endif /* H5_HAVE_PARALLEL */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_move_entry, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared->cache);
@ -1201,7 +1201,7 @@ H5AC_pin_protected_entry(void *thing)
#endif /* H5AC__TRACE_FILE_ENABLED */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_pin_protected_entry, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(thing);
@ -1251,7 +1251,7 @@ H5AC_create_flush_dependency(void * parent_thing, void * child_thing)
#endif /* H5AC__TRACE_FILE_ENABLED */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_create_flush_dependency, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(parent_thing);
@ -1320,7 +1320,7 @@ H5AC_protect(H5F_t *f,
#endif /* H5AC__TRACE_FILE_ENABLED */
void * ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5AC_protect, NULL)
FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(f);
@ -1435,7 +1435,7 @@ H5AC_resize_entry(void *thing, size_t new_size)
#endif /* H5AC__TRACE_FILE_ENABLED */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_resize_entry, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(thing);
@ -1502,7 +1502,7 @@ H5AC_unpin_entry(void *thing)
#endif /* H5AC__TRACE_FILE_ENABLED */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_unpin_entry, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(thing);
@ -1551,7 +1551,7 @@ H5AC_destroy_flush_dependency(void * parent_thing, void * child_thing)
#endif /* H5AC__TRACE_FILE_ENABLED */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_destroy_flush_dependency, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(parent_thing);
@ -1633,7 +1633,7 @@ H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr,
#endif /* H5AC__TRACE_FILE_ENABLED */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_unprotect, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@ -1739,7 +1739,7 @@ H5AC_set_sync_point_done_callback(H5C_t * cache_ptr,
{
H5AC_aux_t * aux_ptr;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_set_sync_point_done_callback)
FUNC_ENTER_NOAPI_NOINIT
HDassert(cache_ptr && (cache_ptr->magic == H5C__H5C_T_MAGIC));
@ -1776,7 +1776,7 @@ H5AC_set_write_done_callback(H5C_t * cache_ptr,
{
H5AC_aux_t * aux_ptr;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_set_write_done_callback)
FUNC_ENTER_NOAPI_NOINIT
HDassert(cache_ptr && (cache_ptr->magic == H5C__H5C_T_MAGIC));
@ -1809,7 +1809,7 @@ H5AC_stats(const H5F_t *f)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_stats, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@ -1841,7 +1841,7 @@ H5AC_dump_cache(const H5F_t *f)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_dump_cache, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@ -1878,7 +1878,7 @@ H5AC_get_cache_auto_resize_config(const H5AC_t * cache_ptr,
hbool_t evictions_enabled;
H5C_auto_size_ctl_t internal_config;
FUNC_ENTER_NOAPI(H5AC_get_cache_auto_resize_config, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if ( ( cache_ptr == NULL )
||
@ -2000,7 +2000,7 @@ H5AC_get_cache_size(H5AC_t * cache_ptr,
herr_t result;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_get_cache_size, FAIL)
FUNC_ENTER_NOAPI(FAIL)
result = H5C_get_cache_size((H5C_t *)cache_ptr,
max_size_ptr,
@ -2038,7 +2038,7 @@ H5AC_get_cache_hit_rate(H5AC_t * cache_ptr, double * hit_rate_ptr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_get_cache_hit_rate, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if(H5C_get_cache_hit_rate((H5C_t *)cache_ptr, hit_rate_ptr) < 0)
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_get_cache_hit_rate() failed.")
@ -2066,7 +2066,7 @@ H5AC_reset_cache_hit_rate_stats(H5AC_t * cache_ptr)
herr_t result;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_reset_cache_hit_rate_stats, FAIL)
FUNC_ENTER_NOAPI(FAIL)
result = H5C_reset_cache_hit_rate_stats((H5C_t *)cache_ptr);
@ -2107,7 +2107,7 @@ H5AC_set_cache_auto_resize_config(H5AC_t *cache_ptr,
FILE * trace_file_ptr = NULL;
#endif /* H5AC__TRACE_FILE_ENABLED */
FUNC_ENTER_NOAPI(H5AC_set_cache_auto_resize_config, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr );
@ -2284,7 +2284,7 @@ H5AC_validate_config(H5AC_cache_config_t * config_ptr)
H5C_auto_size_ctl_t internal_config;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_validate_config, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if(config_ptr == NULL)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL config_ptr on entry.")
@ -2378,7 +2378,7 @@ H5AC_close_trace_file(H5AC_t * cache_ptr)
herr_t ret_value = SUCCEED; /* Return value */
FILE * trace_file_ptr = NULL;
FUNC_ENTER_NOAPI(H5AC_close_trace_file, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if ( cache_ptr == NULL ) {
@ -2440,7 +2440,7 @@ H5AC_open_trace_file(H5AC_t * cache_ptr,
H5AC_aux_t * aux_ptr = NULL;
#endif /* H5_HAVE_PARALLEL */
FUNC_ENTER_NOAPI(H5AC_open_trace_file, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(cache_ptr);
@ -2553,7 +2553,7 @@ H5AC_add_candidate(H5AC_t * cache_ptr,
H5AC_slist_entry_t * slist_entry_ptr = NULL;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_add_candidate, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -2635,7 +2635,7 @@ H5AC_broadcast_candidate_list(H5AC_t * cache_ptr,
int num_entries = 0;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_broadcast_candidate_list, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -2746,7 +2746,7 @@ H5AC_broadcast_clean_list(H5AC_t * cache_ptr)
int mpi_result;
int num_entries = 0;
FUNC_ENTER_NOAPI(H5AC_broadcast_clean_list, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -2937,7 +2937,7 @@ H5AC_check_if_write_permitted(const H5F_t UNUSED * f,
#endif /* H5_HAVE_PARALLEL */
FUNC_ENTER_NOAPI(H5AC_check_if_write_permitted, FAIL)
FUNC_ENTER_NOAPI(FAIL)
#ifdef H5_HAVE_PARALLEL
HDassert( f != NULL );
@ -2999,7 +2999,7 @@ H5AC_construct_candidate_list(H5AC_t * cache_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_construct_candidate_list, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -3090,7 +3090,7 @@ H5AC_copy_candidate_list_to_buffer(H5AC_t * cache_ptr,
int i = 0;
int num_entries = 0;
FUNC_ENTER_NOAPI(H5AC_copy_candidate_list_to_buffer, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -3212,7 +3212,7 @@ H5AC_ext_config_2_int_config(H5AC_cache_config_t * ext_conf_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_ext_config_2_int_config, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if ( ( ext_conf_ptr == NULL ) ||
( ext_conf_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION ) ||
@ -3291,7 +3291,7 @@ H5AC_log_deleted_entry(H5AC_t * cache_ptr,
H5AC_slist_entry_t * slist_entry_ptr = NULL;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_log_deleted_entry, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -3383,7 +3383,7 @@ H5AC_log_dirtied_entry(const H5AC_info_t * entry_ptr,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_log_dirtied_entry, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( entry_ptr );
HDassert( entry_ptr->addr == addr );
@ -3506,7 +3506,7 @@ H5AC_log_flushed_entry(H5C_t * cache_ptr,
H5AC_slist_entry_t * slist_entry_ptr = NULL;
FUNC_ENTER_NOAPI(H5AC_log_flushed_entry, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -3633,7 +3633,7 @@ H5AC_log_inserted_entry(H5F_t * f,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_log_inserted_entry, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(cache_ptr != NULL);
HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
@ -3745,7 +3745,7 @@ H5AC_log_moved_entry(const H5F_t *f,
H5AC_slist_entry_t * slist_entry_ptr = NULL;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_log_moved_entry, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( f );
HDassert( f->shared );
@ -3995,7 +3995,7 @@ H5AC_propagate_and_apply_candidate_list(H5F_t * f,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_propagate_and_apply_candidate_list, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -4159,7 +4159,7 @@ H5AC_propagate_flushed_and_still_clean_entries_list(H5F_t * f,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_propagate_flushed_and_still_clean_entries_list, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(cache_ptr != NULL);
HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
@ -4219,7 +4219,7 @@ H5AC_receive_and_apply_clean_list(H5F_t * f,
int num_entries = 0;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_receive_and_apply_clean_list, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( f != NULL );
HDassert( f->shared->cache == cache_ptr );
@ -4330,7 +4330,7 @@ H5AC_receive_candidate_list(H5AC_t * cache_ptr,
int num_entries;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_receive_candidate_list, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -4476,7 +4476,7 @@ H5AC_rsp__dist_md_write__flush(H5F_t *f,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_rsp__dist_md_write__flush, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( f != NULL );
HDassert( f->shared->cache == cache_ptr );
@ -4627,7 +4627,7 @@ H5AC_rsp__dist_md_write__flush_to_min_clean(H5F_t *f,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_rsp__dist_md_write__flush_to_min_clean, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( f != NULL );
HDassert( f->shared->cache == cache_ptr );
@ -4710,7 +4710,7 @@ H5AC_rsp__p0_only__flush(H5F_t *f,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_rsp__p0_only__flush, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( f != NULL );
HDassert( f->shared->cache == cache_ptr );
@ -4812,7 +4812,7 @@ H5AC_rsp__p0_only__flush_to_min_clean(H5F_t *f,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_rsp__p0_only__flush_to_min_clean, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( f != NULL );
HDassert( f->shared->cache == cache_ptr );
@ -4924,7 +4924,7 @@ H5AC_run_sync_point(H5F_t *f,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_run_sync_point, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( f != NULL );
@ -5061,7 +5061,7 @@ H5AC_tidy_cache_0_lists(H5AC_t * cache_ptr,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5AC_tidy_cache_0_lists, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -5154,7 +5154,7 @@ H5AC_flush_entries(H5F_t *f)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5AC_flush_entries)
FUNC_ENTER_NOAPI_NOINIT
HDassert(f);
HDassert(f->shared->cache);
@ -5193,7 +5193,7 @@ H5AC_ignore_tags(H5F_t * f)
herr_t ret_value = SUCCEED;
/* Function Enter Macro */
FUNC_ENTER_NOAPI(H5AC_ignore_tags, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Assertions */
HDassert(f);
@ -5229,7 +5229,7 @@ H5AC_tag(hid_t dxpl_id, haddr_t metadata_tag, haddr_t * prev_tag)
herr_t ret_value = SUCCEED;
/* Function Enter Macro */
FUNC_ENTER_NOAPI(H5AC_tag, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check Arguments */
if(NULL == (dxpl = (H5P_genplist_t *)H5I_object_verify(dxpl_id, H5I_GENPROP_LST)))
@ -5270,7 +5270,7 @@ H5AC_retag_copied_metadata(H5F_t * f, haddr_t metadata_tag)
herr_t ret_value = SUCCEED;
/* Function Enter Macro */
FUNC_ENTER_NOAPI(H5AC_retag_copied_metadata, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Assertions */
HDassert(f);

22
src/H5Abtree2.c
View File

@ -171,7 +171,7 @@ H5A_dense_fh_name_cmp(const void *obj, size_t UNUSED obj_len, void *_udata)
hbool_t took_ownership = FALSE; /* Whether the "found" operator took ownership of the attribute */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_dense_fh_name_cmp)
FUNC_ENTER_NOAPI_NOINIT
/* Decode attribute information */
if(NULL == (attr = (H5A_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_ATTR_ID, (const unsigned char *)obj)))
@ -222,7 +222,7 @@ H5A_dense_btree2_name_store(void *_nrecord, const void *_udata)
const H5A_bt2_ud_ins_t *udata = (const H5A_bt2_ud_ins_t *)_udata;
H5A_dense_bt2_name_rec_t *nrecord = (H5A_dense_bt2_name_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_name_store)
FUNC_ENTER_NOAPI_NOINIT
/* Copy user information info native record */
nrecord->id = udata->id;
@ -255,7 +255,7 @@ H5A_dense_btree2_name_compare(const void *_bt2_udata, const void *_bt2_rec)
const H5A_dense_bt2_name_rec_t *bt2_rec = (const H5A_dense_bt2_name_rec_t *)_bt2_rec;
herr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_name_compare)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(bt2_udata);
@ -323,7 +323,7 @@ H5A_dense_btree2_name_encode(uint8_t *raw, const void *_nrecord, void UNUSED *ct
{
const H5A_dense_bt2_name_rec_t *nrecord = (const H5A_dense_bt2_name_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_name_encode)
FUNC_ENTER_NOAPI_NOINIT
/* Encode the record's fields */
HDmemcpy(raw, nrecord->id.id, (size_t)H5O_FHEAP_ID_LEN);
@ -354,7 +354,7 @@ H5A_dense_btree2_name_decode(const uint8_t *raw, void *_nrecord, void UNUSED *ct
{
H5A_dense_bt2_name_rec_t *nrecord = (H5A_dense_bt2_name_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_name_decode)
FUNC_ENTER_NOAPI_NOINIT
/* Decode the record's fields */
HDmemcpy(nrecord->id.id, raw, (size_t)H5O_FHEAP_ID_LEN);
@ -386,7 +386,7 @@ H5A_dense_btree2_name_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED dx
{
const H5A_dense_bt2_name_rec_t *nrecord = (const H5A_dense_bt2_name_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_name_debug)
FUNC_ENTER_NOAPI_NOINIT
HDfprintf(stream, "%*s%-*s {%016Hx, %02x, %u, %08lx}\n", indent, "", fwidth,
"Record:",
@ -415,7 +415,7 @@ H5A_dense_btree2_corder_store(void *_nrecord, const void *_udata)
const H5A_bt2_ud_ins_t *udata = (const H5A_bt2_ud_ins_t *)_udata;
H5A_dense_bt2_corder_rec_t *nrecord = (H5A_dense_bt2_corder_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_corder_store)
FUNC_ENTER_NOAPI_NOINIT
/* Copy user information info native record */
nrecord->id = udata->id;
@ -447,7 +447,7 @@ H5A_dense_btree2_corder_compare(const void *_bt2_udata, const void *_bt2_rec)
const H5A_dense_bt2_corder_rec_t *bt2_rec = (const H5A_dense_bt2_corder_rec_t *)_bt2_rec;
herr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_corder_compare)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(bt2_udata);
@ -483,7 +483,7 @@ H5A_dense_btree2_corder_encode(uint8_t *raw, const void *_nrecord, void UNUSED *
{
const H5A_dense_bt2_corder_rec_t *nrecord = (const H5A_dense_bt2_corder_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_corder_encode)
FUNC_ENTER_NOAPI_NOINIT
/* Encode the record's fields */
HDmemcpy(raw, nrecord->id.id, (size_t)H5O_FHEAP_ID_LEN);
@ -513,7 +513,7 @@ H5A_dense_btree2_corder_decode(const uint8_t *raw, void *_nrecord, void UNUSED *
{
H5A_dense_bt2_corder_rec_t *nrecord = (H5A_dense_bt2_corder_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_corder_decode)
FUNC_ENTER_NOAPI_NOINIT
/* Decode the record's fields */
HDmemcpy(nrecord->id.id, raw, (size_t)H5O_FHEAP_ID_LEN);
@ -544,7 +544,7 @@ H5A_dense_btree2_corder_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED
{
const H5A_dense_bt2_corder_rec_t *nrecord = (const H5A_dense_bt2_corder_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_corder_debug)
FUNC_ENTER_NOAPI_NOINIT
HDfprintf(stream, "%*s%-*s {%016Hx, %02x, %u}\n", indent, "", fwidth,
"Record:",

36
src/H5Adense.c
View File

@ -192,7 +192,7 @@ H5A_dense_create(H5F_t *f, hid_t dxpl_id, H5O_ainfo_t *ainfo)
H5B2_t *bt2_corder = NULL; /* v2 B-tree handle for creation order */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5A_dense_create, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -309,7 +309,7 @@ H5A_dense_fnd_cb(const H5A_t *attr, hbool_t *took_ownership, void *_user_attr)
{
H5A_t const **user_attr = (H5A_t const **)_user_attr; /* User data from v2 B-tree attribute lookup */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_fnd_cb)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -349,7 +349,7 @@ H5A_dense_open(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *na
htri_t attr_exists; /* Attribute exists in v2 B-tree */
H5A_t *ret_value = NULL; /* Return value */
FUNC_ENTER_NOAPI(H5A_dense_open, NULL)
FUNC_ENTER_NOAPI(NULL)
/*
* Check arguments.
@ -444,7 +444,7 @@ H5A_dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr)
htri_t attr_sharable; /* Flag indicating attributes are sharable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5A_dense_insert, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -597,7 +597,7 @@ H5A_dense_write_bt2_cb2(void *_record, void *_op_data, hbool_t *changed)
H5A_dense_bt2_corder_rec_t *record = (H5A_dense_bt2_corder_rec_t *)_record; /* Record from B-tree */
H5O_fheap_id_t *new_heap_id = (H5O_fheap_id_t *)_op_data; /* "op data" from v2 B-tree modify */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_write_bt2_cb2)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -638,7 +638,7 @@ H5A_dense_write_bt2_cb(void *_record, void *_op_data, hbool_t *changed)
uint8_t attr_buf[H5A_ATTR_BUF_SIZE]; /* Buffer for serializing attribute */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_dense_write_bt2_cb)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -754,7 +754,7 @@ H5A_dense_write(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr)
htri_t attr_sharable; /* Flag indicating attributes are sharable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5A_dense_write, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -850,7 +850,7 @@ H5A_dense_copy_fh_cb(const void *obj, size_t UNUSED obj_len, void *_udata)
H5A_fh_ud_cp_t *udata = (H5A_fh_ud_cp_t *)_udata; /* User data for fractal heap 'op' callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_dense_copy_fh_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Decode attribute information & keep a copy */
/* (we make a copy instead of calling the user/library callback directly in
@ -901,7 +901,7 @@ H5A_dense_rename(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *
htri_t attr_exists; /* Attribute exists in v2 B-tree */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5A_dense_rename, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -1049,7 +1049,7 @@ H5A_dense_iterate_bt2_cb(const void *_record, void *_bt2_udata)
H5A_bt2_ud_it_t *bt2_udata = (H5A_bt2_ud_it_t *)_bt2_udata; /* User data for callback */
herr_t ret_value = H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_dense_iterate_bt2_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Check for skipping attributes */
if(bt2_udata->skip > 0)
@ -1151,7 +1151,7 @@ H5A_dense_iterate(H5F_t *f, hid_t dxpl_id, hid_t loc_id, const H5O_ainfo_t *ainf
haddr_t bt2_addr; /* Address of v2 B-tree to use for lookup */
herr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5A_dense_iterate, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -1286,7 +1286,7 @@ H5A_dense_remove_bt2_cb(const void *_record, void *_udata)
H5B2_t *bt2_corder = NULL; /* v2 B-tree handle for creation order index */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_dense_remove_bt2_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Check for removing the link from the creation order index */
if(H5F_addr_defined(udata->corder_bt2_addr)) {
@ -1352,7 +1352,7 @@ H5A_dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *
htri_t attr_sharable; /* Flag indicating attributes are sharable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5A_dense_remove, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -1444,7 +1444,7 @@ H5A_dense_remove_by_idx_bt2_cb(const void *_record, void *_bt2_udata)
hbool_t use_sh_loc; /* Whether to use the attribute's shared location or the separate one */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_dense_remove_by_idx_bt2_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Set up the user data for fractal heap 'op' callback */
fh_udata.f = bt2_udata->f;
@ -1571,7 +1571,7 @@ H5A_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
haddr_t bt2_addr; /* Address of v2 B-tree to use for operation */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5A_dense_remove_by_idx, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -1701,7 +1701,7 @@ H5A_dense_exists(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *
htri_t attr_sharable; /* Flag indicating attributes are sharable */
htri_t ret_value = TRUE; /* Return value */
FUNC_ENTER_NOAPI(H5A_dense_exists, NULL)
FUNC_ENTER_NOAPI(NULL)
/*
* Check arguments.
@ -1788,7 +1788,7 @@ H5A_dense_delete_bt2_cb(const void *_record, void *_bt2_udata)
H5A_t *attr = NULL; /* Attribute being removed */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_dense_delete_bt2_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Check for shared attribute */
if(record->flags & H5O_MSG_FLAG_SHARED) {
@ -1852,7 +1852,7 @@ H5A_dense_delete(H5F_t *f, hid_t dxpl_id, H5O_ainfo_t *ainfo)
H5HF_t *fheap = NULL; /* Fractal heap handle */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5A_dense_delete, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.

12
src/H5Adeprec.c
View File

@ -100,7 +100,7 @@ DESCRIPTION
static herr_t
H5A_init_deprec_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_init_deprec_interface)
FUNC_ENTER_NOAPI_NOINIT
FUNC_LEAVE_NOAPI(H5A_init())
} /* H5A_init_deprec_interface() */
@ -143,7 +143,7 @@ H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
H5S_t *space; /* Dataspace to use for attribute */
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Acreate1, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE5("i", "i*siii", loc_id, name, type_id, space_id, plist_id);
/* check arguments */
@ -198,7 +198,7 @@ H5Aopen_name(hid_t loc_id, const char *name)
H5A_t *attr = NULL; /* Attribute opened */
hid_t ret_value;
FUNC_ENTER_API(H5Aopen_name, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("i", "i*s", loc_id, name);
/* check arguments */
@ -256,7 +256,7 @@ H5Aopen_idx(hid_t loc_id, unsigned idx)
H5A_t *attr = NULL; /* Attribute opened */
hid_t ret_value;
FUNC_ENTER_API(H5Aopen_idx, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("i", "iIu", loc_id, idx);
/* check arguments */
@ -308,7 +308,7 @@ H5Aget_num_attrs(hid_t loc_id)
void *obj;
int ret_value;
FUNC_ENTER_API(H5Aget_num_attrs, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("Is", "i", loc_id);
/* check arguments */
@ -405,7 +405,7 @@ H5Aiterate1(hid_t loc_id, unsigned *attr_num, H5A_operator1_t op, void *op_data)
hsize_t last_attr; /* Index of last attribute examined */
herr_t ret_value; /* Return value */
FUNC_ENTER_API(H5Aiterate1, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*Iux*x", loc_id, attr_num, op, op_data);
/* check arguments */

34
src/H5Aint.c
View File

@ -143,7 +143,7 @@ H5A_compact_build_table_cb(H5O_t UNUSED *oh, H5O_mesg_t *mesg/*in,out*/,
H5A_compact_bt_ud_t *udata = (H5A_compact_bt_ud_t *)_udata; /* Operator user data */
herr_t ret_value = H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_compact_build_table_cb)
FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(mesg);
@ -204,7 +204,7 @@ H5A_compact_build_table(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_index_t idx_type,
H5O_mesg_operator_t op; /* Wrapper for operator */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_compact_build_table)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@ -265,7 +265,7 @@ H5A_dense_build_table_cb(const H5A_t *attr, void *_udata)
H5A_dense_bt_ud_t *udata = (H5A_dense_bt_ud_t *)_udata; /* 'User data' passed in */
herr_t ret_value = H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_dense_build_table_cb)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(attr);
@ -314,7 +314,7 @@ H5A_dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
hsize_t nrec; /* # of records in v2 B-tree */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_dense_build_table)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@ -395,7 +395,7 @@ done:
static int
H5A_attr_cmp_name_inc(const void *attr1, const void *attr2)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_attr_cmp_name_inc)
FUNC_ENTER_NOAPI_NOINIT
FUNC_LEAVE_NOAPI(HDstrcmp((*(const H5A_t * const *)attr1)->shared->name,
(*(const H5A_t * const *)attr2)->shared->name))
@ -423,7 +423,7 @@ H5A_attr_cmp_name_inc(const void *attr1, const void *attr2)
static int
H5A_attr_cmp_name_dec(const void *attr1, const void *attr2)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_attr_cmp_name_dec)
FUNC_ENTER_NOAPI_NOINIT
FUNC_LEAVE_NOAPI(HDstrcmp((*(const H5A_t * const *)attr2)->shared->name,
(*(const H5A_t * const *)attr1)->shared->name))
@ -452,7 +452,7 @@ H5A_attr_cmp_corder_inc(const void *attr1, const void *attr2)
{
int ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_attr_cmp_corder_inc)
FUNC_ENTER_NOAPI_NOINIT
if((*(const H5A_t * const *)attr1)->shared->crt_idx < (*(const H5A_t * const *)attr2)->shared->crt_idx)
ret_value = -1;
@ -487,7 +487,7 @@ H5A_attr_cmp_corder_dec(const void *attr1, const void *attr2)
{
int ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_attr_cmp_corder_dec)
FUNC_ENTER_NOAPI_NOINIT
if((*(const H5A_t * const *)attr1)->shared->crt_idx < (*(const H5A_t * const *)attr2)->shared->crt_idx)
ret_value = 1;
@ -517,7 +517,7 @@ static herr_t
H5A_attr_sort_table(H5A_attr_table_t *atable, H5_index_t idx_type,
H5_iter_order_t order)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_attr_sort_table)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(atable);
@ -567,7 +567,7 @@ H5A_attr_iterate_table(const H5A_attr_table_t *atable, hsize_t skip,
size_t u; /* Local index variable */
herr_t ret_value = H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI(H5A_attr_iterate_table, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(atable);
@ -646,7 +646,7 @@ H5A_attr_release_table(H5A_attr_table_t *atable)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_attr_release_table)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(atable);
@ -691,7 +691,7 @@ H5A_get_ainfo(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_ainfo_t *ainfo)
H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */
htri_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5A_get_ainfo, dxpl_id, oh->cache_info.addr, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, oh->cache_info.addr, FAIL)
/* check arguments */
HDassert(f);
@ -756,7 +756,7 @@ H5A_set_version(const H5F_t *f, H5A_t *attr)
hbool_t type_shared, space_shared; /* Flags to indicate that shared messages are used for this attribute */
hbool_t use_latest_format; /* Flag indicating the newest file format should be used */
FUNC_ENTER_NOAPI_NOFUNC(H5A_set_version)
FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
@ -820,7 +820,7 @@ H5A_attr_copy_file(const H5A_t *attr_src, H5F_t *file_dst, hbool_t *recompute_si
H5A_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_attr_copy_file)
FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(attr_src);
@ -1065,7 +1065,7 @@ H5A_attr_post_copy_file(const H5O_loc_t *src_oloc, const H5A_t *attr_src,
H5F_t *file_src, *file_dst;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_attr_post_copy_file)
FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(src_oloc);
@ -1161,7 +1161,7 @@ H5A_dense_post_copy_file_cb(const H5A_t *attr_src, void *_udata)
H5A_t *attr_dst = NULL;
herr_t ret_value = H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_dense_post_copy_file_cb)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(attr_src);
@ -1223,7 +1223,7 @@ H5A_dense_post_copy_file_all(const H5O_loc_t *src_oloc, const H5O_ainfo_t *ainfo
hbool_t recompute_size = FALSE; /* recompute the size */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_dense_post_copy_file_all)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(ainfo_src);

4
src/H5Atest.c
View File

@ -97,7 +97,7 @@ H5A_is_shared_test(hid_t attr_id)
H5A_t *attr; /* Attribute object for ID */
htri_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_is_shared_test)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
@ -130,7 +130,7 @@ H5A_get_shared_rc_test(hid_t attr_id, hsize_t *ref_count)
H5A_t *attr; /* Attribute object for ID */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5A_get_shared_rc_test)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))

36
src/H5B.c
View File

@ -222,7 +222,7 @@ H5B_create(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, void *udata,
H5B_shared_t *shared=NULL; /* Pointer to shared B-tree info */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5B_create, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -311,7 +311,7 @@ H5B_find(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void *u
int cmp = 1; /* Key comparison value */
htri_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5B_find, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -407,7 +407,7 @@ H5B_split(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud, unsigned idx,
double split_ratios[3]; /* B-tree split ratios */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B_split)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -582,7 +582,7 @@ H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
H5B_ins_t my_ins = H5B_INS_ERROR;
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5B_insert, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(f);
@ -721,7 +721,7 @@ H5B_insert_child(H5B_t *bt, unsigned *bt_flags, unsigned idx,
H5B_shared_t *shared; /* Pointer to shared B-tree info */
uint8_t *base; /* Base offset for move */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B_insert_child)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(bt);
HDassert(bt_flags);
@ -822,7 +822,7 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud,
H5B_ins_t my_ins = H5B_INS_ERROR;
H5B_ins_t ret_value = H5B_INS_ERROR; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B_insert_helper)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments
@ -1142,7 +1142,7 @@ H5B_iterate_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t add
haddr_t *child = NULL; /* Array of child pointers */
herr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B_iterate_helper)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -1282,7 +1282,7 @@ H5B_iterate(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
{
herr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOERR(H5B_iterate, -)
FUNC_ENTER_NOAPI_NOERR
/*
* Check arguments.
@ -1340,7 +1340,7 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
int cmp = 1; /* Key comparison value */
H5B_ins_t ret_value = H5B_INS_ERROR;
FUNC_ENTER_NOAPI(H5B_remove_helper, H5B_INS_ERROR)
FUNC_ENTER_NOAPI(H5B_INS_ERROR)
HDassert(f);
HDassert(H5F_addr_defined(addr));
@ -1662,7 +1662,7 @@ H5B_remove(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void
hbool_t rt_key_changed = FALSE; /*right key changed?*/
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5B_remove, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
@ -1706,7 +1706,7 @@ H5B_delete(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5B_delete, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
@ -1779,7 +1779,7 @@ H5B_shared_new(const H5F_t *f, const H5B_class_t *type, size_t sizeof_rkey)
size_t u; /* Local index variable */
H5B_shared_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5B_shared_new, NULL)
FUNC_ENTER_NOAPI(NULL)
/*
* Check arguments.
@ -1850,7 +1850,7 @@ H5B_shared_free(void *_shared)
{
H5B_shared_t *shared = (H5B_shared_t *)_shared;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B_shared_free)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Free the raw B-tree node buffer */
shared->page = H5FL_BLK_FREE(page, shared->page);
@ -1887,7 +1887,7 @@ H5B_copy(const H5B_t *old_bt)
H5B_shared_t *shared; /* Pointer to shared B-tree info */
H5B_t *ret_value;
FUNC_ENTER_NOAPI(H5B_copy, NULL)
FUNC_ENTER_NOAPI(NULL)
/*
* Check arguments.
@ -1960,7 +1960,7 @@ H5B_get_info_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t ad
haddr_t left_child; /* Address of left-most child in node */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B_get_info_helper)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -2059,7 +2059,7 @@ H5B_get_info(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
H5B_info_ud_t info_udata; /* User-data for B-tree size iteration */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5B_get_info, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -2113,7 +2113,7 @@ H5B_valid(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr)
H5B_cache_ud_t cache_udata; /* User-data for metadata cache callback */
htri_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5B_valid, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -2165,7 +2165,7 @@ done:
herr_t
H5B_node_dest(H5B_t *bt)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B_node_dest)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(bt);

28
src/H5B2.c
View File

@ -134,7 +134,7 @@ H5B2_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam, void *ctx_udat
haddr_t hdr_addr; /* B-tree header address */
H5B2_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5B2_create, NULL)
FUNC_ENTER_NOAPI(NULL)
/*
* Check arguments.
@ -207,7 +207,7 @@ H5B2_open(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata)
H5B2_hdr_cache_ud_t cache_udata; /* User-data for callback */
H5B2_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_open)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(f);
@ -272,7 +272,7 @@ H5B2_insert(H5B2_t *bt2, hid_t dxpl_id, void *udata)
H5B2_hdr_t *hdr; /* Pointer to the B-tree header */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5B2_insert, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);
@ -332,7 +332,7 @@ done:
herr_t
H5B2_get_addr(const H5B2_t *bt2, haddr_t *addr_p)
{
FUNC_ENTER_NOAPI_NOFUNC(H5B2_get_addr)
FUNC_ENTER_NOAPI_NOERR
/*
* Check arguments.
@ -370,7 +370,7 @@ H5B2_iterate(H5B2_t *bt2, hid_t dxpl_id, H5B2_operator_t op, void *op_data)
H5B2_hdr_t *hdr; /* Pointer to the B-tree header */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOERR(H5B2_iterate, -)
FUNC_ENTER_NOAPI_NOERR
/* Check arguments. */
HDassert(bt2);
@ -427,7 +427,7 @@ H5B2_find(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_found_t op,
unsigned idx; /* Location of record which matches key */
htri_t ret_value = TRUE; /* Return value */
FUNC_ENTER_NOAPI(H5B2_find, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);
@ -562,7 +562,7 @@ H5B2_index(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order, hsize_t idx,
unsigned depth; /* Current depth of the tree */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5B2_index, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);
@ -716,7 +716,7 @@ H5B2_remove(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_remove_t op,
H5B2_hdr_t *hdr; /* Pointer to the B-tree header */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5B2_remove, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);
@ -790,7 +790,7 @@ H5B2_remove_by_idx(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order,
H5B2_hdr_t *hdr; /* Pointer to the B-tree header */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5B2_remove_by_idx, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);
@ -868,7 +868,7 @@ done:
herr_t
H5B2_get_nrec(const H5B2_t *bt2, hsize_t *nrec)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_get_nrec)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(bt2);
@ -913,7 +913,7 @@ H5B2_neighbor(H5B2_t *bt2, hid_t dxpl_id, H5B2_compare_t range, void *udata,
H5B2_hdr_t *hdr; /* Pointer to the B-tree header */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5B2_neighbor, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);
@ -975,7 +975,7 @@ H5B2_modify(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_modify_t op,
unsigned idx; /* Location of record which matches key */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5B2_modify, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);
@ -1127,7 +1127,7 @@ H5B2_close(H5B2_t *bt2, hid_t dxpl_id)
hbool_t pending_delete = FALSE; /* Whether the v2 B-tree is pending deletion */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_close)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(bt2);
@ -1237,7 +1237,7 @@ H5B2_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata,
H5B2_hdr_cache_ud_t cache_udata; /* User-data for callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5B2_delete, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(f);

30
src/H5B2cache.c
View File

@ -165,7 +165,7 @@ H5B2_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
const uint8_t *p; /* Pointer into raw data buffer */
H5B2_hdr_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_hdr_load)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@ -280,7 +280,7 @@ H5B2_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
uint8_t hdr_buf[H5B2_HDR_BUF_SIZE]; /* Buffer for header */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_hdr_flush)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@ -381,7 +381,7 @@ H5B2_cache_hdr_dest(H5F_t *f, H5B2_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_hdr_dest)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(hdr);
@ -425,7 +425,7 @@ H5B2_cache_hdr_clear(H5F_t *f, H5B2_hdr_t *hdr, hbool_t destroy)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_hdr_clear)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -462,7 +462,7 @@ done:
static herr_t
H5B2_cache_hdr_size(const H5F_t UNUSED *f, const H5B2_hdr_t *hdr, size_t *size_ptr)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_cache_hdr_size)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@ -502,7 +502,7 @@ H5B2_cache_internal_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
unsigned u; /* Local index variable */
H5B2_internal_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_internal_load)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@ -625,7 +625,7 @@ H5B2_cache_internal_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_internal_flush)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@ -722,7 +722,7 @@ H5B2_cache_internal_dest(H5F_t *f, H5B2_internal_t *internal)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_internal_dest)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@ -767,7 +767,7 @@ H5B2_cache_internal_clear(H5F_t *f, H5B2_internal_t *internal, hbool_t destroy)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_internal_clear)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -804,7 +804,7 @@ done:
static herr_t
H5B2_cache_internal_size(const H5F_t UNUSED *f, const H5B2_internal_t *internal, size_t *size_ptr)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_cache_internal_size)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(internal);
@ -844,7 +844,7 @@ H5B2_cache_leaf_load(H5F_t UNUSED *f, hid_t dxpl_id, haddr_t addr, void *_udata)
unsigned u; /* Local index variable */
H5B2_leaf_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_leaf_load)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@ -947,7 +947,7 @@ H5B2_cache_leaf_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_leaf_flush)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@ -1030,7 +1030,7 @@ H5B2_cache_leaf_dest(H5F_t *f, H5B2_leaf_t *leaf)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_leaf_dest)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@ -1075,7 +1075,7 @@ H5B2_cache_leaf_clear(H5F_t *f, H5B2_leaf_t *leaf, hbool_t destroy)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_leaf_clear)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -1112,7 +1112,7 @@ done:
static herr_t
H5B2_cache_leaf_size(const H5F_t UNUSED *f, const H5B2_leaf_t *leaf, size_t *size_ptr)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_cache_leaf_size)
FUNC_ENTER_NOAPI_NOERR
/* check arguments */
HDassert(leaf);

6
src/H5B2dbg.c
View File

@ -97,7 +97,7 @@ H5B2_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
H5B2_hdr_cache_ud_t cache_udata; /* User-data for callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5B2_hdr_debug, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -213,7 +213,7 @@ H5B2_int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
H5B2_hdr_cache_ud_t cache_udata; /* User-data for callback */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5B2_int_debug, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -345,7 +345,7 @@ H5B2_leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
char temp_str[128]; /* Temporary string, for formatting */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5B2_leaf_debug, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.

20
src/H5B2hdr.c
View File

@ -115,7 +115,7 @@ H5B2_hdr_init(H5B2_hdr_t *hdr, const H5B2_create_t *cparam, void *ctx_udata,
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_hdr_init)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -241,7 +241,7 @@ H5B2_hdr_alloc(H5F_t *f)
H5B2_hdr_t *hdr = NULL; /* v2 B-tree header */
H5B2_hdr_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_hdr_alloc)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -288,7 +288,7 @@ H5B2_hdr_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam,
H5B2_hdr_t *hdr = NULL; /* The new v2 B-tree header information */
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_hdr_create)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -342,7 +342,7 @@ H5B2_hdr_incr(H5B2_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_hdr_incr)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(hdr);
@ -378,7 +378,7 @@ H5B2_hdr_decr(H5B2_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_hdr_decr)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@ -413,7 +413,7 @@ done:
herr_t
H5B2_hdr_fuse_incr(H5B2_hdr_t *hdr)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_hdr_fuse_incr)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@ -441,7 +441,7 @@ H5B2_hdr_fuse_incr(H5B2_hdr_t *hdr)
size_t
H5B2_hdr_fuse_decr(H5B2_hdr_t *hdr)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_hdr_fuse_decr)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@ -472,7 +472,7 @@ H5B2_hdr_dirty(H5B2_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_hdr_dirty)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@ -504,7 +504,7 @@ H5B2_hdr_free(H5B2_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_hdr_free)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@ -569,7 +569,7 @@ H5B2_hdr_delete(H5B2_hdr_t *hdr, hid_t dxpl_id)
unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting v2 B-tree header */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5B2_hdr_delete, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(hdr);

50
src/H5B2int.c
View File

@ -140,7 +140,7 @@ H5B2_locate_record(const H5B2_class_t *type, unsigned nrec, size_t *rec_off,
unsigned my_idx = 0; /* Final index value */
int cmp = -1; /* Key comparison value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_locate_record)
FUNC_ENTER_NOAPI_NOINIT
hi = nrec;
while(lo < hi && cmp) {
@ -187,7 +187,7 @@ H5B2_split1(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *cur
unsigned left_child_flags = H5AC__NO_FLAGS_SET, right_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_split1)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -368,7 +368,7 @@ H5B2_split_root(H5B2_hdr_t *hdr, hid_t dxpl_id)
unsigned u_max_nrec_size; /* Temporary variable for range checking */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_split_root)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -450,7 +450,7 @@ H5B2_redistribute2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
unsigned left_child_flags = H5AC__NO_FLAGS_SET, right_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_redistribute2)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -684,7 +684,7 @@ H5B2_redistribute3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
unsigned middle_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_redistribute3)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -1065,7 +1065,7 @@ H5B2_merge2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
unsigned left_child_flags = H5AC__NO_FLAGS_SET, right_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_merge2)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -1225,7 +1225,7 @@ H5B2_merge3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
unsigned middle_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_merge3)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -1443,7 +1443,7 @@ H5B2_swap_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
uint8_t *child_native; /* Pointer to child's native records */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_swap_leaf)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -1530,7 +1530,7 @@ H5B2_insert_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
unsigned idx; /* Location of record which matches key */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_insert_leaf)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -1606,7 +1606,7 @@ H5B2_insert_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
unsigned idx; /* Location of record which matches key */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_insert_internal)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -1736,7 +1736,7 @@ H5B2_create_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *node_ptr)
H5B2_leaf_t *leaf = NULL; /* Pointer to new leaf node created */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_create_leaf)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -1805,7 +1805,7 @@ H5B2_protect_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, haddr_t addr, unsigned nrec,
H5B2_leaf_cache_ud_t udata; /* User-data for callback */
H5B2_leaf_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_protect_leaf)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -1846,7 +1846,7 @@ H5B2_create_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *node_ptr,
H5B2_internal_t *internal = NULL; /* Pointer to new internal node created */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_create_internal)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -1924,7 +1924,7 @@ H5B2_protect_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, haddr_t addr,
H5B2_internal_cache_ud_t udata; /* User data to pass through to cache 'deserialize' callback */
H5B2_internal_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_protect_internal)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -1975,7 +1975,7 @@ H5B2_iterate_node(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
unsigned u; /* Local index */
herr_t ret_value = H5_ITER_CONT; /* Iterator return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_iterate_node)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -2082,7 +2082,7 @@ H5B2_remove_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
unsigned idx; /* Location of record which matches key */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_remove_leaf)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -2167,7 +2167,7 @@ H5B2_remove_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, hbool_t *depth_decreased,
hbool_t collapsed_root = FALSE; /* Whether the root was collapsed */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_remove_internal)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -2363,7 +2363,7 @@ H5B2_remove_leaf_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
unsigned leaf_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting leaf node */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_remove_leaf_by_idx)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -2447,7 +2447,7 @@ H5B2_remove_internal_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
hbool_t collapsed_root = FALSE; /* Whether the root was collapsed */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_remove_internal_by_idx)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -2710,7 +2710,7 @@ H5B2_neighbor_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_pt
int cmp = 0; /* Comparison value of records */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_neighbor_leaf)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -2796,7 +2796,7 @@ H5B2_neighbor_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
int cmp = 0; /* Comparison value of records */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_neighbor_internal)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -2868,7 +2868,7 @@ H5B2_delete_node(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
uint8_t *native; /* Pointers to node's native records */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_delete_node)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@ -2946,7 +2946,7 @@ H5B2_node_size(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
H5B2_internal_t *internal = NULL; /* Pointer to internal node */
herr_t ret_value = SUCCEED; /* Iterator return value */
FUNC_ENTER_NOAPI(H5B2_node_size, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(hdr);
@ -2999,7 +2999,7 @@ H5B2_internal_free(H5B2_internal_t *internal)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_internal_free)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -3044,7 +3044,7 @@ H5B2_leaf_free(H5B2_leaf_t *leaf)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_leaf_free)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.

4
src/H5B2stat.c
View File

@ -86,7 +86,7 @@
herr_t
H5B2_stat_info(H5B2_t *bt2, H5B2_stat_t *info)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_stat_info)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(info);
@ -118,7 +118,7 @@ H5B2_size(H5B2_t *bt2, hid_t dxpl_id, hsize_t *btree_size)
H5B2_hdr_t *hdr; /* Pointer to the B-tree header */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5B2_size, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);

22
src/H5B2test.c
View File

@ -126,7 +126,7 @@ H5B2_test_crt_context(void *_f)
H5B2_test_ctx_t *ctx; /* Callback context structure */
void *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_test_crt_context)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@ -164,7 +164,7 @@ H5B2_test_dst_context(void *_ctx)
{
H5B2_test_ctx_t *ctx = (H5B2_test_ctx_t *)_ctx; /* Callback context structure */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_dst_context)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@ -192,7 +192,7 @@ H5B2_test_dst_context(void *_ctx)
static herr_t
H5B2_test_store(void *nrecord, const void *udata)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_store)
FUNC_ENTER_NOAPI_NOINIT_NOERR
*(hsize_t *)nrecord = *(const hsize_t *)udata;
@ -217,7 +217,7 @@ H5B2_test_store(void *nrecord, const void *udata)
static herr_t
H5B2_test_compare(const void *rec1, const void *rec2)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_compare)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI((herr_t)(*(const hssize_t *)rec1 - *(const hssize_t *)rec2))
} /* H5B2_test_compare() */
@ -241,7 +241,7 @@ H5B2_test_encode(uint8_t *raw, const void *nrecord, void *_ctx)
{
H5B2_test_ctx_t *ctx = (H5B2_test_ctx_t *)_ctx; /* Callback context structure */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_encode)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@ -270,7 +270,7 @@ H5B2_test_decode(const uint8_t *raw, void *nrecord, void *_ctx)
{
H5B2_test_ctx_t *ctx = (H5B2_test_ctx_t *)_ctx; /* Callback context structure */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_decode)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@ -299,7 +299,7 @@ H5B2_test_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED dxpl_id,
int indent, int fwidth, const void *record,
const void UNUSED *_udata)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_debug)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert (record);
@ -329,7 +329,7 @@ H5B2_test_crt_dbg_context(H5F_t *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr)
H5B2_test_ctx_t *ctx; /* Callback context structure */
void *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B2_test_crt_dbg_context)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@ -365,7 +365,7 @@ done:
herr_t
H5B2_get_root_addr_test(H5B2_t *bt2, haddr_t *root_addr)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_get_root_addr_test)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(bt2);
@ -402,7 +402,7 @@ H5B2_get_node_info_test(H5B2_t *bt2, hid_t dxpl_id, void *udata,
unsigned idx; /* Location of record which matches key */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5B2_get_node_info_test, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);
@ -516,7 +516,7 @@ H5B2_get_node_depth_test(H5B2_t *bt2, hid_t dxpl_id, void *udata)
H5B2_node_info_test_t ninfo; /* Node information */
int ret_value; /* Return information */
FUNC_ENTER_NOAPI(H5B2_get_node_depth_test, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);

10
src/H5Bcache.c
View File

@ -108,7 +108,7 @@ H5B_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
unsigned u; /* Local index variable */
H5B_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B_load)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@ -207,7 +207,7 @@ H5B_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B_t *bt, uns
H5B_shared_t *shared; /* Pointer to shared B-tree info */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B_flush)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@ -297,7 +297,7 @@ H5B_dest(H5F_t *f, H5B_t *bt)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5B_dest)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -350,7 +350,7 @@ H5B_clear(H5F_t *f, H5B_t *bt, hbool_t destroy)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5B_clear)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -388,7 +388,7 @@ H5B_compute_size(const H5F_t UNUSED *f, const H5B_t *bt, size_t *size_ptr)
{
H5B_shared_t *shared; /* Pointer to shared B-tree info */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B_compute_size)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);

4
src/H5Bdbg.c
View File

@ -65,7 +65,7 @@ H5B_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int f
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5B_debug, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -189,7 +189,7 @@ H5B_assert(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type, void
struct child_t *next;
} *head = NULL, *tail = NULL, *prev = NULL, *cur = NULL, *tmp = NULL;
FUNC_ENTER_NOAPI_NOINIT(H5B_assert)
FUNC_ENTER_NOAPI_NOINIT
if(0 == ncalls++) {
if(H5DEBUG(B))

128
src/H5C.c
View File

@ -243,7 +243,7 @@ H5C_epoch_marker_load(H5F_t UNUSED * f,
{
void * ret_value = NULL; /* Return value */
FUNC_ENTER_NOAPI(H5C_epoch_marker_load, NULL)
FUNC_ENTER_NOAPI_NOINIT
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, NULL, "called unreachable fcn.")
@ -262,7 +262,7 @@ H5C_epoch_marker_flush(H5F_t UNUSED *f,
{
herr_t ret_value = FAIL; /* Return value */
FUNC_ENTER_NOAPI(H5C_epoch_marker_flush, FAIL)
FUNC_ENTER_NOAPI_NOINIT
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
@ -277,7 +277,7 @@ H5C_epoch_marker_dest(H5F_t UNUSED * f,
{
herr_t ret_value = FAIL; /* Return value */
FUNC_ENTER_NOAPI(H5C_epoch_marker_dest, FAIL)
FUNC_ENTER_NOAPI_NOINIT
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
@ -293,7 +293,7 @@ H5C_epoch_marker_clear(H5F_t UNUSED * f,
{
herr_t ret_value = FAIL; /* Return value */
FUNC_ENTER_NOAPI(H5C_epoch_marker_clear, FAIL)
FUNC_ENTER_NOAPI_NOINIT
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
@ -308,7 +308,7 @@ H5C_epoch_marker_notify(H5C_notify_action_t UNUSED action,
{
herr_t ret_value = FAIL; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5C_epoch_marker_notify)
FUNC_ENTER_NOAPI_NOINIT
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
@ -323,7 +323,7 @@ H5C_epoch_marker_size(const H5F_t UNUSED * f,
{
herr_t ret_value = FAIL; /* Return value */
FUNC_ENTER_NOAPI(H5C_epoch_marker_size, FAIL)
FUNC_ENTER_NOAPI_NOINIT
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
@ -459,7 +459,7 @@ H5C_apply_candidate_list(H5F_t * f,
#endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_apply_candidate_list, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -775,7 +775,7 @@ H5C_construct_candidate_list__clean_cache(H5C_t * cache_ptr)
size_t space_needed;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_construct_candidate_list__clean_cache, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -886,7 +886,7 @@ H5C_construct_candidate_list__min_clean(H5C_t * cache_ptr)
size_t space_needed = 0;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_construct_candidate_list__min_clean, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -989,7 +989,7 @@ H5C_create(size_t max_cache_size,
H5C_t * cache_ptr = NULL;
H5C_t * ret_value = NULL; /* Return value */
FUNC_ENTER_NOAPI(H5C_create, NULL)
FUNC_ENTER_NOAPI(NULL)
HDassert( max_cache_size >= H5C__MIN_MAX_CACHE_SIZE );
HDassert( max_cache_size <= H5C__MAX_MAX_CACHE_SIZE );
@ -1401,7 +1401,7 @@ H5C_dest(H5F_t * f,
H5C_t * cache_ptr = f->shared->cache;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_dest, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(cache_ptr);
@ -1455,7 +1455,7 @@ H5C_expunge_entry(H5F_t * f,
H5C_cache_entry_t * entry_ptr = NULL;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_expunge_entry, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( f );
HDassert( f->shared );
@ -1587,7 +1587,7 @@ H5C_flush_cache(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, unsign
size_t initial_slist_size;
#endif /* H5C_DO_SANITY_CHECKS */
FUNC_ENTER_NOAPI(H5C_flush_cache, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -1963,7 +1963,7 @@ H5C_flush_to_min_clean(H5F_t * f,
#endif /* JRM */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5C_flush_to_min_clean, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( f );
HDassert( f->shared );
@ -2134,7 +2134,7 @@ H5C_get_cache_auto_resize_config(const H5C_t * cache_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_get_cache_auto_resize_config, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
@ -2183,7 +2183,7 @@ H5C_get_cache_size(H5C_t * cache_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_get_cache_size, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
@ -2240,7 +2240,7 @@ H5C_get_cache_hit_rate(H5C_t * cache_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_get_cache_hit_rate, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
@ -2309,7 +2309,7 @@ H5C_get_entry_status(const H5F_t *f,
H5C_cache_entry_t * entry_ptr = NULL;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_get_entry_status, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( f );
HDassert( f->shared );
@ -2399,7 +2399,7 @@ H5C_get_evictions_enabled(const H5C_t *cache_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_get_evictions_enabled, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
@ -2440,7 +2440,7 @@ done:
herr_t
H5C_get_trace_file_ptr(const H5C_t *cache_ptr, FILE **trace_file_ptr_ptr)
{
FUNC_ENTER_NOAPI_NOFUNC(H5C_get_trace_file_ptr)
FUNC_ENTER_NOAPI_NOERR
HDassert(cache_ptr);
HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
@ -2472,7 +2472,7 @@ herr_t
H5C_get_trace_file_ptr_from_entry(const H5C_cache_entry_t *entry_ptr,
FILE **trace_file_ptr_ptr)
{
FUNC_ENTER_NOAPI_NOFUNC(H5C_get_trace_file_ptr_from_entry)
FUNC_ENTER_NOAPI_NOERR
/* Sanity checks */
HDassert(entry_ptr);
@ -2532,7 +2532,7 @@ H5C_insert_entry(H5F_t * f,
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_insert_entry, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( f );
HDassert( f->shared );
@ -2856,7 +2856,7 @@ H5C_mark_entries_as_clean(H5F_t * f,
H5C_cache_entry_t * entry_ptr = NULL;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_mark_entries_as_clean, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( f );
HDassert( f->shared );
@ -3126,7 +3126,7 @@ H5C_mark_entry_dirty(void *thing)
H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)thing;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_mark_entry_dirty, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
HDassert(entry_ptr);
@ -3205,7 +3205,7 @@ H5C_move_entry(H5C_t * cache_ptr,
#endif /* H5C_DO_SANITY_CHECKS */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_move_entry, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -3369,7 +3369,7 @@ H5C_resize_entry(void *thing, size_t new_size)
H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)thing;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_resize_entry, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
HDassert(entry_ptr);
@ -3476,7 +3476,7 @@ H5C_pin_entry_from_client(H5C_t UNUSED * cache_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5C_pin_entry_from_client)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert( cache_ptr );
@ -3522,7 +3522,7 @@ H5C_pin_protected_entry(void *thing)
H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)thing; /* Pointer to entry to pin */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_pin_protected_entry, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
HDassert(entry_ptr);
@ -3617,7 +3617,7 @@ H5C_protect(H5F_t * f,
H5P_genplist_t *dxpl; /* dataset transfer property list */
void * ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5C_protect, NULL)
FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert( f );
@ -4021,7 +4021,7 @@ H5C_reset_cache_hit_rate_stats(H5C_t * cache_ptr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_reset_cache_hit_rate_stats, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
@ -4066,7 +4066,7 @@ H5C_set_cache_auto_resize_config(H5C_t *cache_ptr,
size_t new_min_clean_size;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_set_cache_auto_resize_config, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
@ -4340,7 +4340,7 @@ H5C_set_evictions_enabled(H5C_t *cache_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_set_evictions_enabled, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
@ -4394,7 +4394,7 @@ H5C_set_prefix(H5C_t * cache_ptr, char * prefix)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_set_prefix, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if ( ( cache_ptr == NULL ) ||
( cache_ptr->magic != H5C__H5C_T_MAGIC ) ||
@ -4437,7 +4437,7 @@ H5C_set_trace_file_ptr(H5C_t * cache_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_set_trace_file_ptr, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* This would normally be an assert, but we need to use an HGOTO_ERROR
* call to shut up the compiler.
@ -4524,7 +4524,7 @@ H5C_stats(H5C_t * cache_ptr,
double average_entries_scanned_per_calls_to_msic = 0.0;
#endif /* H5C_COLLECT_CACHE_STATS */
FUNC_ENTER_NOAPI(H5C_stats, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* This would normally be an assert, but we need to use an HGOTO_ERROR
* call to shut up the compiler.
@ -5051,7 +5051,7 @@ H5C_dump_cache(H5C_t * cache_ptr,
H5SL_t * slist_ptr = NULL;
H5SL_node_t * node_ptr = NULL;
FUNC_ENTER_NOAPI(H5C_dump_cache, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(cache_ptr != NULL);
HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
@ -5178,7 +5178,7 @@ H5C_unpin_entry_from_client(H5C_t * cache_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5C_unpin_entry_from_client)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checking */
HDassert( cache_ptr );
@ -5231,7 +5231,7 @@ H5C_unpin_entry(void *_entry_ptr)
H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)_entry_ptr; /* Pointer to entry to unpin */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_unpin_entry, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(entry_ptr);
@ -5310,7 +5310,7 @@ H5C_unprotect(H5F_t * f,
H5C_cache_entry_t * test_entry_ptr;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_unprotect, FAIL)
FUNC_ENTER_NOAPI(FAIL)
deleted = ( (flags & H5C__DELETED_FLAG) != 0 );
dirtied = ( (flags & H5C__DIRTIED_FLAG) != 0 );
@ -5623,7 +5623,7 @@ H5C_validate_resize_config(H5C_auto_size_ctl_t * config_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_validate_resize_config, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if ( config_ptr == NULL ) {
@ -5881,7 +5881,7 @@ static void
H5C_adjust_flush_dependency_rc(H5C_cache_entry_t * cache_entry,
unsigned old_child_height, unsigned new_child_height)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5C_adjust_flush_dependency_rc)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(cache_entry);
@ -5994,7 +5994,7 @@ H5C_create_flush_dependency(void * parent_thing, void * child_thing)
#endif /* NDEBUG */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_create_flush_dependency, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
HDassert(parent_entry);
@ -6107,7 +6107,7 @@ H5C_destroy_flush_dependency(void *parent_thing, void * child_thing)
#endif /* NDEBUG */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_destroy_flush_dependency, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
HDassert(parent_entry);
@ -6246,7 +6246,7 @@ H5C__auto_adjust_cache_size(H5F_t * f,
enum H5C_resize_status status = in_spec; /* will change if needed */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5C__auto_adjust_cache_size)
FUNC_ENTER_NOAPI_NOINIT
HDassert( f );
HDassert( cache_ptr );
@ -6596,7 +6596,7 @@ H5C__autoadjust__ageout(H5F_t * f,
size_t test_size;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout)
FUNC_ENTER_NOAPI_NOINIT
HDassert( f );
HDassert( cache_ptr );
@ -6709,7 +6709,7 @@ H5C__autoadjust__ageout__cycle_epoch_marker(H5C_t * cache_ptr)
herr_t ret_value = SUCCEED; /* Return value */
int i;
FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__cycle_epoch_marker)
FUNC_ENTER_NOAPI_NOINIT
HDassert( cache_ptr );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -6847,7 +6847,7 @@ H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * f,
H5C_cache_entry_t * prev_ptr;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__evict_aged_out_entries)
FUNC_ENTER_NOAPI_NOINIT
HDassert( f );
HDassert( cache_ptr );
@ -7054,7 +7054,7 @@ H5C__autoadjust__ageout__insert_new_marker(H5C_t * cache_ptr)
herr_t ret_value = SUCCEED; /* Return value */
int i;
FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__insert_new_marker)
FUNC_ENTER_NOAPI_NOINIT
HDassert( cache_ptr );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -7132,7 +7132,7 @@ H5C__autoadjust__ageout__remove_all_markers(H5C_t * cache_ptr)
int i;
int ring_buf_index;
FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__remove_all_markers)
FUNC_ENTER_NOAPI_NOINIT
HDassert( cache_ptr );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -7213,7 +7213,7 @@ H5C__autoadjust__ageout__remove_excess_markers(H5C_t * cache_ptr)
int i;
int ring_buf_index;
FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__remove_excess_markers)
FUNC_ENTER_NOAPI_NOINIT
HDassert( cache_ptr );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -7309,7 +7309,7 @@ H5C__flash_increase_cache_size(H5C_t * cache_ptr,
double hit_rate;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5C__flash_increase_cache_size)
FUNC_ENTER_NOAPI_NOINIT
HDassert( cache_ptr );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -7506,7 +7506,7 @@ H5C_flush_invalidate_cache(H5F_t * f,
#endif /* H5C_DO_SANITY_CHECKS */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5C_flush_invalidate_cache, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert( f );
HDassert( cache_ptr );
@ -8056,7 +8056,7 @@ H5C_flush_single_entry(H5F_t * f,
H5C_cache_entry_t * entry_ptr = NULL;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5C_flush_single_entry)
FUNC_ENTER_NOAPI_NOINIT
HDassert( f );
HDassert( cache_ptr );
@ -8479,7 +8479,7 @@ H5C_load_entry(H5F_t * f,
unsigned u; /* Local index variable */
void * ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5C_load_entry)
FUNC_ENTER_NOAPI_NOINIT
HDassert(f);
HDassert(f->shared);
@ -8649,7 +8649,7 @@ H5C_make_space_in_cache(H5F_t * f,
H5C_cache_entry_t * next_ptr;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5C_make_space_in_cache)
FUNC_ENTER_NOAPI_NOINIT
HDassert( f );
HDassert( cache_ptr );
@ -8946,7 +8946,7 @@ H5C_validate_lru_list(H5C_t * cache_ptr)
size_t size = 0;
H5C_cache_entry_t * entry_ptr = NULL;
FUNC_ENTER_NOAPI_NOINIT(H5C_validate_lru_list)
FUNC_ENTER_NOAPI_NOINIT
HDassert( cache_ptr );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -9067,7 +9067,7 @@ H5C_verify_not_in_index(H5C_t * cache_ptr,
int32_t depth;
H5C_cache_entry_t * scan_ptr = NULL;
FUNC_ENTER_NOAPI_NOINIT(H5C_verify_not_in_index)
FUNC_ENTER_NOAPI_NOINIT
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@ -9129,7 +9129,7 @@ done:
herr_t
H5C_ignore_tags(H5C_t * cache_ptr)
{
FUNC_ENTER_NOAPI_NOFUNC(H5C_ignore_tags)
FUNC_ENTER_NOAPI_NOERR
/* Assertions */
HDassert(cache_ptr != NULL);
@ -9167,7 +9167,7 @@ H5C_tag_entry(H5C_t * cache_ptr, H5C_cache_entry_t * entry_ptr, hid_t dxpl_id)
haddr_t tag; /* Tag address */
hid_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5C_tag_entry, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Assertions */
HDassert(cache_ptr != NULL);
@ -9230,7 +9230,7 @@ H5C_flush_tagged_entries(H5F_t * f, hid_t primary_dxpl_id, hid_t secondary_dxpl_
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5C_flush_tagged_entries, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Assertions */
HDassert(0); /* This function is not yet used. We shouldn't be in here yet. */
@ -9274,7 +9274,7 @@ H5C_mark_tagged_entries(H5C_t * cache_ptr, haddr_t tag)
H5C_cache_entry_t *next_entry_ptr; /* entry pointer */
unsigned u; /* Local index variable */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5C_mark_tagged_entries)
FUNC_ENTER_NOAPI_NOINIT
/* Assertions */
HDassert(0); /* This function is not yet used. We shouldn't be in here yet. */
@ -9319,7 +9319,7 @@ H5C_flush_marked_entries(H5F_t * f, hid_t primary_dxpl_id, hid_t secondary_dxpl_
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5C_flush_marked_entries, FAIL)
FUNC_ENTER_NOAPI_NOINIT
/* Assertions */
HDassert(0); /* This function is not yet used. We shouldn't be in here yet. */
@ -9355,7 +9355,7 @@ H5C_verify_tag(int id, haddr_t tag)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5C_verify_tag, FAIL)
FUNC_ENTER_NOAPI_NOINIT
/* Perform some sanity checks on tag value. Certain entry
* types require certain tag values, so check that these
@ -9433,7 +9433,7 @@ H5C_retag_copied_metadata(H5C_t * cache_ptr, haddr_t metadata_tag)
{
unsigned u; /* Local index variable */
FUNC_ENTER_NOAPI_NOFUNC(H5C_retag_copied_metadata)
FUNC_ENTER_NOAPI_NOINIT
HDassert(cache_ptr);

14
src/H5CS.c
View File

@ -79,7 +79,7 @@ H5CS_get_stack(void)
{
H5CS_t *fstack;
FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_get_stack);
FUNC_ENTER_NOAPI_NOERR_NOFS
fstack = H5TS_get_thread_local_value(H5TS_funcstk_key_g);
if (!fstack) {
@ -123,7 +123,7 @@ H5CS_print_stack(const H5CS_t *fstack, FILE *stream)
int i; /* Local index ariable */
/* Don't push this function on the function stack... :-) */
FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_print_stack);
FUNC_ENTER_NOAPI_NOERR_NOFS
/* Sanity check */
HDassert(fstack);
@ -170,7 +170,7 @@ H5CS_print(FILE *stream)
H5CS_t *fstack = H5CS_get_my_stack (); /* Get the correct function stack */
/* Don't push this function on the function stack... :-) */
FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_print);
FUNC_ENTER_NOAPI_NOERR_NOFS
/* Sanity check */
assert(fstack);
@ -202,7 +202,7 @@ H5CS_push(const char *func_name)
H5CS_t *fstack = H5CS_get_my_stack ();
/* Don't push this function on the function stack... :-) */
FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_push);
FUNC_ENTER_NOAPI_NOERR_NOFS
/* Sanity check */
assert (fstack);
@ -239,7 +239,7 @@ H5CS_pop(void)
H5CS_t *fstack = H5CS_get_my_stack ();
/* Don't push this function on the function stack... :-) */
FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_pop);
FUNC_ENTER_NOAPI_NOERR_NOFS
/* Sanity check */
assert (fstack);
@ -273,7 +273,7 @@ H5CS_copy_stack(H5CS_t *new_stack)
unsigned u; /* Local index variable */
/* Don't push this function on the function stack... :-) */
FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_copy_stack);
FUNC_ENTER_NOAPI_NOERR_NOFS
/* Sanity check */
HDassert (old_stack);
@ -307,7 +307,7 @@ H5CS_close_stack(H5CS_t *stack)
unsigned u; /* Local index variable */
/* Don't push this function on the function stack... :-) */
FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_close_stack);
FUNC_ENTER_NOAPI_NOERR_NOFS
/* Sanity check */
HDassert (stack);

32
src/H5D.c
View File

@ -88,7 +88,7 @@ DESCRIPTION
static herr_t
H5D_init_pub_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_init_pub_interface)
FUNC_ENTER_NOAPI_NOINIT
FUNC_LEAVE_NOAPI(H5D_init())
} /* H5D_init_pub_interface() */
@ -132,7 +132,7 @@ H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
const H5S_t *space; /* Dataspace for dataset */
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Dcreate2, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE7("i", "i*siiiii", loc_id, name, type_id, space_id, lcpl_id, dcpl_id,
dapl_id);
@ -224,7 +224,7 @@ H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t dcpl_id,
const H5S_t *space; /* Dataspace for dataset */
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Dcreate_anon, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE5("i", "iiiii", loc_id, type_id, space_id, dcpl_id, dapl_id);
/* Check arguments */
@ -308,7 +308,7 @@ H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id)
hid_t dxpl_id = H5AC_dxpl_id; /* dxpl to use to open datset */
hid_t ret_value;
FUNC_ENTER_API(H5Dopen2, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("i", "i*si", loc_id, name, dapl_id);
/* Check args */
@ -383,7 +383,7 @@ H5Dclose(hid_t dset_id)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Dclose, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", dset_id);
/* Check args */
@ -429,7 +429,7 @@ H5Dget_space(hid_t dset_id)
H5S_t *space = NULL;
hid_t ret_value;
FUNC_ENTER_API(H5Dget_space, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", dset_id);
/* Check args */
@ -476,7 +476,7 @@ H5Dget_space_status(hid_t dset_id, H5D_space_status_t *allocation)
H5D_t *dset = NULL;
herr_t ret_value = SUCCEED;
FUNC_ENTER_API(H5Dget_space_status, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*Ds", dset_id, allocation);
/* Check arguments */
@ -516,7 +516,7 @@ H5Dget_type(hid_t dset_id)
H5T_t *dt = NULL; /* Datatype to return */
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Dget_type, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", dset_id);
/* Check args */
@ -579,7 +579,7 @@ H5Dget_create_plist(hid_t dset_id)
hid_t new_dcpl_id = FAIL;
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Dget_create_plist, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", dset_id);
/* Check args */
@ -716,7 +716,7 @@ H5Dget_access_plist(hid_t dset_id)
hid_t new_dapl_id = FAIL;
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Dget_access_plist, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", dset_id);
/* Check args */
@ -778,7 +778,7 @@ H5Dget_storage_size(hid_t dset_id)
H5D_t *dset; /* Dataset to query */
hsize_t ret_value; /* Return value */
FUNC_ENTER_API(H5Dget_storage_size, 0)
FUNC_ENTER_API(0)
H5TRACE1("h", "i", dset_id);
/* Check args */
@ -813,7 +813,7 @@ H5Dget_offset(hid_t dset_id)
H5D_t *dset; /* Dataset to query */
haddr_t ret_value; /* Return value */
FUNC_ENTER_API(H5Dget_offset, HADDR_UNDEF)
FUNC_ENTER_API(HADDR_UNDEF)
H5TRACE1("a", "i", dset_id);
/* Check args */
@ -894,7 +894,7 @@ H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t op,
H5S_t *space; /* Dataspace for iteration */
herr_t ret_value; /* Return value */
FUNC_ENTER_API(H5Diterate, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE5("e", "*xiix*x", buf, type_id, space_id, op, operator_data);
/* Check args */
@ -937,7 +937,7 @@ H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf)
H5S_t *space; /* Dataspace for iteration */
herr_t ret_value; /* Return value */
FUNC_ENTER_API(H5Dvlen_reclaim, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE4("e", "iii*x", type_id, space_id, plist_id, buf);
/* Check args */
@ -998,7 +998,7 @@ H5Dvlen_get_buf_size(hid_t dataset_id, hid_t type_id, hid_t space_id,
H5P_genplist_t *plist; /* Property list */
herr_t ret_value; /* Return value */
FUNC_ENTER_API(H5Dvlen_get_buf_size, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE4("e", "iii*h", dataset_id, type_id, space_id, size);
/* Check args */
@ -1088,7 +1088,7 @@ H5Dset_extent(hid_t dset_id, const hsize_t size[])
H5D_t *dset; /* Dataset for this operation */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Dset_extent, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*h", dset_id, size);
/* Check args */

54
src/H5Dbtree.c
View File

@ -224,7 +224,7 @@ H5D_btree_get_shared(const H5F_t UNUSED *f, const void *_udata)
{
const H5D_chunk_common_ud_t *udata = (const H5D_chunk_common_ud_t *) _udata;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_get_shared)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(udata);
HDassert(udata->storage);
@ -265,7 +265,7 @@ H5D_btree_new_node(H5F_t *f, hid_t dxpl_id, H5B_ins_t op,
unsigned u;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_btree_new_node)
FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@ -337,7 +337,7 @@ H5D_btree_cmp2(void *_lt_key, void *_udata, void *_rt_key)
H5D_chunk_common_ud_t *udata = (H5D_chunk_common_ud_t *) _udata;
int ret_value;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_cmp2)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(lt_key);
HDassert(rt_key);
@ -386,7 +386,7 @@ H5D_btree_cmp3(void *_lt_key, void *_udata, void *_rt_key)
H5D_chunk_common_ud_t *udata = (H5D_chunk_common_ud_t *) _udata;
int ret_value = 0;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_cmp3)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(lt_key);
HDassert(rt_key);
@ -453,7 +453,7 @@ H5D_btree_found(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t addr, const void
unsigned u;
htri_t ret_value = TRUE; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_found)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(f);
@ -521,7 +521,7 @@ H5D_btree_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key,
unsigned u;
H5B_ins_t ret_value;
FUNC_ENTER_NOAPI_NOINIT(H5D_btree_insert)
FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@ -638,7 +638,7 @@ H5D_btree_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key /*in,out *
H5D_btree_key_t *lt_key = (H5D_btree_key_t *)_lt_key;
H5B_ins_t ret_value=H5B_INS_REMOVE; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_btree_remove)
FUNC_ENTER_NOAPI_NOINIT
/* Remove raw data chunk from file */
H5_CHECK_OVERFLOW(lt_key->nbytes, uint32_t, hsize_t);
@ -673,7 +673,7 @@ H5D_btree_decode_key(const H5B_shared_t *shared, const uint8_t *raw, void *_key)
size_t ndims;
unsigned u;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_decode_key)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(shared);
@ -711,7 +711,7 @@ H5D_btree_encode_key(const H5B_shared_t *shared, uint8_t *raw, const void *_key)
size_t ndims;
unsigned u;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_encode_key)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(shared);
@ -751,7 +751,7 @@ H5D_btree_debug_key(FILE *stream, int indent, int fwidth, const void *_key,
const H5D_btree_dbg_t *udata = (const H5D_btree_dbg_t *)_udata;
unsigned u;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_debug_key)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(key);
@ -785,7 +785,7 @@ H5D_btree_shared_create(const H5F_t *f, H5O_storage_chunk_t *store, unsigned ndi
size_t sizeof_rkey; /* Size of raw (disk) key */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_btree_shared_create)
FUNC_ENTER_NOAPI_NOINIT
/* Set the raw key size */
sizeof_rkey = 4 + /*storage size */
@ -826,7 +826,7 @@ H5D_btree_idx_init(const H5D_chk_idx_info_t *idx_info, const H5S_t UNUSED *space
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_init)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(idx_info);
@ -871,7 +871,7 @@ H5D_btree_idx_create(const H5D_chk_idx_info_t *idx_info)
H5D_chunk_common_ud_t udata; /* User data for B-tree callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_create)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(idx_info);
@ -911,7 +911,7 @@ H5D_btree_idx_is_space_alloc(const H5O_storage_chunk_t *storage)
{
hbool_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_idx_is_space_alloc)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(storage);
@ -941,7 +941,7 @@ H5D_btree_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_insert)
FUNC_ENTER_NOAPI_NOINIT
HDassert(idx_info);
HDassert(idx_info->f);
@ -982,7 +982,7 @@ H5D_btree_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_get_addr)
FUNC_ENTER_NOAPI_NOINIT
HDassert(idx_info);
HDassert(idx_info->f);
@ -1028,7 +1028,7 @@ H5D_btree_idx_iterate_cb(H5F_t UNUSED *f, hid_t UNUSED dxpl_id,
H5D_chunk_rec_t chunk_rec; /* Generic chunk record for callback */
int ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOERR(H5D_btree_idx_iterate_cb)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check for memcpy() */
HDcompile_assert(offsetof(H5D_chunk_rec_t, nbytes) == offsetof(H5D_btree_key_t, nbytes));
@ -1070,7 +1070,7 @@ H5D_btree_idx_iterate(const H5D_chk_idx_info_t *idx_info,
H5D_btree_it_ud_t udata; /* User data for B-tree iterator callback */
int ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOERR(H5D_btree_idx_iterate)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(idx_info);
HDassert(idx_info->f);
@ -1113,7 +1113,7 @@ H5D_btree_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t *
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_remove)
FUNC_ENTER_NOAPI_NOINIT
HDassert(idx_info);
HDassert(idx_info->f);
@ -1153,7 +1153,7 @@ H5D_btree_idx_delete(const H5D_chk_idx_info_t *idx_info)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_delete)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(idx_info);
@ -1213,7 +1213,7 @@ H5D_btree_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_TAG(H5D_btree_idx_copy_setup, idx_info_dst->dxpl_id, H5AC__COPIED_TAG, FAIL)
FUNC_ENTER_NOAPI_NOINIT_TAG(idx_info_dst->dxpl_id, H5AC__COPIED_TAG, FAIL)
HDassert(idx_info_src);
HDassert(idx_info_src->f);
@ -1262,7 +1262,7 @@ H5D_btree_idx_copy_shutdown(H5O_storage_chunk_t *storage_src,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_copy_shutdown)
FUNC_ENTER_NOAPI_NOINIT
HDassert(storage_src);
HDassert(storage_dst);
@ -1299,7 +1299,7 @@ H5D_btree_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *index_size)
hbool_t shared_init = FALSE; /* Whether shared B-tree info is initialized */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_btree_idx_size, FAIL)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(idx_info);
@ -1353,7 +1353,7 @@ done:
static herr_t
H5D_btree_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_addr)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_idx_reset)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(storage);
@ -1381,7 +1381,7 @@ H5D_btree_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_addr)
static herr_t
H5D_btree_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_idx_dump)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(storage);
HDassert(stream);
@ -1409,7 +1409,7 @@ H5D_btree_idx_dest(const H5D_chk_idx_info_t *idx_info)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_dest)
FUNC_ENTER_NOAPI_NOINIT
HDassert(idx_info);
HDassert(idx_info->f);
@ -1449,7 +1449,7 @@ H5D_btree_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent
hbool_t shared_init = FALSE; /* Whether B-tree shared info is initialized */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_btree_debug, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Reset "fake" storage info */
HDmemset(&storage, 0, sizeof(storage));

98
src/H5Dchunk.c
View File

@ -295,7 +295,7 @@ H5D_chunk_set_info_real(H5O_layout_chunk_t *layout, unsigned ndims, const hsize_
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_chunk_set_info_real, FAIL)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(layout);
@ -340,7 +340,7 @@ H5D_chunk_set_info(const H5D_t *dset)
unsigned ndims; /* Rank of dataspace */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_chunk_set_info, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
HDassert(dset);
@ -386,7 +386,7 @@ H5D_chunk_construct(H5F_t UNUSED *f, H5D_t *dset)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_construct)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(f);
@ -475,7 +475,7 @@ H5D_chunk_init(H5F_t *f, hid_t dxpl_id, const H5D_t *dset, hid_t dapl_id)
H5P_genplist_t *dapl; /* Data access property list object pointer */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_chunk_init, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@ -549,7 +549,7 @@ H5D_chunk_is_space_alloc(const H5O_storage_t *storage)
{
hbool_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOFUNC(H5D_chunk_is_space_alloc)
FUNC_ENTER_NOAPI_NOERR
/* Sanity checks */
HDassert(storage);
@ -594,7 +594,7 @@ H5D_chunk_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info
hbool_t sel_hyper_flag;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_io_init)
FUNC_ENTER_NOAPI_NOINIT
/* Get layout for dataset */
fm->layout = &(dataset->shared->layout);
@ -862,7 +862,7 @@ H5D_chunk_alloc(size_t size, const H5O_pline_t *pline)
{
void *ret_value = NULL; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_alloc)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(size);
HDassert(pline);
@ -893,7 +893,7 @@ H5D_chunk_alloc(size_t size, const H5O_pline_t *pline)
static void *
H5D_chunk_xfree(void *chk, const H5O_pline_t *pline)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_xfree)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(pline);
@ -927,7 +927,7 @@ H5D_chunk_realloc(void *chk, size_t size, const H5O_pline_t *pline)
{
void *ret_value = NULL; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_realloc)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(size);
HDassert(pline);
@ -963,7 +963,7 @@ H5D_free_chunk_info(void *item, void UNUSED *key, void UNUSED *opdata)
{
H5D_chunk_info_t *chunk_info = (H5D_chunk_info_t *)item;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_free_chunk_info)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(chunk_info);
@ -1009,7 +1009,7 @@ H5D_create_chunk_map_single(H5D_chunk_map_t *fm, const H5D_io_info_t
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_create_chunk_map_single)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(fm->f_ndims > 0);
@ -1095,7 +1095,7 @@ H5D_create_chunk_file_map_hyper(H5D_chunk_map_t *fm, const H5D_io_info_t
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_create_chunk_file_map_hyper)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
assert(fm->f_ndims>0);
@ -1272,7 +1272,7 @@ H5D_create_chunk_mem_map_hyper(const H5D_chunk_map_t *fm)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_create_chunk_mem_map_hyper)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
assert(fm->f_ndims>0);
@ -1378,7 +1378,7 @@ H5D_chunk_file_cb(void UNUSED *elem, hid_t UNUSED type_id, unsigned ndims, const
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_file_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Calculate the index of this chunk */
if(H5V_chunk_index(ndims, coords, fm->layout->u.chunk.dim, fm->layout->u.chunk.down_chunks, &chunk_index) < 0)
@ -1490,7 +1490,7 @@ H5D_chunk_mem_cb(void UNUSED *elem, hid_t UNUSED type_id, unsigned ndims, const
hsize_t chunk_index; /* Chunk index */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_mem_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Calculate the index of this chunk */
if(H5V_chunk_index(ndims, coords, fm->layout->u.chunk.dim, fm->layout->u.chunk.down_chunks, &chunk_index) < 0)
@ -1565,7 +1565,7 @@ H5D_chunk_cacheable(const H5D_io_info_t *io_info, haddr_t caddr, hbool_t write_o
const H5D_t *dataset = io_info->dset;
htri_t ret_value = FAIL;
FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_cacheable)
FUNC_ENTER_NOAPI(FAIL)
HDassert(io_info);
HDassert(dataset);
@ -1648,7 +1648,7 @@ H5D_chunk_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
hbool_t skip_missing_chunks = FALSE; /* Whether to skip missing chunks */
herr_t ret_value = SUCCEED; /*return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_read)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(io_info);
@ -1797,7 +1797,7 @@ H5D_chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
uint32_t dst_accessed_bytes = 0; /* Total accessed size in a chunk */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_write)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(io_info);
@ -1944,7 +1944,7 @@ H5D_chunk_flush(H5D_t *dset, hid_t dxpl_id)
unsigned nerrors = 0; /* Count of any errors encountered when flushing chunks */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_flush)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(dset);
@ -1988,7 +1988,7 @@ H5D_chunk_io_term(const H5D_chunk_map_t *fm)
{
herr_t ret_value = SUCCEED; /*return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_io_term)
FUNC_ENTER_NOAPI_NOINIT
/* Single element I/O vs. multiple element I/O cleanup */
if(fm->use_single) {
@ -2039,7 +2039,7 @@ H5D_chunk_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_addr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_chunk_idx_reset, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
HDassert(storage);
@ -2069,7 +2069,7 @@ done:
herr_t
H5D_chunk_cinfo_cache_reset(H5D_chunk_cached_t *last)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_cinfo_cache_reset)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(last);
@ -2098,7 +2098,7 @@ H5D_chunk_cinfo_cache_update(H5D_chunk_cached_t *last, const H5D_chunk_ud_t *uda
{
unsigned u; /* Local index variable */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_cinfo_cache_update)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(last);
@ -2138,7 +2138,7 @@ H5D_chunk_cinfo_cache_found(const H5D_chunk_cached_t *last, H5D_chunk_ud_t *udat
{
hbool_t ret_value = FALSE; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_cinfo_cache_found)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(last);
@ -2191,7 +2191,7 @@ H5D_chunk_create(H5D_t *dset /*in,out*/, hid_t dxpl_id)
H5D_chk_idx_info_t idx_info; /* Chunked index info */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_chunk_create, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(dset);
@ -2244,7 +2244,7 @@ H5D_chunk_lookup(const H5D_t *dset, hid_t dxpl_id, const hsize_t *chunk_offset,
unsigned u; /* Counter */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_lookup)
FUNC_ENTER_NOAPI_NOINIT
HDassert(dset);
HDassert(dset->shared->layout.u.chunk.ndims > 0);
@ -2331,7 +2331,7 @@ H5D_chunk_flush_entry(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t *
hbool_t point_of_no_return = FALSE;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_TAG(H5D_chunk_flush_entry, dxpl_id, dset->oloc.addr, FAIL)
FUNC_ENTER_NOAPI_NOINIT_TAG(dxpl_id, dset->oloc.addr, FAIL)
HDassert(dset);
HDassert(dset->shared);
@ -2485,7 +2485,7 @@ H5D_chunk_cache_evict(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t *
H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk);
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_cache_evict)
FUNC_ENTER_NOAPI_NOINIT
HDassert(dset);
HDassert(dxpl_cache);
@ -2555,7 +2555,7 @@ H5D_chunk_cache_prune(const H5D_t *dset, hid_t dxpl_id,
int nerrors = 0; /* Accumulated error count during preemptions */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_cache_prune)
FUNC_ENTER_NOAPI_NOINIT
/*
* Preemption is accomplished by having multiple pointers (currently two)
@ -2681,7 +2681,7 @@ H5D_chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata,
unsigned u; /*counters */
void *ret_value; /*return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_lock)
FUNC_ENTER_NOAPI(NULL)
HDassert(io_info);
HDassert(io_info->dxpl_cache);
@ -2945,7 +2945,7 @@ H5D_chunk_unlock(const H5D_io_info_t *io_info, const H5D_chunk_ud_t *udata,
const H5D_rdcc_t *rdcc = &(io_info->dset->shared->cache.chunk);
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_unlock)
FUNC_ENTER_NOAPI(FAIL)
HDassert(io_info);
HDassert(udata);
@ -3021,7 +3021,7 @@ H5D_chunk_allocated_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
{
hsize_t *nbytes = (hsize_t *)_udata;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_allocated_cb)
FUNC_ENTER_NOAPI_NOINIT_NOERR
*(hsize_t *)nbytes += chunk_rec->nbytes;
@ -3054,7 +3054,7 @@ H5D_chunk_allocated(H5D_t *dset, hid_t dxpl_id, hsize_t *nbytes)
hsize_t chunk_bytes = 0; /* Number of bytes allocated for chunks */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_chunk_allocated, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(dset);
HDassert(dset->shared);
@ -3138,7 +3138,7 @@ H5D_chunk_allocate(H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite,
hid_t data_dxpl_id; /* DXPL ID to use for raw data I/O operations */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5D_chunk_allocate, dxpl_id, dset->oloc.addr, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, dset->oloc.addr, FAIL)
/* Check args */
HDassert(dset && H5D_CHUNKED == layout->type);
@ -3484,7 +3484,7 @@ H5D_chunk_prune_fill(H5D_chunk_it_ud1_t *udata)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_prune_fill)
FUNC_ENTER_NOAPI_NOINIT
/* Get the chunk's size */
HDassert(layout->u.chunk.size > 0);
@ -3709,7 +3709,7 @@ H5D_chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim)
int i; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_chunk_prune_by_extent, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(dset && H5D_CHUNKED == layout->type);
@ -4008,7 +4008,7 @@ H5D_chunk_addrmap_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
hsize_t chunk_index;
int ret_value = H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_addrmap_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Compute the index for this chunk */
if(H5V_chunk_index(rank, chunk_rec->offset, udata->common.layout->dim, udata->common.layout->down_chunks, &chunk_index) < 0)
@ -4043,7 +4043,7 @@ H5D_chunk_addrmap(const H5D_io_info_t *io_info, haddr_t chunk_addr[])
H5D_chunk_it_ud2_t udata; /* User data for iteration callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_chunk_addrmap, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(dset);
HDassert(dset->shared);
@ -4097,7 +4097,7 @@ H5D_chunk_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_storage_t *storage)
htri_t exists; /* Flag if header message of interest exists */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_chunk_delete, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@ -4175,7 +4175,7 @@ H5D_chunk_update_cache(H5D_t *dset, hid_t dxpl_id)
unsigned rank; /*current # of dimensions */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_chunk_update_cache, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(dset && H5D_CHUNKED == dset->shared->layout.type);
@ -4271,7 +4271,7 @@ H5D_chunk_copy_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
int ret_value = H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_copy_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Get 'size_t' local value for number of bytes in chunk */
H5_ASSIGN_OVERFLOW(nbytes, chunk_rec->nbytes, uint32_t, size_t);
@ -4457,7 +4457,7 @@ H5D_chunk_copy(H5F_t *f_src, H5O_storage_chunk_t *storage_src,
hbool_t copy_setup_done = FALSE; /* Indicate that 'copy setup' is done */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_chunk_copy, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f_src);
@ -4695,7 +4695,7 @@ H5D_chunk_bh_info(H5F_t *f, hid_t dxpl_id, H5O_layout_t *layout,
H5D_chk_idx_info_t idx_info; /* Chunked index info */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_chunk_bh_info, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
@ -4740,7 +4740,7 @@ H5D_chunk_dump_index_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
{
H5D_chunk_it_ud4_t *udata = (H5D_chunk_it_ud4_t *)_udata; /* User data from caller */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_dump_index_cb)
FUNC_ENTER_NOAPI_NOINIT_NOERR
if(udata->stream) {
unsigned u; /* Local index variable */
@ -4784,7 +4784,7 @@ H5D_chunk_dump_index(H5D_t *dset, hid_t dxpl_id, FILE *stream)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_chunk_dump_index, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(dset);
@ -4844,7 +4844,7 @@ H5D_chunk_dest(H5F_t *f, hid_t dxpl_id, H5D_t *dset)
int nerrors = 0; /* Accumulated count of errors */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5D_chunk_dest, dxpl_id, dset->oloc.addr, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, dset->oloc.addr, FAIL)
HDassert(f);
HDassert(dset);
@ -4908,7 +4908,7 @@ H5D_chunk_stats(const H5D_t *dset, hbool_t headers)
char ascii[32];
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_chunk_stats, FAIL)
FUNC_ENTER_NOAPI_NOERR(FAIL)
if (!H5DEBUG(AC))
HGOTO_DONE(SUCCEED)
@ -4976,7 +4976,7 @@ H5D_nonexistent_readvv_cb(hsize_t UNUSED dst_off, hsize_t src_off, size_t len,
hbool_t fb_info_init = FALSE; /* Whether the fill value buffer has been initialized */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_nonexistent_readvv_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Initialize the fill value buffer */
if(H5D_fill_init(&fb_info, (udata->rbuf + src_off), NULL, NULL, NULL, NULL,
@ -5026,7 +5026,7 @@ H5D_nonexistent_readvv(const H5D_io_info_t *io_info,
H5D_chunk_readvv_ud_t udata; /* User data for H5V_opvv() operator */
ssize_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_nonexistent_readvv)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(io_info);

16
src/H5Dcompact.c
View File

@ -123,7 +123,7 @@ H5D_compact_fill(H5D_t *dset, hid_t dxpl_id)
hbool_t fb_info_init = FALSE; /* Whether the fill value buffer has been initialized */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_compact_fill, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(TRUE == H5P_isa_class(dxpl_id, H5P_DATASET_XFER));
@ -180,7 +180,7 @@ H5D_compact_construct(H5F_t *f, H5D_t *dset)
int i; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_compact_construct)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(f);
@ -231,7 +231,7 @@ done:
static hbool_t
H5D_compact_is_space_alloc(const H5O_storage_t UNUSED *storage)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_compact_is_space_alloc)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity checks */
HDassert(storage);
@ -258,7 +258,7 @@ H5D_compact_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t UNUSED *
hsize_t UNUSED nelmts, const H5S_t UNUSED *file_space, const H5S_t UNUSED *mem_space,
H5D_chunk_map_t UNUSED *cm)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_compact_io_init)
FUNC_ENTER_NOAPI_NOINIT_NOERR
io_info->store->compact.buf = io_info->dset->shared->layout.storage.u.compact.buf;
io_info->store->compact.dirty = &io_info->dset->shared->layout.storage.u.compact.dirty;
@ -292,7 +292,7 @@ H5D_compact_readvv(const H5D_io_info_t *io_info,
{
ssize_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_compact_readvv)
FUNC_ENTER_NOAPI_NOINIT
HDassert(io_info);
@ -333,7 +333,7 @@ H5D_compact_writevv(const H5D_io_info_t *io_info,
{
ssize_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_compact_writevv)
FUNC_ENTER_NOAPI_NOINIT
HDassert(io_info);
@ -366,7 +366,7 @@ H5D_compact_flush(H5D_t *dset, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_compact_flush)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(dset);
@ -409,7 +409,7 @@ H5D_compact_copy(H5F_t *f_src, H5O_storage_compact_t *storage_src, H5F_t *f_dst,
hid_t buf_sid = -1; /* ID for buffer dataspace */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_compact_copy, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f_src);

36
src/H5Dcontig.c
View File

@ -164,7 +164,7 @@ H5D_contig_alloc(H5F_t *f, hid_t dxpl_id, H5O_storage_contig_t *storage /*out */
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_contig_alloc, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@ -213,7 +213,7 @@ H5D_contig_fill(H5D_t *dset, hid_t dxpl_id)
hid_t my_dxpl_id; /* DXPL ID to use for this operation */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_contig_fill, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(TRUE == H5P_isa_class(dxpl_id, H5P_DATASET_XFER));
@ -360,7 +360,7 @@ H5D_contig_delete(H5F_t *f, hid_t dxpl_id, const H5O_storage_t *storage)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_contig_delete, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@ -390,7 +390,7 @@ done:
haddr_t
H5D_contig_get_addr(const H5D_t *dset)
{
FUNC_ENTER_NOAPI_NOFUNC(H5D_contig_get_addr)
FUNC_ENTER_NOAPI_NOERR
/* check args */
HDassert(dset);
@ -426,7 +426,7 @@ H5D_contig_construct(H5F_t *f, H5D_t *dset)
int i; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_contig_construct)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(f);
@ -489,7 +489,7 @@ H5D_contig_is_space_alloc(const H5O_storage_t *storage)
{
hbool_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_contig_is_space_alloc)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity checks */
HDassert(storage);
@ -518,7 +518,7 @@ H5D_contig_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t UNUSED *t
hsize_t UNUSED nelmts, const H5S_t UNUSED *file_space, const H5S_t UNUSED *mem_space,
H5D_chunk_map_t UNUSED *cm)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_contig_io_init)
FUNC_ENTER_NOAPI_NOINIT_NOERR
io_info->store->contig.dset_addr = io_info->dset->shared->layout.storage.u.contig.addr;
io_info->store->contig.dset_size = io_info->dset->shared->layout.storage.u.contig.size;
@ -546,7 +546,7 @@ H5D_contig_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
{
herr_t ret_value = SUCCEED; /*return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_contig_read)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(io_info);
@ -583,7 +583,7 @@ H5D_contig_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
{
herr_t ret_value = SUCCEED; /*return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_contig_write)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(io_info);
@ -626,7 +626,7 @@ H5D_contig_write_one(H5D_io_info_t *io_info, hsize_t offset, size_t size)
size_t mem_curr_seq = 0; /* "Current sequence" in memory */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_contig_write_one)
FUNC_ENTER_NOAPI_NOINIT
HDassert(io_info);
@ -668,7 +668,7 @@ H5D_contig_readvv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len,
hsize_t max_data; /* Actual maximum size of data to cache */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_contig_readvv_sieve_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Stash local copies of these value */
if(dset_contig->sieve_buf != NULL) {
@ -824,7 +824,7 @@ H5D_contig_readvv_cb(hsize_t dst_off, hsize_t src_off, size_t len, void *_udata)
H5D_contig_readvv_ud_t *udata = (H5D_contig_readvv_ud_t *)_udata; /* User data for H5V_opvv() operator */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_contig_readvv_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Write data */
if(H5F_block_read(udata->file, H5FD_MEM_DRAW, (udata->dset_addr + dst_off),
@ -861,7 +861,7 @@ H5D_contig_readvv(const H5D_io_info_t *io_info,
{
ssize_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_contig_readvv)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(io_info);
@ -939,7 +939,7 @@ H5D_contig_writevv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len,
hsize_t max_data; /* Actual maximum size of data to cache */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_contig_writevv_sieve_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Stash local copies of these values */
if(dset_contig->sieve_buf != NULL) {
@ -1145,7 +1145,7 @@ H5D_contig_writevv_cb(hsize_t dst_off, hsize_t src_off, size_t len, void *_udata
H5D_contig_writevv_ud_t *udata = (H5D_contig_writevv_ud_t *)_udata; /* User data for H5V_opvv() operator */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_contig_writevv_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Write data */
if(H5F_block_write(udata->file, H5FD_MEM_DRAW, (udata->dset_addr + dst_off), len, udata->dxpl_id, (udata->wbuf + src_off)) < 0)
@ -1181,7 +1181,7 @@ H5D_contig_writevv(const H5D_io_info_t *io_info,
{
ssize_t ret_value; /* Return value (Size of sequence in bytes) */
FUNC_ENTER_NOAPI_NOINIT(H5D_contig_writevv)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(io_info);
@ -1247,7 +1247,7 @@ H5D_contig_flush(H5D_t *dset, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_contig_flush)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(dset);
@ -1306,7 +1306,7 @@ H5D_contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src,
hbool_t fix_ref = FALSE; /* Flag to indicate that ref values should be fixed */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_contig_copy, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f_src);

4
src/H5Ddbg.c
View File

@ -77,7 +77,7 @@ DESCRIPTION
static herr_t
H5D_init_dbg_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_init_dbg_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5D_init())
} /* H5D_init_dbg_interface() */
@ -104,7 +104,7 @@ H5Ddebug(hid_t dset_id)
H5D_t *dset; /* Dataset to debug */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Ddebug, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", dset_id);
/* Check args */

10
src/H5Ddeprec.c
View File

@ -101,7 +101,7 @@ DESCRIPTION
static herr_t
H5D_init_deprec_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_init_deprec_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5D_init())
} /* H5D_init_deprec_interface() */
@ -146,7 +146,7 @@ H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
const H5S_t *space; /* Dataspace for dataset */
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Dcreate1, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE5("i", "i*siii", loc_id, name, type_id, space_id, dcpl_id);
/* Check arguments */
@ -212,7 +212,7 @@ H5Dopen1(hid_t loc_id, const char *name)
hid_t dxpl_id = H5AC_dxpl_id; /* dxpl to use to open datset */
hid_t ret_value;
FUNC_ENTER_API(H5Dopen1, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("i", "i*s", loc_id, name);
/* Check args */
@ -283,7 +283,7 @@ H5Dextend(hid_t dset_id, const hsize_t size[])
H5D_t *dset;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Dextend, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*h", dset_id, size);
/* Check args */
@ -323,7 +323,7 @@ H5D_extend(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id)
H5O_fill_t *fill; /* Dataset's fill value */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_extend)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(dataset);

20
src/H5Defl.c
View File

@ -136,7 +136,7 @@ H5D_efl_construct(H5F_t *f, H5D_t *dset)
int i; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_efl_construct)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(f);
@ -200,7 +200,7 @@ done:
hbool_t
H5D_efl_is_space_alloc(const H5O_storage_t UNUSED *storage)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_efl_is_space_alloc)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity checks */
HDassert(storage);
@ -227,7 +227,7 @@ H5D_efl_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t UNUSED *type
hsize_t UNUSED nelmts, const H5S_t UNUSED *file_space, const H5S_t UNUSED *mem_space,
H5D_chunk_map_t UNUSED *cm)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_efl_io_init)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDmemcpy(&io_info->store->efl, &(io_info->dset->shared->dcpl_cache.efl), sizeof(H5O_efl_t));
@ -267,7 +267,7 @@ H5D_efl_read(const H5O_efl_t *efl, haddr_t addr, size_t size, uint8_t *buf)
size_t u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_efl_read)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(efl && efl->nused>0);
@ -353,7 +353,7 @@ H5D_efl_write(const H5O_efl_t *efl, haddr_t addr, size_t size, const uint8_t *bu
size_t u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_efl_write)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(efl && efl->nused > 0);
@ -428,7 +428,7 @@ H5D_efl_readvv_cb(hsize_t dst_off, hsize_t src_off, size_t len, void *_udata)
H5D_efl_readvv_ud_t *udata = (H5D_efl_readvv_ud_t *)_udata; /* User data for H5V_opvv() operator */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_efl_readvv_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Read data */
if(H5D_efl_read(udata->efl, dst_off, len, (udata->rbuf + src_off)) < 0)
@ -462,7 +462,7 @@ H5D_efl_readvv(const H5D_io_info_t *io_info,
H5D_efl_readvv_ud_t udata; /* User data for H5V_opvv() operator */
ssize_t ret_value; /* Return value (Total size of sequence in bytes) */
FUNC_ENTER_NOAPI_NOINIT(H5D_efl_readvv)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(io_info);
@ -508,7 +508,7 @@ H5D_efl_writevv_cb(hsize_t dst_off, hsize_t src_off, size_t len, void *_udata)
H5D_efl_writevv_ud_t *udata = (H5D_efl_writevv_ud_t *)_udata; /* User data for H5V_opvv() operator */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_efl_writevv_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Write data */
if(H5D_efl_write(udata->efl, dst_off, len, (udata->wbuf + src_off)) < 0)
@ -542,7 +542,7 @@ H5D_efl_writevv(const H5D_io_info_t *io_info,
H5D_efl_writevv_ud_t udata; /* User data for H5V_opvv() operator */
ssize_t ret_value; /* Return value (Total size of sequence in bytes) */
FUNC_ENTER_NOAPI_NOINIT(H5D_efl_writevv)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(io_info);
@ -587,7 +587,7 @@ H5D_efl_bh_info(H5F_t *f, hid_t dxpl_id, H5O_efl_t *efl, hsize_t *heap_size)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_efl_bh_info, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);

12
src/H5Dfill.c
View File

@ -117,7 +117,7 @@ H5Dfill(const void *fill, hid_t fill_type_id, void *buf, hid_t buf_type_id, hid_
H5T_t *buf_type; /* Buffer datatype */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Dfill, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE5("e", "*xi*xii", fill, fill_type_id, buf, buf_type_id, space_id);
/* Check args */
@ -181,7 +181,7 @@ H5D_fill(const void *fill, const H5T_t *fill_type, void *buf,
size_t dst_type_size; /* Size of destination type*/
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_fill)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(fill_type);
@ -370,7 +370,7 @@ H5D_fill_init(H5D_fill_buf_info_t *fb_info, void *caller_fill_buf,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_fill_init, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(fb_info);
@ -566,7 +566,7 @@ H5D_fill_refill_vl(H5D_fill_buf_info_t *fb_info, size_t nelmts, hid_t dxpl_id)
herr_t ret_value = SUCCEED; /* Return value */
void * buf = NULL; /* Temporary fill buffer */
FUNC_ENTER_NOAPI(H5D_fill_refill_vl, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(fb_info);
@ -644,7 +644,7 @@ done:
herr_t
H5D_fill_release(H5D_fill_buf_info_t *fb_info)
{
FUNC_ENTER_NOAPI_NOFUNC(H5D_fill_release)
FUNC_ENTER_NOAPI_NOERR
/* Check args */
HDassert(fb_info);
@ -682,7 +682,7 @@ H5D_fill_release(H5D_fill_buf_info_t *fb_info)
herr_t
H5D_fill_term(H5D_fill_buf_info_t *fb_info)
{
FUNC_ENTER_NOAPI_NOFUNC(H5D_fill_term)
FUNC_ENTER_NOAPI_NOERR
/* Check args */
HDassert(fb_info);

72
src/H5Dint.c
View File

@ -128,7 +128,7 @@ H5D_init(void)
{
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_init, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
@ -157,7 +157,7 @@ H5D_init_interface(void)
H5P_genplist_t *def_dcpl; /* Default Dataset Creation Property list */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_init_interface)
FUNC_ENTER_NOAPI_NOINIT
/* Initialize the atom group for the dataset IDs */
if(H5I_register_type(H5I_DATASET, (size_t)H5I_DATASETID_HASHSIZE, H5D_RESERVED_ATOMS, (H5I_free_t)H5D_close)<H5I_FILE)
@ -216,7 +216,7 @@ H5D_term_interface(void)
{
int n=0;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_term_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
if(H5_interface_initialize_g) {
if((n=H5I_nmembers(H5I_DATASET))>0) {
@ -278,7 +278,7 @@ H5D_get_dxpl_cache_real(hid_t dxpl_id, H5D_dxpl_cache_t *cache)
H5P_genplist_t *dx_plist; /* Data transfer property list */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_get_dxpl_cache_real)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(cache);
@ -363,7 +363,7 @@ H5D_get_dxpl_cache(hid_t dxpl_id, H5D_dxpl_cache_t **cache)
{
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_get_dxpl_cache,FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
assert(cache);
@ -403,7 +403,7 @@ H5D_create_named(const H5G_loc_t *loc, const char *name, hid_t type_id,
H5D_obj_create_t dcrt_info; /* Information for dataset creation */
H5D_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_create_named)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(loc);
@ -464,7 +464,7 @@ H5D_get_space_status(H5D_t *dset, H5D_space_status_t *allocation, hid_t dxpl_id)
hsize_t full_size; /* The number of bytes in the dataset when fully populated */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5D_get_space_status)
FUNC_ENTER_NOAPI_NOINIT
HDassert(dset);
@ -529,7 +529,7 @@ H5D_new(hid_t dcpl_id, hbool_t creating, hbool_t vl_type)
H5P_genplist_t *plist; /* Property list created */
H5D_shared_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_new)
FUNC_ENTER_NOAPI_NOINIT
/* Allocate new shared dataset structure */
if(NULL == (new_dset = H5FL_MALLOC(H5D_shared_t)))
@ -591,7 +591,7 @@ H5D_init_type(H5F_t *file, const H5D_t *dset, hid_t type_id, const H5T_t *type)
hbool_t use_latest_format; /* Flag indicating the newest file format should be used */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_init_type)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checking */
HDassert(file);
@ -663,7 +663,7 @@ H5D_init_space(H5F_t *file, const H5D_t *dset, const H5S_t *space)
hbool_t use_latest_format; /* Flag indicating the newest file format should be used */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_init_space)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checking */
HDassert(file);
@ -719,7 +719,7 @@ H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset, hid_t dapl_id)
hbool_t layout_init = FALSE; /* Flag to indicate that chunk information was initialized */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_update_oh_info)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checking */
HDassert(file);
@ -914,7 +914,7 @@ H5D_create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id,
H5G_loc_t dset_loc; /* Dataset location */
H5D_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5D_create, NULL)
FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(file);
@ -1106,7 +1106,7 @@ H5D_open(const H5G_loc_t *loc, hid_t dapl_id, hid_t dxpl_id)
H5D_t *dataset = NULL;
H5D_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5D_open, NULL)
FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(loc);
@ -1205,7 +1205,7 @@ H5D_open_oid(H5D_t *dataset, hid_t dapl_id, hid_t dxpl_id)
htri_t msg_exists; /* Whether a particular type of message exists */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_TAG(H5D_open_oid, dxpl_id, dataset->oloc.addr, FAIL)
FUNC_ENTER_NOAPI_NOINIT_TAG(dxpl_id, dataset->oloc.addr, FAIL)
/* check args */
HDassert(dataset);
@ -1354,7 +1354,7 @@ H5D_close(H5D_t *dataset)
unsigned free_failed = FALSE;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_close, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(dataset && dataset->oloc.file && dataset->shared);
@ -1499,8 +1499,8 @@ done:
H5O_loc_t *
H5D_oloc(H5D_t *dataset)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_oloc)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(dataset ? &(dataset->oloc) : (H5O_loc_t *)NULL)
} /* end H5D_oloc() */
@ -1522,8 +1522,8 @@ H5D_oloc(H5D_t *dataset)
H5G_name_t *
H5D_nameof(H5D_t *dataset)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_nameof)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(dataset ? &(dataset->path) : (H5G_name_t *)NULL)
} /* end H5D_nameof() */
@ -1546,8 +1546,8 @@ H5D_nameof(H5D_t *dataset)
H5T_t *
H5D_typeof(const H5D_t *dset)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_typeof)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(dset);
HDassert(dset->shared);
@ -1579,7 +1579,7 @@ H5D_alloc_storage(H5D_t *dset/*in,out*/, hid_t dxpl_id, H5D_time_alloc_t time_al
hbool_t addr_set = FALSE; /* Flag to indicate that the dataset's storage address was set */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_alloc_storage)
FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(dset);
@ -1733,7 +1733,7 @@ H5D_init_storage(H5D_t *dset, hbool_t full_overwrite, hsize_t old_dim[],
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_init_storage)
FUNC_ENTER_NOAPI_NOINIT
HDassert(dset);
@ -1806,7 +1806,7 @@ H5D_get_storage_size(H5D_t *dset, hid_t dxpl_id)
{
hsize_t ret_value;
FUNC_ENTER_NOAPI_NOINIT_TAG(H5D_get_storage_size, dxpl_id, dset->oloc.addr, 0)
FUNC_ENTER_NOAPI_NOINIT_TAG(dxpl_id, dset->oloc.addr, 0)
switch(dset->shared->layout.type) {
case H5D_CHUNKED:
@ -1861,7 +1861,7 @@ H5D_get_offset(const H5D_t *dset)
{
haddr_t ret_value = HADDR_UNDEF;
FUNC_ENTER_NOAPI_NOINIT(H5D_get_offset)
FUNC_ENTER_NOAPI_NOINIT
HDassert(dset);
@ -1909,7 +1909,7 @@ H5D_iterate(void *buf, hid_t type_id, const H5S_t *space, H5D_operator_t op,
{
herr_t ret_value;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_iterate)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(buf);
@ -1946,7 +1946,7 @@ H5D_vlen_reclaim(hid_t type_id, H5S_t *space, hid_t plist_id, void *buf)
H5T_vlen_alloc_info_t *vl_alloc_info = &_vl_alloc_info; /* VL allocation info */
herr_t ret_value;
FUNC_ENTER_NOAPI(H5D_vlen_reclaim, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(H5I_DATATYPE == H5I_get_type(type_id));
@ -1987,7 +1987,7 @@ H5D_vlen_get_buf_size_alloc(size_t size, void *info)
H5D_vlen_bufsize_t *vlen_bufsize = (H5D_vlen_bufsize_t *)info;
void *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_vlen_get_buf_size_alloc)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Get a temporary pointer to space for the VL data */
if((vlen_bufsize->vl_tbuf = H5FL_BLK_REALLOC(vlen_vl_buf, vlen_bufsize->vl_tbuf, size)) != NULL)
@ -2033,7 +2033,7 @@ H5D_vlen_get_buf_size(void UNUSED *elem, hid_t type_id, unsigned UNUSED ndim, co
H5T_t *dt; /* Datatype for operation */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_vlen_get_buf_size)
FUNC_ENTER_NOAPI_NOINIT
HDassert(op_data);
HDassert(H5I_DATATYPE == H5I_get_type(type_id));
@ -2077,7 +2077,7 @@ H5D_check_filters(H5D_t *dataset)
H5O_fill_t *fill; /* Dataset's fill value */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_check_filters)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(dataset);
@ -2135,7 +2135,7 @@ H5D_set_extent(H5D_t *dset, const hsize_t *size, hid_t dxpl_id)
htri_t changed; /* Whether the dataspace changed size */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_TAG(H5D_set_extent, dxpl_id, dset->oloc.addr, FAIL)
FUNC_ENTER_NOAPI_NOINIT_TAG(dxpl_id, dset->oloc.addr, FAIL)
/* Check args */
HDassert(dset);
@ -2238,7 +2238,7 @@ H5D_flush_sieve_buf(H5D_t *dataset, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_flush_sieve_buf)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(dataset);
@ -2280,7 +2280,7 @@ H5D_flush_real(H5D_t *dataset, hid_t dxpl_id)
H5O_t *oh = NULL; /* Pointer to dataset's object header */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_TAG(H5D_flush_real, dxpl_id, dataset->oloc.addr, FAIL)
FUNC_ENTER_NOAPI_NOINIT_TAG(dxpl_id, dataset->oloc.addr, FAIL)
/* Check args */
HDassert(dataset);
@ -2350,7 +2350,7 @@ H5D_mark(H5D_t *dataset, hid_t dxpl_id, unsigned flags)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_mark)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(dataset);
@ -2386,7 +2386,7 @@ H5D_flush_cb(void *_dataset, hid_t UNUSED id, void *_udata)
H5D_flush_ud_t *udata = (H5D_flush_ud_t *)_udata; /* User data for callback */
int ret_value = H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_flush_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(dataset);
@ -2422,7 +2422,7 @@ H5D_flush(const H5F_t *f, hid_t dxpl_id)
H5D_flush_ud_t udata; /* User data for callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_flush, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);

18
src/H5Dio.c
View File

@ -127,7 +127,7 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
char fake_char;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Dread, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE6("e", "iiiiix", dset_id, mem_type_id, mem_space_id, file_space_id,
plist_id, buf);
@ -219,7 +219,7 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
char fake_char;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Dwrite, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE6("e", "iiiii*x", dset_id, mem_type_id, mem_space_id, file_space_id,
dxpl_id, buf);
@ -315,7 +315,7 @@ H5D_read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_TAG(H5D_read, dxpl_id, dataset->oloc.addr, FAIL)
FUNC_ENTER_NOAPI_NOINIT_TAG(dxpl_id, dataset->oloc.addr, FAIL)
/* check args */
HDassert(dataset && dataset->oloc.file);
@ -516,7 +516,7 @@ H5D_write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_TAG(H5D_write, dxpl_id, dataset->oloc.addr, FAIL)
FUNC_ENTER_NOAPI_NOINIT_TAG(dxpl_id, dataset->oloc.addr, FAIL)
/* check args */
HDassert(dataset && dataset->oloc.file);
@ -728,7 +728,7 @@ static herr_t
H5D_ioinfo_init(H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id,
const H5D_type_info_t *type_info, H5D_storage_t *store, H5D_io_info_t *io_info)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_ioinfo_init)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(dset);
@ -798,7 +798,7 @@ H5D_typeinfo_init(const H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache,
const H5T_t *dst_type; /* Destination datatype */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_typeinfo_init)
FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(type_info);
@ -955,7 +955,7 @@ H5D_ioinfo_adjust(H5D_io_info_t *io_info, const H5D_t *dset, hid_t dxpl_id,
H5D_mpio_actual_io_mode_t actual_io_mode; /* performed io mode */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_ioinfo_adjust)
FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(dset);
@ -1043,7 +1043,7 @@ H5D_ioinfo_term(H5D_io_info_t *io_info)
{
herr_t ret_value = SUCCEED; /*return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_ioinfo_term)
FUNC_ENTER_NOAPI_NOINIT
/* Check if we used the MPI VFD for the I/O */
if(io_info->using_mpi_vfd) {
@ -1096,7 +1096,7 @@ done:
static herr_t
H5D_typeinfo_term(const H5D_type_info_t *type_info)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_typeinfo_term)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check for releasing datatype conversion & background buffers */
if(type_info->tconv_buf_allocated) {

10
src/H5Dlayout.c
View File

@ -78,7 +78,7 @@ H5D_layout_set_io_ops(const H5D_t *dataset)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_layout_set_io_ops, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(dataset);
@ -135,7 +135,7 @@ H5D_layout_meta_size(const H5F_t *f, const H5O_layout_t *layout, hbool_t include
{
size_t ret_value;
FUNC_ENTER_NOAPI_NOINIT(H5D_layout_meta_size)
FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@ -202,7 +202,7 @@ H5D_layout_oh_create(H5F_t *file, hid_t dxpl_id, H5O_t *oh, H5D_t *dset,
hbool_t layout_init = FALSE; /* Flag to indicate that chunk information was initialized */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_TAG(H5D_layout_oh_create, dxpl_id, dset->oloc.addr, FAIL)
FUNC_ENTER_NOAPI_NOINIT_TAG(dxpl_id, dset->oloc.addr, FAIL)
/* Sanity checking */
HDassert(file);
@ -325,7 +325,7 @@ H5D_layout_oh_read(H5D_t *dataset, hid_t dxpl_id, hid_t dapl_id, H5P_genplist_t
htri_t msg_exists; /* Whether a particular type of message exists */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_layout_oh_read)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checking */
HDassert(dataset);
@ -456,7 +456,7 @@ H5D_layout_oh_write(H5D_t *dataset, hid_t dxpl_id, H5O_t *oh, unsigned update_fl
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_layout_oh_write)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checking */
HDassert(dataset);

40
src/H5Dmpio.c
View File

@ -164,7 +164,7 @@ H5D_mpio_opt_possible(const H5D_io_info_t *io_info, const H5S_t *file_space,
int mpi_code; /* MPI error code */
htri_t ret_value = TRUE;
FUNC_ENTER_NOAPI(H5D_mpio_opt_possible, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(io_info);
@ -264,7 +264,7 @@ H5D_mpio_select_read(const H5D_io_info_t *io_info, const H5D_type_info_t UNUSED
const H5D_contig_storage_t *store_contig = &(io_info->store->contig); /* Contiguous storage info for this I/O operation */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5D_mpio_select_read, FAIL)
FUNC_ENTER_NOAPI(FAIL)
H5_CHECK_OVERFLOW(mpi_buf_count, hsize_t, size_t);
if(H5F_block_read(io_info->dset->oloc.file, H5FD_MEM_DRAW, store_contig->dset_addr, (size_t)mpi_buf_count, io_info->dxpl_id, io_info->u.rbuf) < 0)
@ -293,7 +293,7 @@ H5D_mpio_select_write(const H5D_io_info_t *io_info, const H5D_type_info_t UNUSED
const H5D_contig_storage_t *store_contig = &(io_info->store->contig); /* Contiguous storage info for this I/O operation */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5D_mpio_select_write, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*OKAY: CAST DISCARDS CONST QUALIFIER*/
H5_CHECK_OVERFLOW(mpi_buf_count, hsize_t, size_t);
@ -323,7 +323,7 @@ H5D_ioinfo_xfer_mode(H5D_io_info_t *io_info, H5P_genplist_t *dx_plist,
{
herr_t ret_value = SUCCEED; /* return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_ioinfo_xfer_mode)
FUNC_ENTER_NOAPI_NOINIT
/* Change the xfer_mode */
io_info->dxpl_cache->xfer_mode = xfer_mode;
@ -368,7 +368,7 @@ H5D_ioinfo_coll_opt_mode(H5D_io_info_t *io_info, H5P_genplist_t *dx_plist,
{
herr_t ret_value = SUCCEED; /* return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_ioinfo_coll_opt_mode)
FUNC_ENTER_NOAPI_NOINIT
/* Change the optimal xfer_mode */
io_info->dxpl_cache->coll_opt_mode = coll_opt_mode;
@ -401,7 +401,7 @@ H5D_mpio_get_min_chunk(const H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
int mpi_code; /* MPI return code */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5D_mpio_get_min_chunk)
FUNC_ENTER_NOAPI_NOINIT
/* Get the number of chunks to perform I/O on */
num_chunkf = H5SL_count(fm->sel_chunks);
@ -437,7 +437,7 @@ H5D_mpio_get_sum_chunk(const H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
int mpi_code; /* MPI return code */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5D_mpio_get_sum_chunk)
FUNC_ENTER_NOAPI_NOINIT
/* Get the number of chunks to perform I/O on */
num_chunkf = 0;
@ -475,7 +475,7 @@ H5D_contig_collective_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_i
H5P_genplist_t *dx_plist; /* Pointer to DXPL */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_contig_collective_read, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(IS_H5FD_MPIO(io_info->dset->oloc.file));
@ -522,7 +522,7 @@ H5D_contig_collective_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_
H5P_genplist_t *dx_plist; /* Pointer to DXPL */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_contig_collective_write, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(IS_H5FD_MPIO(io_info->dset->oloc.file));
@ -592,7 +592,7 @@ H5D_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info
#endif
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_collective_io)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(io_info);
@ -733,7 +733,7 @@ H5D_chunk_collective_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_in
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_chunk_collective_read, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Call generic selection operation */
if(H5D_chunk_collective_io(io_info, type_info, fm) < 0)
@ -764,7 +764,7 @@ H5D_chunk_collective_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_i
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_chunk_collective_write, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Call generic selection operation */
if(H5D_chunk_collective_io(io_info, type_info, fm) < 0)
@ -815,7 +815,7 @@ H5D_link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type
int mpi_code; /* MPI return code */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5D_link_chunk_collective_io)
FUNC_ENTER_NOAPI_NOINIT
/* Get the sum # of chunks, if not already available */
if(sum_chunk < 0) {
@ -1088,7 +1088,7 @@ H5D_multi_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *typ
H5D_mpio_actual_io_mode_t actual_io_mode = H5D_MPIO_NO_COLLECTIVE; /* Local variable for tracking the I/O mode used. */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5D_multi_chunk_collective_io)
FUNC_ENTER_NOAPI_NOINIT
#ifdef H5Dmpio_DEBUG
mpi_rank = H5F_mpi_get_rank(io_info->dset->oloc.file);
@ -1295,7 +1295,7 @@ H5D_multi_chunk_collective_io_no_opt(H5D_io_info_t *io_info,
H5D_mpio_actual_io_mode_t actual_io_mode = H5D_MPIO_NO_COLLECTIVE; /*Local variable for tracking the I/O modes used. */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5D_multi_chunk_collective_io_no_opt)
FUNC_ENTER_NOAPI_NOINIT
#ifdef H5D_DEBUG
if(H5DEBUG(D)) {
@ -1482,7 +1482,7 @@ H5D_inter_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info
int mpi_code; /* MPI return code */
herr_t ret_value = SUCCEED; /* return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_inter_collective_io)
FUNC_ENTER_NOAPI_NOINIT
if((file_space != NULL) && (mem_space != NULL)) {
int mpi_file_count; /* Number of file "objects" to transfer */
@ -1546,7 +1546,7 @@ H5D_final_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info
hbool_t plist_is_setup = FALSE; /* Whether the dxpl has been customized */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5D_final_collective_io)
FUNC_ENTER_NOAPI_NOINIT
/* Pass buf type, file type to the file driver. */
if(H5FD_mpi_setup_collective(io_info->dxpl_id, *mpi_buf_type, *mpi_file_type) < 0)
@ -1617,7 +1617,7 @@ H5D_sort_chunk(H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
int i; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_sort_chunk)
FUNC_ENTER_NOAPI_NOINIT
/* Retrieve # of MPI processes */
if((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file)) < 0)
@ -1780,7 +1780,7 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm,
#endif
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5D_obtain_mpio_mode)
FUNC_ENTER_NOAPI_NOINIT
/* Assign the rank 0 to the root */
root = 0;
@ -1923,7 +1923,7 @@ H5D_cmp_chunk_addr(const void *chunk_addr_info1, const void *chunk_addr_info2)
{
haddr_t addr1, addr2;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_cmp_chunk_addr)
FUNC_ENTER_NOAPI_NOINIT_NOERR
addr1 = ((const H5D_chunk_addr_info_t *)chunk_addr_info1)->chunk_addr;
addr2 = ((const H5D_chunk_addr_info_t *)chunk_addr_info2)->chunk_addr;

16
src/H5Doh.c
View File

@ -108,7 +108,7 @@ H5O_dset_get_copy_file_udata(void)
{
void *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5O_dset_get_copy_file_udata)
FUNC_ENTER_NOAPI_NOINIT
/* Allocate space for the 'copy file' user data for copying datasets */
if(NULL == (ret_value = H5FL_CALLOC(H5D_copy_file_ud_t)))
@ -141,7 +141,7 @@ H5O_dset_free_copy_file_udata(void *_udata)
{
H5D_copy_file_ud_t *udata = (H5D_copy_file_ud_t *)_udata;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_dset_free_copy_file_udata)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(udata);
@ -182,13 +182,13 @@ H5O_dset_free_copy_file_udata(void *_udata)
*
*-------------------------------------------------------------------------
*/
htri_t
static htri_t
H5O_dset_isa(H5O_t *oh)
{
htri_t exists; /* Flag if header message of interest exists */
htri_t ret_value = TRUE; /* Return value */
FUNC_ENTER_NOAPI(H5O_dset_isa, FAIL)
FUNC_ENTER_NOAPI_NOINIT
HDassert(oh);
@ -230,7 +230,7 @@ H5O_dset_open(const H5G_loc_t *obj_loc, hid_t lapl_id, hid_t dxpl_id, hbool_t ap
hid_t dapl_id; /* dapl to use to open this dataset */
hid_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5O_dset_open)
FUNC_ENTER_NOAPI_NOINIT
HDassert(obj_loc);
@ -283,7 +283,7 @@ H5O_dset_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id)
H5D_t *dset = NULL; /* New dataset created */
void *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5O_dset_create)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(f);
@ -331,7 +331,7 @@ H5O_dset_get_oloc(hid_t obj_id)
H5D_t *dset; /* Dataset opened */
H5O_loc_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5O_dset_get_oloc)
FUNC_ENTER_NOAPI_NOINIT
/* Get the dataset */
if(NULL == (dset = (H5D_t *)H5I_object(obj_id)))
@ -372,7 +372,7 @@ H5O_dset_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info)
htri_t exists; /* Flag if header message of interest exists */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5O_dset_bh_info)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);

16
src/H5Dscatgath.c
View File

@ -108,7 +108,7 @@ H5D_scatter_file(const H5D_io_info_t *_io_info,
size_t nelem; /* Number of elements used in sequences */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_scatter_file)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(_io_info);
@ -207,7 +207,7 @@ H5D_gather_file(const H5D_io_info_t *_io_info,
size_t nelem; /* Number of elements used in sequences */
size_t ret_value = nelmts; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_gather_file)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(_io_info);
@ -301,7 +301,7 @@ H5D_scatter_mem (const void *_tscat_buf, const H5S_t *space,
size_t nelem; /* Number of elements used in sequences */
herr_t ret_value = SUCCEED; /* Number of elements scattered */
FUNC_ENTER_NOAPI(H5D_scatter_mem, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(tscat_buf);
@ -388,7 +388,7 @@ H5D_gather_mem(const void *_buf, const H5S_t *space,
size_t nelem; /* Number of elements used in sequences */
size_t ret_value = nelmts; /* Number of elements gathered */
FUNC_ENTER_NOAPI_NOINIT(H5D_gather_mem)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(buf);
@ -469,7 +469,7 @@ H5D_scatgath_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info
size_t smine_nelmts; /*elements per strip */
herr_t ret_value = SUCCEED; /*return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_scatgath_read)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(io_info);
@ -601,7 +601,7 @@ H5D_scatgath_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_inf
size_t smine_nelmts; /*elements per strip */
herr_t ret_value = SUCCEED; /*return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_scatgath_write)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(io_info);
@ -750,7 +750,7 @@ H5D_compound_opt_read(size_t nelmts, const H5S_t *space,
size_t src_stride, dst_stride, copy_size;
herr_t ret_value = SUCCEED; /*return value */
FUNC_ENTER_NOAPI_NOINIT(H5D_compound_opt_read)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(nelmts > 0);
@ -875,7 +875,7 @@ H5D_compound_opt_write(size_t nelmts, const H5D_type_info_t *type_info)
size_t src_stride, dst_stride; /* Strides through source & destination datatypes */
size_t i; /* Local index variable */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_compound_opt_write)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(nelmts > 0);

6
src/H5Dselect.c
View File

@ -102,7 +102,7 @@ H5D_select_io(const H5D_io_info_t *io_info, size_t elmt_size,
ssize_t tmp_file_len; /* Temporary number of bytes in file sequence */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_select_io, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(io_info);
@ -266,7 +266,7 @@ H5D_select_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_select_read, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Call generic selection operation */
H5_CHECK_OVERFLOW(nelmts, hsize_t, size_t);
@ -297,7 +297,7 @@ H5D_select_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5D_select_write, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Call generic selection operation */
H5_CHECK_OVERFLOW(nelmts, hsize_t, size_t);

6
src/H5Dtest.c
View File

@ -87,7 +87,7 @@ H5D_layout_version_test(hid_t did, unsigned *version)
H5D_t *dset; /* Pointer to dataset to query */
herr_t ret_value = SUCCEED; /* return value */
FUNC_ENTER_NOAPI(H5D_layout_version_test, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
if(NULL == (dset = (H5D_t *)H5I_object_verify(did, H5I_DATASET)))
@ -126,7 +126,7 @@ H5D_layout_contig_size_test(hid_t did, hsize_t *size)
H5D_t *dset; /* Pointer to dataset to query */
herr_t ret_value = SUCCEED; /* return value */
FUNC_ENTER_NOAPI(H5D_layout_contig_size_test, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
if(NULL == (dset = (H5D_t *)H5I_object_verify(did, H5I_DATASET)))
@ -167,7 +167,7 @@ H5D_current_cache_size_test(hid_t did, size_t *nbytes_used, int *nused)
H5D_t *dset; /* Pointer to dataset to query */
herr_t ret_value = SUCCEED; /* return value */
FUNC_ENTER_NOAPI(H5D_current_cache_size_test, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
if(NULL == (dset = (H5D_t *)H5I_object_verify(did, H5I_DATASET)))

70
src/H5E.c
View File

@ -144,7 +144,7 @@ H5E_init(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5E_init, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
@ -168,7 +168,7 @@ done:
static herr_t
H5E_set_default_auto(H5E_t *stk)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_set_default_auto)
FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifndef H5_NO_DEPRECATED_SYMBOLS
#ifdef H5_USE_16_API_DEFAULT
@ -210,7 +210,7 @@ H5E_init_interface(void)
char lib_vers[128]; /* Buffer to constructu library version within */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5E_init_interface)
FUNC_ENTER_NOAPI_NOINIT
/* Initialize the atom group for the error class IDs */
if(H5I_register_type(H5I_ERROR_CLASS, (size_t)H5I_ERRCLS_HASHSIZE, H5E_RESERVED_ATOMS,
@ -268,7 +268,7 @@ H5E_term_interface(void)
{
int n = 0;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_term_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
if(H5_interface_initialize_g) {
int ncls, nmsg, nstk;
@ -341,7 +341,7 @@ H5E_get_stack(void)
{
H5E_t *estack;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_get_stack)
FUNC_ENTER_NOAPI_NOINIT_NOERR
estack = (H5E_t *)H5TS_get_thread_local_value(H5TS_errstk_key_g);
@ -382,7 +382,7 @@ H5E_get_stack(void)
static herr_t
H5E_free_class(H5E_cls_t *cls)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_free_class)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(cls);
@ -415,7 +415,7 @@ H5Eregister_class(const char *cls_name, const char *lib_name, const char *versio
H5E_cls_t *cls; /* Pointer to error class */
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Eregister_class, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("i", "*s*s*s", cls_name, lib_name, version);
/* Check arguments */
@ -453,7 +453,7 @@ H5E_register_class(const char *cls_name, const char *lib_name, const char *versi
H5E_cls_t *cls = NULL; /* Pointer to error class */
H5E_cls_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5E_register_class)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(cls_name);
@ -501,7 +501,7 @@ H5Eunregister_class(hid_t class_id)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Eunregister_class, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", class_id);
/* Check arguments */
@ -537,7 +537,7 @@ H5E_unregister_class(H5E_cls_t *cls)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5E_unregister_class)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(cls);
@ -574,7 +574,7 @@ H5Eget_class_name(hid_t class_id, char *name, size_t size)
H5E_cls_t *cls; /* Pointer to error class */
ssize_t ret_value; /* Return value */
FUNC_ENTER_API(H5Eget_class_name, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("Zs", "i*sz", class_id, name, size);
/* Get the error class */
@ -608,7 +608,7 @@ H5E_get_class_name(const H5E_cls_t *cls, char *name, size_t size)
{
ssize_t len; /* Length of error class's name */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_get_class_name)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(cls);
@ -648,7 +648,7 @@ H5E_close_msg_cb(void *obj_ptr, hid_t obj_id, void *key)
H5E_cls_t *cls = (H5E_cls_t*)key;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5E_close_msg_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(err_msg);
@ -683,7 +683,7 @@ H5Eclose_msg(hid_t err_id)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Eclose_msg, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", err_id);
/* Check arguments */
@ -714,7 +714,7 @@ done:
static herr_t
H5E_close_msg(H5E_msg_t *err)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_close_msg)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(err);
@ -747,7 +747,7 @@ H5Ecreate_msg(hid_t class_id, H5E_type_t msg_type, const char *msg_str)
H5E_msg_t *msg; /* Pointer to new error message */
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Ecreate_msg, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("i", "iEt*s", class_id, msg_type, msg_str);
/* Check arguments */
@ -790,7 +790,7 @@ H5E_create_msg(H5E_cls_t *cls, H5E_type_t msg_type, const char *msg_str)
H5E_msg_t *msg = NULL; /* Pointer to new error message */
H5E_msg_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5E_create_msg)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(cls);
@ -838,7 +838,7 @@ H5Eget_msg(hid_t msg_id, H5E_type_t *type, char *msg_str, size_t size)
H5E_msg_t *msg; /* Pointer to error message */
ssize_t ret_value; /* Return value */
FUNC_ENTER_API(H5Eget_msg, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE4("Zs", "i*Et*sz", msg_id, type, msg_str, size);
/* Get the message object */
@ -872,7 +872,7 @@ H5Ecreate_stack(void)
H5E_t *stk; /* Error stack */
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Ecreate_stack, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE0("i","");
/* Allocate a new error stack */
@ -911,7 +911,7 @@ H5Eget_current_stack(void)
hid_t ret_value; /* Return value */
/* Don't clear the error stack! :-) */
FUNC_ENTER_API_NOCLEAR(H5Eget_current_stack, FAIL)
FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE0("i","");
/* Get the current stack */
@ -947,7 +947,7 @@ H5E_get_current_stack(void)
unsigned u; /* Local index variable */
H5E_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5E_get_current_stack)
FUNC_ENTER_NOAPI_NOINIT
/* Get a pointer to the current error stack */
if(NULL == (current_stack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
@ -1028,7 +1028,7 @@ H5Eset_current_stack(hid_t err_stack)
H5E_t *estack;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Eset_current_stack, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", err_stack);
if(err_stack != H5E_DEFAULT) {
@ -1071,7 +1071,7 @@ H5E_set_current_stack(H5E_t *estack)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5E_set_current_stack)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(estack);
@ -1133,7 +1133,7 @@ H5Eclose_stack(hid_t stack_id)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Eclose_stack, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", stack_id);
if(H5E_DEFAULT != stack_id) {
@ -1169,7 +1169,7 @@ done:
static herr_t
H5E_close_stack(H5E_t *estack)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_close_stack)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(estack);
@ -1203,7 +1203,7 @@ H5Eget_num(hid_t error_stack_id)
ssize_t ret_value; /* Return value */
/* Don't clear the error stack! :-) */
FUNC_ENTER_API_NOCLEAR(H5Eget_num, FAIL)
FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE1("Zs", "i", error_stack_id);
/* Need to check for errors */
@ -1244,7 +1244,7 @@ done:
static ssize_t
H5E_get_num(const H5E_t *estack)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_get_num)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(estack);
@ -1271,7 +1271,7 @@ H5Epop(hid_t err_stack, size_t count)
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
FUNC_ENTER_API_NOCLEAR(H5Epop, FAIL)
FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE2("e", "iz", err_stack, count);
/* Need to check for errors */
@ -1337,7 +1337,7 @@ H5Epush2(hid_t err_stack, const char *file, const char *func, unsigned line,
herr_t ret_value=SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
FUNC_ENTER_API_NOCLEAR(H5Epush2, FAIL)
FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE8("e", "i*s*sIuiii*s", err_stack, file, func, line, cls_id, maj_id,
min_id, fmt);
@ -1434,7 +1434,7 @@ H5Eclear2(hid_t err_stack)
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
FUNC_ENTER_API_NOCLEAR(H5Eclear2, FAIL)
FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE1("e", "i", err_stack);
/* Need to check for errors */
@ -1479,7 +1479,7 @@ H5Eprint2(hid_t err_stack, FILE *stream)
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
FUNC_ENTER_API_NOCLEAR(H5Eprint2, FAIL)
FUNC_ENTER_API_NOCLEAR(FAIL)
/*NO TRACE*/
/* Need to check for errors */
@ -1525,7 +1525,7 @@ H5Ewalk2(hid_t err_stack, H5E_direction_t direction, H5E_walk2_t stack_func, voi
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
FUNC_ENTER_API_NOCLEAR(H5Ewalk2, FAIL)
FUNC_ENTER_API_NOCLEAR(FAIL)
/*NO TRACE*/
/* Need to check for errors */
@ -1579,7 +1579,7 @@ H5Eget_auto2(hid_t estack_id, H5E_auto2_t *func, void **client_data)
H5E_auto_op_t op; /* Error stack function */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Eget_auto2, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*x**x", estack_id, func, client_data);
if(estack_id == H5E_DEFAULT) {
@ -1641,7 +1641,7 @@ H5Eset_auto2(hid_t estack_id, H5E_auto2_t func, void *client_data)
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
FUNC_ENTER_API_NOCLEAR(H5Eset_auto2, FAIL)
FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE3("e", "ix*x", estack_id, func, client_data);
if(estack_id == H5E_DEFAULT) {
@ -1698,7 +1698,7 @@ H5Eauto_is_v2(hid_t estack_id, unsigned *is_stack)
H5E_t *estack; /* Error stack to operate on */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Eauto_is_v2, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*Iu", estack_id, is_stack);
if(estack_id == H5E_DEFAULT) {

18
src/H5Edeprec.c
View File

@ -99,7 +99,7 @@ DESCRIPTION
static herr_t
H5E_init_deprec_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_init_deprec_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5E_init())
} /* H5E_init_deprec_interface() */
@ -127,7 +127,7 @@ H5Eget_major(H5E_major_t maj)
char *msg_str = NULL;
char *ret_value; /* Return value */
FUNC_ENTER_API_NOCLEAR(H5Eget_major, NULL)
FUNC_ENTER_API_NOCLEAR(NULL)
/* Get the message object */
if(NULL == (msg = (H5E_msg_t *)H5I_object_verify(maj, H5I_ERROR_MSG)))
@ -179,7 +179,7 @@ H5Eget_minor(H5E_minor_t min)
char *msg_str = NULL;
char *ret_value; /* Return value */
FUNC_ENTER_API_NOCLEAR(H5Eget_minor, NULL)
FUNC_ENTER_API_NOCLEAR(NULL)
/* Get the message object */
if(NULL == (msg = (H5E_msg_t *)H5I_object_verify(min, H5I_ERROR_MSG)))
@ -236,7 +236,7 @@ H5Epush1(const char *file, const char *func, unsigned line,
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
FUNC_ENTER_API_NOCLEAR(H5Epush1, FAIL)
FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE6("e", "*s*sIuii*s", file, func, line, maj, min, str);
/* Push the error on the default error stack */
@ -267,7 +267,7 @@ H5Eclear1(void)
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
FUNC_ENTER_API_NOCLEAR(H5Eclear1, FAIL)
FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE0("e","");
/* Clear the default error stack */
@ -302,7 +302,7 @@ H5Eprint1(FILE *stream)
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
FUNC_ENTER_API_NOCLEAR(H5Eprint1, FAIL)
FUNC_ENTER_API_NOCLEAR(FAIL)
/*NO TRACE*/
if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
@ -339,7 +339,7 @@ H5Ewalk1(H5E_direction_t direction, H5E_walk1_t func, void *client_data)
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
FUNC_ENTER_API_NOCLEAR(H5Ewalk1, FAIL)
FUNC_ENTER_API_NOCLEAR(FAIL)
/*NO TRACE*/
if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
@ -384,7 +384,7 @@ H5Eget_auto1(H5E_auto1_t *func, void **client_data)
H5E_auto_op_t auto_op; /* Error stack operator */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Eget_auto1, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "*x**x", func, client_data);
/* Retrieve default error stack */
@ -441,7 +441,7 @@ H5Eset_auto1(H5E_auto1_t func, void *client_data)
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
FUNC_ENTER_API_NOCLEAR(H5Eset_auto1, FAIL)
FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE2("e", "x*x", func, client_data);
if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */

29
src/H5Eint.c
View File

@ -132,7 +132,7 @@ DESCRIPTION
static herr_t
H5E_init_int_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_init_int_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5E_init())
} /* H5E_init_int_interface() */
@ -156,7 +156,7 @@ H5E_get_msg(const H5E_msg_t *msg, H5E_type_t *type, char *msg_str, size_t size)
{
ssize_t len; /* Length of error message */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_get_msg)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(msg);
@ -227,7 +227,7 @@ H5E_walk1_cb(int n, H5E_error1_t *err_desc, void *client_data)
unsigned have_desc = 1; /* Flag to indicate whether the error has a "real" description */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_walk1_cb)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(err_desc);
@ -349,7 +349,7 @@ H5E_walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data)
unsigned have_desc = 1; /* Flag to indicate whether the error has a "real" description */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_walk2_cb)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(err_desc);
@ -450,8 +450,7 @@ H5E_print(const H5E_t *estack, FILE *stream, hbool_t bk_compatible)
H5E_walk_op_t walk_op; /* Error stack walking callback */
herr_t ret_value = SUCCEED;
/* Don't clear the error stack! :-) */
FUNC_ENTER_NOAPI_NOINIT(H5E_print)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(estack);
@ -526,7 +525,7 @@ H5E_walk(const H5E_t *estack, H5E_direction_t direction, const H5E_walk_op_t *op
herr_t status; /* Status from callback function */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5E_walk)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(estack);
@ -620,7 +619,7 @@ done:
herr_t
H5E_get_auto(const H5E_t *estack, H5E_auto_op_t *op, void **client_data)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_get_auto)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(estack);
@ -660,7 +659,7 @@ H5E_get_auto(const H5E_t *estack, H5E_auto_op_t *op, void **client_data)
herr_t
H5E_set_auto(H5E_t *estack, const H5E_auto_op_t *op, void *client_data)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_set_auto)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(estack);
@ -704,7 +703,7 @@ H5E_printf_stack(H5E_t *estack, const char *file, const char *func, unsigned lin
* HERROR(). HERROR() is called by HRETURN_ERROR() which could
* be called by FUNC_ENTER().
*/
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_printf_stack)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(cls_id > 0);
@ -808,7 +807,7 @@ H5E_push_stack(H5E_t *estack, const char *file, const char *func, unsigned line,
* HERROR(). HERROR() is called by HRETURN_ERROR() which could
* be called by FUNC_ENTER().
*/
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_push_stack)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(cls_id > 0);
@ -882,7 +881,7 @@ H5E_clear_entries(H5E_t *estack, size_t nentries)
unsigned u; /* Local index variable */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5E_clear_entries)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(estack);
@ -936,7 +935,7 @@ H5E_clear_stack(H5E_t *estack)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5E_clear_stack, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check for 'default' error stack */
if(estack == NULL)
@ -972,7 +971,7 @@ H5E_pop(H5E_t *estack, size_t count)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5E_pop)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(estack);
@ -1006,7 +1005,7 @@ H5E_dump_api_stack(hbool_t is_api)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5E_dump_api_stack, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Only dump the error stack during an API call */
if(is_api) {

2
src/H5Eprivate.h
View File

@ -126,7 +126,7 @@ extern int H5E_mpi_error_str_len;
* error number, a description of the error (as a printf-like format string),
* and an optional set of arguments for the printf format arguments.
*/
#define H5E_PRINTF(...) H5E_printf_stack(NULL, __FILE__, FUNCNAME, __LINE__, H5E_ERR_CLS_g, H5_MY_PKG_ERR, __VA_ARGS__)
#define H5E_PRINTF(...) H5E_printf_stack(NULL, __FILE__, FUNC, __LINE__, H5E_ERR_CLS_g, H5_MY_PKG_ERR, __VA_ARGS__)
/*
* H5_LEAVE macro, used to facilitate control flow between a

122
src/H5F.c
View File

@ -86,7 +86,7 @@ H5F_init(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_init, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
@ -112,7 +112,7 @@ H5F_init_interface(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_init_interface)
FUNC_ENTER_NOAPI_NOINIT
/*
* Initialize the atom group for the file IDs.
@ -148,7 +148,7 @@ H5F_term_interface(void)
{
int n = 0;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_term_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
if(H5_interface_initialize_g) {
if((n = H5I_nmembers(H5I_FILE)) != 0) {
@ -189,7 +189,7 @@ H5Fget_create_plist(hid_t file_id)
H5P_genplist_t *plist; /* Property list */
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Fget_create_plist, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", file_id);
/* check args */
@ -234,7 +234,7 @@ H5Fget_access_plist(hid_t file_id)
H5F_t *f; /* File info */
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Fget_access_plist, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", file_id);
/* Check args */
@ -282,7 +282,7 @@ H5F_get_access_plist(H5F_t *f, hbool_t app_ref)
unsigned efc_size = 0;
hid_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5F_get_access_plist, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
@ -377,7 +377,7 @@ H5Fget_obj_count(hid_t file_id, unsigned types)
H5F_t *f = NULL; /* File to query */
ssize_t ret_value; /* Return value */
FUNC_ENTER_API(H5Fget_obj_count, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("Zs", "iIu", file_id, types);
if(file_id != (hid_t)H5F_OBJ_ALL && (NULL == (f = (H5F_t *)H5I_object_verify(file_id, H5I_FILE))))
@ -417,7 +417,7 @@ H5F_get_obj_count(const H5F_t *f, unsigned types, hbool_t app_ref)
{
size_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_obj_count)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* H5F_get_objects doesn't fail */
ret_value = H5F_get_objects(f, types, 0, NULL, app_ref);
@ -450,7 +450,7 @@ H5Fget_obj_ids(hid_t file_id, unsigned types, size_t max_objs, hid_t *oid_list)
H5F_t *f = NULL; /* File to query */
ssize_t ret_value; /* Return value */
FUNC_ENTER_API(H5Fget_obj_ids, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE4("Zs", "iIuz*i", file_id, types, max_objs, oid_list);
if(file_id != (hid_t)H5F_OBJ_ALL && (NULL == (f = (H5F_t *)H5I_object_verify(file_id, H5I_FILE))))
@ -490,7 +490,7 @@ H5F_get_obj_ids(const H5F_t *f, unsigned types, size_t max_objs, hid_t *oid_list
{
size_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_obj_ids)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* H5F_get_objects doesn't fail */
ret_value = H5F_get_objects(f, types, max_objs, oid_list, app_ref);
@ -519,7 +519,7 @@ H5F_get_objects(const H5F_t *f, unsigned types, size_t max_index, hid_t *obj_id_
H5F_olist_t olist; /* Structure to hold search results */
size_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_objects)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set up search information */
olist.obj_id_list = (max_index==0 ? NULL : obj_id_list);
@ -603,7 +603,7 @@ H5F_get_objects_cb(void *obj_ptr, hid_t obj_id, void *key)
H5F_olist_t *olist = (H5F_olist_t *)key; /* Alias for search info */
int ret_value = FALSE; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_get_objects_cb)
FUNC_ENTER_NOAPI_NOINIT
HDassert(obj_ptr);
HDassert(olist);
@ -723,7 +723,7 @@ H5Fget_vfd_handle(hid_t file_id, hid_t fapl, void **file_handle)
H5F_t *file; /* File to query */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Fget_vfd_handle, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ii**x", file_id, fapl, file_handle);
/* Check args */
@ -769,7 +769,7 @@ H5Fis_hdf5(const char *name)
H5FD_t *file = NULL; /* Low-level file struct */
htri_t ret_value; /* Return value */
FUNC_ENTER_API(H5Fis_hdf5, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("t", "*s", name);
/* Check args and all the boring stuff. */
@ -820,7 +820,7 @@ H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf)
{
H5F_t *f = NULL, *ret_value;
FUNC_ENTER_NOAPI_NOINIT(H5F_new)
FUNC_ENTER_NOAPI_NOINIT
if(NULL == (f = H5FL_CALLOC(H5F_t)))
HGOTO_ERROR(H5E_FILE, H5E_NOSPACE, NULL, "can't allocate top file structure")
@ -981,7 +981,7 @@ H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_dest)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@ -1167,7 +1167,7 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id,
H5F_close_degree_t fc_degree; /*file close degree */
H5F_t *ret_value; /*actual return value */
FUNC_ENTER_NOAPI(H5F_open, NULL)
FUNC_ENTER_NOAPI(NULL)
/*
* If the driver has a `cmp' method then the driver is capable of
@ -1388,7 +1388,7 @@ H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id)
H5F_t *new_file = NULL; /*file struct for new file */
hid_t ret_value; /*return value */
FUNC_ENTER_API(H5Fcreate, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE4("i", "*sIuii", filename, flags, fcpl_id, fapl_id);
/* Check/fix arguments */
@ -1494,7 +1494,7 @@ H5Fopen(const char *filename, unsigned flags, hid_t fapl_id)
H5F_t *new_file = NULL; /*file struct for new file */
hid_t ret_value; /*return value */
FUNC_ENTER_API(H5Fopen, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("i", "*sIui", filename, flags, fapl_id);
/* Check/fix arguments. */
@ -1550,7 +1550,7 @@ H5Fflush(hid_t object_id, H5F_scope_t scope)
H5O_loc_t *oloc = NULL; /* Object location for ID */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Fflush, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iFs", object_id, scope);
switch(H5I_get_type(object_id)) {
@ -1667,7 +1667,7 @@ H5F_flush(H5F_t *f, hid_t dxpl_id, hbool_t closing)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_flush, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check arguments */
HDassert(f);
@ -1736,7 +1736,7 @@ H5F_close(H5F_t *f)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_close)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@ -1796,7 +1796,7 @@ H5F_try_close(H5F_t *f)
unsigned nopen_objs = 0; /* Number of open objects in file/mount hierarchy */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_try_close)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@ -1955,7 +1955,7 @@ H5Fclose(hid_t file_id)
int nref;
herr_t ret_value = SUCCEED;
FUNC_ENTER_API(H5Fclose, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", file_id);
/* Check/fix arguments. */
@ -2017,7 +2017,7 @@ H5Freopen(hid_t file_id)
H5F_t *new_file = NULL;
hid_t ret_value;
FUNC_ENTER_API(H5Freopen, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", file_id);
/* Check arguments */
@ -2068,7 +2068,7 @@ H5Fget_intent(hid_t file_id, unsigned *intent_flags)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_API(H5Fget_intent, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*Iu", file_id, intent_flags);
/* If no intent flags were passed in, exit quietly */
@ -2112,7 +2112,7 @@ H5F_get_id(H5F_t *file, hbool_t app_ref)
{
hid_t ret_value;
FUNC_ENTER_NOAPI_NOINIT(H5F_get_id)
FUNC_ENTER_NOAPI_NOINIT
HDassert(file);
@ -2151,8 +2151,8 @@ done:
unsigned
H5F_incr_nopen_objs(H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_incr_nopen_objs)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@ -2178,8 +2178,8 @@ H5F_incr_nopen_objs(H5F_t *f)
unsigned
H5F_decr_nopen_objs(H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_decr_nopen_objs)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@ -2209,7 +2209,7 @@ H5F_build_actual_name(const H5F_t *f, const H5P_genplist_t *fapl, const char *na
hid_t new_fapl_id = -1; /* ID for duplicated FAPL */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_build_actual_name)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@ -2319,8 +2319,8 @@ H5F_addr_encode_len(size_t addr_len, uint8_t **pp/*in,out*/, haddr_t addr)
{
unsigned u; /* Local index variable */
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_addr_encode_len)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(addr_len);
HDassert(pp && *pp);
@ -2358,8 +2358,8 @@ H5F_addr_encode_len(size_t addr_len, uint8_t **pp/*in,out*/, haddr_t addr)
void
H5F_addr_encode(const H5F_t *f, uint8_t **pp/*in,out*/, haddr_t addr)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_addr_encode)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@ -2392,8 +2392,8 @@ H5F_addr_decode_len(size_t addr_len, const uint8_t **pp/*in,out*/, haddr_t *addr
hbool_t all_zero = TRUE; /* True if address was all zeroes */
unsigned u; /* Local index variable */
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_addr_decode_len)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(addr_len);
HDassert(pp && *pp);
@ -2457,8 +2457,8 @@ H5F_addr_decode_len(size_t addr_len, const uint8_t **pp/*in,out*/, haddr_t *addr
void
H5F_addr_decode(const H5F_t *f, const uint8_t **pp/*in,out*/, haddr_t *addr_p/*out*/)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_addr_decode)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@ -2489,7 +2489,7 @@ H5Fget_freespace(hid_t file_id)
hsize_t tot_space; /* Amount of free space in the file */
hssize_t ret_value; /* Return value */
FUNC_ENTER_API(H5Fget_freespace, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("Hs", "i", file_id);
/* Check args */
@ -2532,7 +2532,7 @@ H5Fget_filesize(hid_t file_id, hsize_t *size)
haddr_t eof; /* End of file address */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Fget_filesize, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*h", file_id, size);
/* Check args */
@ -2574,7 +2574,7 @@ H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr)
H5F_t *file; /* File object for file ID */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Fget_mdc_config, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*x", file_id, config_ptr);
/* Check args */
@ -2613,7 +2613,7 @@ H5Fset_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr)
H5F_t *file; /* File object for file ID */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Fset_mdc_config, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*x", file_id, config_ptr);
/* Check args */
@ -2651,7 +2651,7 @@ H5Fget_mdc_hit_rate(hid_t file_id, double *hit_rate_ptr)
H5F_t *file; /* File object for file ID */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Fget_mdc_hit_rate, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*d", file_id, hit_rate_ptr);
/* Check args */
@ -2695,7 +2695,7 @@ H5Fget_mdc_size(hid_t file_id, size_t *max_size_ptr, size_t *min_clean_size_ptr,
int32_t cur_num_entries;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Fget_mdc_size, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE5("e", "i*z*z*z*Is", file_id, max_size_ptr, min_clean_size_ptr,
cur_size_ptr, cur_num_entries_ptr);
@ -2742,7 +2742,7 @@ H5Freset_mdc_hit_rate_stats(hid_t file_id)
H5F_t *file; /* File object for file ID */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Freset_mdc_hit_rate_stats, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", file_id);
/* Check args */
@ -2787,7 +2787,7 @@ H5Fget_name(hid_t obj_id, char *name/*out*/, size_t size)
size_t len;
ssize_t ret_value;
FUNC_ENTER_API (H5Fget_name, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("Zs", "ixz", obj_id, name, size);
/* For file IDs, get the file object directly */
@ -2846,7 +2846,7 @@ H5Fget_info2(hid_t obj_id, H5F_info2_t *finfo)
H5F_t *f; /* Top file in mount hierarchy */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Fget_info2, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*x", obj_id, finfo);
/* Check args */
@ -2919,7 +2919,7 @@ H5Fget_free_sections(hid_t file_id, H5F_mem_t type, size_t nsects,
H5F_t *file; /* Top file in mount hierarchy */
ssize_t ret_value; /* Return value */
FUNC_ENTER_API(H5Fget_free_sections, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE4("Zs", "iFmzx", file_id, type, nsects, sect_info);
/* Check args */
@ -2957,7 +2957,7 @@ H5Fclear_elink_file_cache(hid_t file_id)
H5F_t *file; /* File */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Fclear_elink_file_cache, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", file_id);
/* Check args */
@ -2990,8 +2990,8 @@ done:
herr_t
H5F_set_grp_btree_shared(H5F_t *f, H5RC_t *rc)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_set_grp_btree_shared)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@ -3020,8 +3020,8 @@ H5F_set_grp_btree_shared(H5F_t *f, H5RC_t *rc)
herr_t
H5F_set_sohm_addr(H5F_t *f, haddr_t addr)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_set_sohm_addr)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@ -3049,8 +3049,8 @@ H5F_set_sohm_addr(H5F_t *f, haddr_t addr)
herr_t
H5F_set_sohm_vers(H5F_t *f, unsigned vers)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_set_sohm_vers)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@ -3078,8 +3078,8 @@ H5F_set_sohm_vers(H5F_t *f, unsigned vers)
herr_t
H5F_set_sohm_nindexes(H5F_t *f, unsigned nindexes)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_set_sohm_nindexes)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@ -3107,8 +3107,8 @@ H5F_set_sohm_nindexes(H5F_t *f, unsigned nindexes)
herr_t
H5F_set_store_msg_crt_idx(H5F_t *f, hbool_t flag)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_set_store_msg_crt_idx)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);

111
src/H5FD.c
View File

@ -118,7 +118,7 @@ H5FD_init(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_init, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
@ -147,7 +147,7 @@ H5FD_init_interface(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FD_init_interface)
FUNC_ENTER_NOAPI_NOINIT
if(H5I_register_type(H5I_VFL, (size_t)H5I_VFL_HASHSIZE, 0, (H5I_free_t)H5FD_free_cls)<H5I_FILE)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "unable to initialize interface")
@ -185,7 +185,7 @@ H5FD_term_interface(void)
{
int n = 0;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_term_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
if(H5_interface_initialize_g) {
if((n=H5I_nmembers(H5I_VFL))!=0) {
@ -223,7 +223,7 @@ H5FD_free_cls(H5FD_class_t *cls)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5FD_free_cls)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(cls);
@ -272,7 +272,7 @@ H5FDregister(const H5FD_class_t *cls)
hid_t ret_value;
H5FD_mem_t type;
FUNC_ENTER_API(H5FDregister, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("i", "*x", cls);
/* Check arguments */
@ -334,7 +334,7 @@ H5FD_register(const void *_cls, size_t size, hbool_t app_ref)
H5FD_mem_t type;
hid_t ret_value;
FUNC_ENTER_NOAPI(H5FD_register, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments */
HDassert(cls);
@ -385,7 +385,7 @@ H5FDunregister(hid_t driver_id)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5FDunregister, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", driver_id);
/* Check arguments */
@ -426,7 +426,7 @@ H5FD_get_class(hid_t id)
{
H5FD_class_t *ret_value = NULL;
FUNC_ENTER_NOAPI(H5FD_get_class, NULL)
FUNC_ENTER_NOAPI(NULL)
if(H5I_VFL == H5I_get_type(id))
ret_value = (H5FD_class_t *)H5I_object(id);
@ -479,7 +479,7 @@ H5FD_sb_size(H5FD_t *file)
{
hsize_t ret_value=0;
FUNC_ENTER_NOAPI(H5FD_sb_size, 0)
FUNC_ENTER_NOAPI(0)
assert(file && file->cls);
@ -517,7 +517,7 @@ H5FD_sb_encode(H5FD_t *file, char *name/*out*/, uint8_t *buf)
{
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_sb_encode, FAIL)
FUNC_ENTER_NOAPI(FAIL)
assert(file && file->cls);
if(file->cls->sb_encode &&
@ -547,7 +547,7 @@ H5FD_sb_decode(H5FD_t *file, const char *name, const uint8_t *buf)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_sb_decode, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(file && file->cls);
if(file->cls->sb_decode && (file->cls->sb_decode)(file, name, buf) < 0)
@ -584,7 +584,7 @@ H5FD_pl_copy(void *(*copy_func)(const void *), size_t pl_size, const void *old_p
void *new_pl = NULL; /* Copy of property list */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FD_pl_copy)
FUNC_ENTER_NOAPI_NOINIT
/* Copy old pl, if one exists */
if(old_pl) {
@ -629,7 +629,7 @@ H5FD_pl_close(hid_t driver_id, herr_t (*free_func)(void *), void *pl)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FD_pl_close)
FUNC_ENTER_NOAPI_NOINIT
/* Allow driver to free or do it ourselves */
if(pl && free_func) {
@ -679,7 +679,7 @@ H5FD_fapl_get(H5FD_t *file)
{
void *ret_value=NULL;
FUNC_ENTER_NOAPI(H5FD_fapl_get, NULL)
FUNC_ENTER_NOAPI(NULL)
assert(file);
@ -713,7 +713,7 @@ H5FD_fapl_open(H5P_genplist_t *plist, hid_t driver_id, const void *driver_info)
void *copied_driver_info = NULL; /* Temporary VFL driver info */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_fapl_open, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Increment the reference count on driver and copy driver info */
if(H5I_inc_ref(driver_id, FALSE) < 0)
@ -760,7 +760,7 @@ H5FD_fapl_copy(hid_t driver_id, const void *old_fapl, void **copied_fapl)
H5FD_class_t *driver;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_fapl_copy, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
if(NULL == (driver = (H5FD_class_t *)H5I_object(driver_id)))
@ -796,7 +796,7 @@ H5FD_fapl_close(hid_t driver_id, void *fapl)
H5FD_class_t *driver = NULL;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_fapl_close, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
if(driver_id > 0) {
@ -835,7 +835,7 @@ H5FD_dxpl_open(H5P_genplist_t *plist, hid_t driver_id, const void *driver_info)
void *copied_driver_info = NULL; /* Temporary VFL driver info */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_dxpl_open, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Increment the reference count on the driver and copy the driver info */
if(H5I_inc_ref(driver_id, FALSE) < 0)
@ -881,7 +881,7 @@ H5FD_dxpl_copy(hid_t driver_id, const void *old_dxpl, void **copied_dxpl)
H5FD_class_t *driver;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_dxpl_copy, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
if(NULL == (driver = (H5FD_class_t *)H5I_object(driver_id)))
@ -917,7 +917,7 @@ H5FD_dxpl_close(hid_t driver_id, void *dxpl)
H5FD_class_t *driver;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_dxpl_close, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
if(driver_id > 0) {
@ -994,7 +994,7 @@ H5FDopen(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
{
H5FD_t *ret_value=NULL;
FUNC_ENTER_API(H5FDopen, NULL)
FUNC_ENTER_API(NULL)
/* Check arguments */
if(H5P_DEFAULT == fapl_id)
@ -1041,7 +1041,7 @@ H5FD_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
H5P_genplist_t *plist; /* Property list pointer */
H5FD_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_open, NULL)
FUNC_ENTER_NOAPI(NULL)
/* Sanity check */
if(0 == maxaddr)
@ -1127,7 +1127,7 @@ H5FDclose(H5FD_t *file)
{
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_API(H5FDclose, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("e", "*x", file);
if(!file || !file->cls)
@ -1160,7 +1160,7 @@ H5FD_close(H5FD_t *file)
const H5FD_class_t *driver;
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5FD_close, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(file && file->cls);
@ -1212,7 +1212,7 @@ H5FDcmp(const H5FD_t *f1, const H5FD_t *f2)
{
int ret_value;
FUNC_ENTER_API(H5FDcmp, -1) /*return value is arbitrary*/
FUNC_ENTER_API(-1) /*return value is arbitrary*/
H5TRACE2("Is", "*x*x", f1, f2);
ret_value = H5FD_cmp(f1, f2);
@ -1243,7 +1243,7 @@ H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2)
{
int ret_value;
FUNC_ENTER_NOAPI(H5FD_cmp, -1) /*return value is arbitrary*/
FUNC_ENTER_NOAPI(-1) /*return value is arbitrary*/
if((!f1 || !f1->cls) && (!f2 || !f2->cls))
HGOTO_DONE(0)
@ -1293,7 +1293,7 @@ H5FDquery(const H5FD_t *f, unsigned long *flags/*out*/)
{
int ret_value;
FUNC_ENTER_API(H5FDquery, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("Is", "*xx", f, flags);
assert(f);
@ -1327,7 +1327,7 @@ H5FD_query(const H5FD_t *f, unsigned long *flags/*out*/)
{
int ret_value=0;
FUNC_ENTER_NOAPI(H5FD_query, FAIL)
FUNC_ENTER_NOAPI(FAIL)
assert(f);
assert(flags);
@ -1387,7 +1387,7 @@ H5FDalloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
{
haddr_t ret_value = HADDR_UNDEF;
FUNC_ENTER_API(H5FDalloc, HADDR_UNDEF)
FUNC_ENTER_API(HADDR_UNDEF)
H5TRACE4("a", "*xMtih", file, type, dxpl_id, size);
/* Check args */
@ -1441,7 +1441,7 @@ H5FDfree(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t siz
{
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_API(H5FDfree, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE5("e", "*xMtiah", file, type, dxpl_id, addr, size);
/* Check args */
@ -1484,7 +1484,7 @@ H5FDget_eoa(H5FD_t *file, H5FD_mem_t type)
{
haddr_t ret_value;
FUNC_ENTER_API(H5FDget_eoa, HADDR_UNDEF)
FUNC_ENTER_API(HADDR_UNDEF)
H5TRACE2("a", "*xMt", file, type);
/* Check args */
@ -1534,7 +1534,7 @@ H5FDset_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5FDset_eoa, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "*xMta", file, type, addr);
/* Check args */
@ -1586,7 +1586,7 @@ H5FDget_eof(H5FD_t *file)
{
haddr_t ret_value;
FUNC_ENTER_API(H5FDget_eof, HADDR_UNDEF)
FUNC_ENTER_API(HADDR_UNDEF)
H5TRACE1("a", "*x", file);
/* Check arguments */
@ -1623,7 +1623,7 @@ H5FD_get_maxaddr(const H5FD_t *file)
{
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_get_maxaddr, HADDR_UNDEF)
FUNC_ENTER_NOAPI(HADDR_UNDEF)
HDassert(file);
@ -1651,7 +1651,7 @@ done:
herr_t
H5FD_get_feature_flags(const H5FD_t *file, unsigned long *feature_flags)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_get_feature_flags)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(file);
HDassert(feature_flags);
@ -1681,7 +1681,7 @@ H5FD_get_fs_type_map(const H5FD_t *file, H5FD_mem_t *type_map)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_get_fs_type_map, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(file && file->cls);
@ -1729,7 +1729,7 @@ H5FDread(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5FDread, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE6("e", "*xMtiazx", file, type, dxpl_id, addr, size, buf);
/* Check args */
@ -1780,7 +1780,7 @@ H5FDwrite(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t siz
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5FDwrite, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE6("e", "*xMtiaz*x", file, type, dxpl_id, addr, size, buf);
/* Check args */
@ -1829,7 +1829,7 @@ H5FDflush(H5FD_t *file, hid_t dxpl_id, unsigned closing)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5FDflush, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "*xiIu", file, dxpl_id, closing);
/* Check args */
@ -1868,7 +1868,7 @@ H5FD_flush(H5FD_t *file, hid_t dxpl_id, unsigned closing)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_flush, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(file && file->cls);
@ -1898,7 +1898,7 @@ H5FDtruncate(H5FD_t *file, hid_t dxpl_id, unsigned closing)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5FDtruncate, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "*xiIu", file, dxpl_id, closing);
/* Check args */
@ -1937,7 +1937,7 @@ H5FD_truncate(H5FD_t *file, hid_t dxpl_id, unsigned closing)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_truncate, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(file && file->cls);
@ -1966,9 +1966,7 @@ done:
herr_t
H5FD_get_fileno(const H5FD_t *file, unsigned long *filenum)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_get_fileno, FAIL)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(file);
HDassert(filenum);
@ -1976,8 +1974,7 @@ H5FD_get_fileno(const H5FD_t *file, unsigned long *filenum)
/* Retrieve the file's serial number */
*filenum = file->fileno;
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD_get_fileno() */
@ -2001,7 +1998,7 @@ H5FDget_vfd_handle(H5FD_t *file, hid_t fapl, void **file_handle)
{
herr_t ret_value;
FUNC_ENTER_API(H5FDget_vfd_handle, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "*xi**x", file, fapl, file_handle);
/* Check arguments */
@ -2032,7 +2029,7 @@ H5FD_get_vfd_handle(H5FD_t *file, hid_t fapl, void **file_handle)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5FD_get_vfd_handle, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(file);
@ -2063,9 +2060,7 @@ done:
herr_t
H5FD_set_base_addr(H5FD_t *file, haddr_t base_addr)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5FD_set_base_addr, FAIL)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(file);
HDassert(H5F_addr_defined(base_addr));
@ -2073,8 +2068,7 @@ H5FD_set_base_addr(H5FD_t *file, haddr_t base_addr)
/* Set the file's base address */
file->base_addr = base_addr;
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD_set_base_addr() */
@ -2094,16 +2088,11 @@ done:
haddr_t
H5FD_get_base_addr(const H5FD_t *file)
{
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_get_base_addr, HADDR_UNDEF)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(file);
/* Return the file's base address */
ret_value = file->base_addr;
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(file->base_addr)
} /* end H5FD_get_base_addr() */

51
src/H5FDcore.c
View File

@ -181,7 +181,7 @@ DESCRIPTION
static herr_t
H5FD_core_init_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_core_init_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5FD_core_init())
} /* H5FD_core_init_interface() */
@ -209,7 +209,7 @@ H5FD_core_init(void)
{
hid_t ret_value=H5FD_CORE_g; /* Return value */
FUNC_ENTER_NOAPI(H5FD_core_init, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if (H5I_VFL!=H5Iget_type(H5FD_CORE_g))
H5FD_CORE_g = H5FD_register(&H5FD_core_g,sizeof(H5FD_class_t),FALSE);
@ -237,7 +237,7 @@ done:
static herr_t
H5FD_core_term(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_core_term)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Reset VFL ID */
H5FD_CORE_g=0;
@ -276,7 +276,7 @@ H5Pset_fapl_core(hid_t fapl_id, size_t increment, hbool_t backing_store)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
FUNC_ENTER_API(H5Pset_fapl_core, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "izb", fapl_id, increment, backing_store);
/* Check argument */
@ -323,7 +323,7 @@ H5Pget_fapl_core(hid_t fapl_id, size_t *increment/*out*/,
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_API(H5Pget_fapl_core, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ixx", fapl_id, increment, backing_store);
if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
@ -366,7 +366,7 @@ H5FD_core_fapl_get(H5FD_t *_file)
H5FD_core_fapl_t *fa;
void *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_core_fapl_get, NULL)
FUNC_ENTER_NOAPI_NOINIT
if(NULL == (fa = (H5FD_core_fapl_t *)H5MM_calloc(sizeof(H5FD_core_fapl_t))))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
@ -424,7 +424,7 @@ H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id,
int fd=-1;
H5FD_t *ret_value;
FUNC_ENTER_NOAPI(H5FD_core_open, NULL)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(!name || !*name)
@ -541,7 +541,7 @@ H5FD_core_close(H5FD_t *_file)
H5FD_core_t *file = (H5FD_core_t*)_file;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_core_close, FAIL)
FUNC_ENTER_NOAPI_NOINIT
/* Flush any changed buffers */
if(H5FD_core_flush(_file, (hid_t)-1, TRUE) < 0)
@ -594,7 +594,7 @@ H5FD_core_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
const H5FD_core_t *f2 = (const H5FD_core_t*)_f2;
int ret_value = 0;
FUNC_ENTER_NOAPI(H5FD_core_cmp, FAIL)
FUNC_ENTER_NOAPI_NOINIT_NOERR
if(f1->fd >= 0 && f2->fd >= 0) {
/* Compare low level file information for backing store */
@ -669,7 +669,7 @@ H5FD_core_query(const H5FD_t * _file, unsigned long *flags /* out */)
{
const H5FD_core_t *file = (const H5FD_core_t*)_file;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_core_query)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set the VFL feature flags that this driver supports */
if(flags) {
@ -713,15 +713,10 @@ static haddr_t
H5FD_core_get_eoa(const H5FD_t *_file, H5FD_mem_t UNUSED type)
{
const H5FD_core_t *file = (const H5FD_core_t*)_file;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_core_get_eoa, HADDR_UNDEF)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set return value */
ret_value=file->eoa;
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(file->eoa)
}
@ -752,7 +747,7 @@ H5FD_core_set_eoa(H5FD_t *_file, H5FD_mem_t UNUSED type, haddr_t addr)
H5FD_core_t *file = (H5FD_core_t*)_file;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_core_set_eoa, FAIL)
FUNC_ENTER_NOAPI_NOINIT
if(ADDR_OVERFLOW(addr))
HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "address overflow")
@ -787,17 +782,11 @@ done:
static haddr_t
H5FD_core_get_eof(const H5FD_t *_file)
{
haddr_t ret_value; /* Return value */
const H5FD_core_t *file = (const H5FD_core_t*)_file;
FUNC_ENTER_NOAPI(H5FD_core_get_eof, HADDR_UNDEF)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set return value */
ret_value=MAX(file->eof, file->eoa);
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(MAX(file->eof, file->eoa))
}
@ -821,7 +810,7 @@ H5FD_core_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle)
H5FD_core_t *file = (H5FD_core_t *)_file; /* core VFD info */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_core_get_handle, FAIL)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
if(!file_handle)
@ -890,7 +879,7 @@ H5FD_core_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, hadd
H5FD_core_t *file = (H5FD_core_t*)_file;
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_core_read, FAIL)
FUNC_ENTER_NOAPI_NOINIT
assert(file && file->pub.cls);
assert(buf);
@ -957,7 +946,7 @@ H5FD_core_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, had
H5FD_core_t *file = (H5FD_core_t*)_file;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_core_write, FAIL)
FUNC_ENTER_NOAPI_NOINIT
HDassert(file && file->pub.cls);
HDassert(buf);
@ -1029,7 +1018,7 @@ H5FD_core_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned UNUSED closing)
H5FD_core_t *file = (H5FD_core_t*)_file;
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_core_flush, FAIL)
FUNC_ENTER_NOAPI_NOINIT
/* Write to backing store */
if (file->dirty && file->fd>=0 && file->backing_store) {
@ -1081,7 +1070,7 @@ H5FD_core_truncate(H5FD_t *_file, hid_t UNUSED dxpl_id, hbool_t UNUSED closing)
size_t new_eof; /* New size of memory buffer */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_core_truncate, FAIL)
FUNC_ENTER_NOAPI_NOINIT
HDassert(file);

66
src/H5FDfamily.c
View File

@ -168,7 +168,7 @@ DESCRIPTION
static herr_t
H5FD_family_init_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_family_init_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5FD_family_init())
} /* H5FD_family_init_interface() */
@ -196,7 +196,7 @@ H5FD_family_init(void)
{
hid_t ret_value=H5FD_FAMILY_g; /* Return value */
FUNC_ENTER_NOAPI(H5FD_family_init, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if (H5I_VFL!=H5Iget_type(H5FD_FAMILY_g))
H5FD_FAMILY_g = H5FD_register(&H5FD_family_g,sizeof(H5FD_class_t),FALSE);
@ -224,7 +224,7 @@ done:
static herr_t
H5FD_family_term(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_family_term)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Reset VFL ID */
H5FD_FAMILY_g=0;
@ -265,7 +265,7 @@ H5Pset_fapl_family(hid_t fapl_id, hsize_t msize, hid_t memb_fapl_id)
H5FD_family_fapl_t fa={0, -1};
H5P_genplist_t *plist; /* Property list pointer */
FUNC_ENTER_API(H5Pset_fapl_family, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ihi", fapl_id, msize, memb_fapl_id);
@ -324,7 +324,7 @@ H5Pget_fapl_family(hid_t fapl_id, hsize_t *msize/*out*/,
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_API(H5Pget_fapl_family, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ixx", fapl_id, msize, memb_fapl_id);
if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
@ -371,7 +371,7 @@ H5FD_family_fapl_get(H5FD_t *_file)
H5P_genplist_t *plist; /* Property list pointer */
void *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_family_fapl_get, NULL)
FUNC_ENTER_NOAPI_NOINIT
if(NULL == (fa = (H5FD_family_fapl_t *)H5MM_calloc(sizeof(H5FD_family_fapl_t))))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
@ -417,7 +417,7 @@ H5FD_family_fapl_copy(const void *_old_fa)
H5P_genplist_t *plist; /* Property list pointer */
void *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_family_fapl_copy, NULL)
FUNC_ENTER_NOAPI_NOINIT
if(NULL == (new_fa = (H5FD_family_fapl_t *)H5MM_malloc(sizeof(H5FD_family_fapl_t))))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
@ -470,7 +470,7 @@ H5FD_family_fapl_free(void *_fa)
H5FD_family_fapl_t *fa = (H5FD_family_fapl_t*)_fa;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_family_fapl_free, FAIL)
FUNC_ENTER_NOAPI_NOINIT
if(H5I_dec_ref(fa->memb_fapl_id) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTDEC, FAIL, "can't close driver ID")
@ -505,7 +505,7 @@ H5FD_family_dxpl_copy(const void *_old_dx)
H5P_genplist_t *plist; /* Property list pointer */
void *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_family_dxpl_copy, NULL)
FUNC_ENTER_NOAPI_NOINIT
if(NULL == (new_dx = (H5FD_family_dxpl_t *)H5MM_malloc(sizeof(H5FD_family_dxpl_t))))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
@ -556,7 +556,7 @@ H5FD_family_dxpl_free(void *_dx)
H5FD_family_dxpl_t *dx = (H5FD_family_dxpl_t*)_dx;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_family_dxpl_free, FAIL)
FUNC_ENTER_NOAPI_NOINIT
if(H5I_dec_ref(dx->memb_dxpl_id) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTDEC, FAIL, "can't close driver ID")
@ -587,16 +587,11 @@ done:
static hsize_t
H5FD_family_sb_size(H5FD_t UNUSED *_file)
{
hsize_t ret_value = 0; /*size of header*/
FUNC_ENTER_NOAPI(H5FD_family_sb_size, UFAIL)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* 8 bytes field for the size of member file size field should be
* enough for now. */
ret_value += 8;
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(8)
}
@ -625,7 +620,7 @@ H5FD_family_sb_encode(H5FD_t *_file, char *name/*out*/, unsigned char *buf/*out*
{
H5FD_family_t *file = (H5FD_family_t*)_file;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_family_sb_encode)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Name and version number */
HDstrncpy(name, "NCSAfami", (size_t)9);
@ -670,7 +665,7 @@ H5FD_family_sb_decode(H5FD_t *_file, const char UNUSED *name, const unsigned cha
uint64_t msize;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_family_sb_decode, FAIL)
FUNC_ENTER_NOAPI_NOINIT
/* Read member file size. Skip name template for now although it's saved. */
UINT64DECODE(buf, msize);
@ -748,7 +743,7 @@ H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id,
hsize_t eof=HADDR_UNDEF;
unsigned t_flags = flags & ~H5F_ACC_CREAT;
FUNC_ENTER_NOAPI(H5FD_family_open, NULL)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(!name || !*name)
@ -905,7 +900,7 @@ H5FD_family_close(H5FD_t *_file)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_family_close, FAIL)
FUNC_ENTER_NOAPI_NOINIT
/* Close as many members as possible. Use private function here to avoid clearing
* the error stack. We need the error message to indicate wrong member file size. */
@ -929,7 +924,6 @@ H5FD_family_close(H5FD_t *_file)
H5MM_xfree(file->name);
H5MM_xfree(file);
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_family_close() */
@ -959,7 +953,7 @@ H5FD_family_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
const H5FD_family_t *f2 = (const H5FD_family_t*)_f2;
int ret_value = 0;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_family_cmp)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f1->nmembs >= 1 && f1->memb[0]);
HDassert(f2->nmembs >= 1 && f2->memb[0]);
@ -990,7 +984,7 @@ H5FD_family_query(const H5FD_t * _file, unsigned long *flags /* out */)
{
const H5FD_family_t *file = (const H5FD_family_t*)_file; /* Family VFD info */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_family_query)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set the VFL feature flags that this driver supports */
if(flags) {
@ -1034,15 +1028,10 @@ static haddr_t
H5FD_family_get_eoa(const H5FD_t *_file, H5FD_mem_t UNUSED type)
{
const H5FD_family_t *file = (const H5FD_family_t*)_file;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_family_get_eoa, HADDR_UNDEF)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set return value */
ret_value=file->eoa;
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(file->eoa)
}
@ -1074,7 +1063,7 @@ H5FD_family_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t abs_eoa)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_family_set_eoa, FAIL)
FUNC_ENTER_NOAPI_NOINIT
for(u = 0; addr || u < file->nmembs; u++) {
@ -1152,7 +1141,7 @@ H5FD_family_get_eof(const H5FD_t *_file)
int i; /* Local index variable */
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_family_get_eof, HADDR_UNDEF)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Find the last member that has a non-zero EOF and break out of the loop
@ -1179,7 +1168,6 @@ H5FD_family_get_eof(const H5FD_t *_file)
/* Set return value */
ret_value = MAX(eof, file->eoa);
done:
FUNC_LEAVE_NOAPI(ret_value)
}
@ -1207,7 +1195,7 @@ H5FD_family_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle)
int memb;
herr_t ret_value;
FUNC_ENTER_NOAPI(H5FD_family_get_handle, FAIL)
FUNC_ENTER_NOAPI_NOINIT
/* Get the plist structure and family offset */
if(NULL == (plist = H5P_object_verify(fapl, H5P_FILE_ACCESS)))
@ -1259,7 +1247,7 @@ H5FD_family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, si
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_family_read, FAIL)
FUNC_ENTER_NOAPI_NOINIT
/*
* Get the member data transfer property list. If the transfer property
@ -1336,7 +1324,7 @@ H5FD_family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, s
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_family_write, FAIL)
FUNC_ENTER_NOAPI_NOINIT
/*
* Get the member data transfer property list. If the transfer property
@ -1401,7 +1389,7 @@ H5FD_family_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
unsigned u, nerrors = 0;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_family_flush, FAIL)
FUNC_ENTER_NOAPI_NOINIT
for(u = 0; u < file->nmembs; u++)
if(file->memb[u] && H5FD_flush(file->memb[u], dxpl_id, closing) < 0)
@ -1436,7 +1424,7 @@ H5FD_family_truncate(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
unsigned u, nerrors = 0;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_family_truncate, FAIL)
FUNC_ENTER_NOAPI_NOINIT
for(u = 0; u < file->nmembs; u++)
if(file->memb[u] && H5FD_truncate(file->memb[u], dxpl_id, closing) < 0)

12
src/H5FDint.c
View File

@ -97,7 +97,7 @@ DESCRIPTION
static herr_t
H5FD_int_init_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_int_init_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5FD_init())
} /* H5FD_int_init_interface() */
@ -122,7 +122,7 @@ H5FD_read(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_read, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(file && file->cls);
HDassert(H5I_GENPROP_LST == H5I_get_type(dxpl_id));
@ -165,7 +165,7 @@ H5FD_write(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_write, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(file && file->cls);
HDassert(H5I_GENPROP_LST == H5I_get_type(dxpl_id));
@ -212,7 +212,7 @@ H5FD_set_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_set_eoa, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(file && file->cls);
HDassert(H5F_addr_defined(addr) && addr <= file->maxaddr);
@ -249,7 +249,7 @@ H5FD_get_eoa(const H5FD_t *file, H5FD_mem_t type)
{
haddr_t ret_value;
FUNC_ENTER_NOAPI(H5FD_get_eoa, HADDR_UNDEF)
FUNC_ENTER_NOAPI(HADDR_UNDEF)
HDassert(file && file->cls);
@ -291,7 +291,7 @@ H5FD_get_eof(const H5FD_t *file)
{
haddr_t ret_value;
FUNC_ENTER_NOAPI(H5FD_get_eof, HADDR_UNDEF)
FUNC_ENTER_NOAPI(HADDR_UNDEF)
HDassert(file && file->cls);

38
src/H5FDlog.c
View File

@ -256,7 +256,7 @@ DESCRIPTION
static herr_t
H5FD_log_init_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_init_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5FD_log_init())
} /* H5FD_log_init_interface() */
@ -281,7 +281,7 @@ H5FD_log_init(void)
{
hid_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_log_init, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if(H5I_VFL != H5I_get_type(H5FD_LOG_g))
H5FD_LOG_g = H5FD_register(&H5FD_log_g, sizeof(H5FD_class_t), FALSE);
@ -309,7 +309,7 @@ done:
static herr_t
H5FD_log_term(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_term)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Reset VFL ID */
H5FD_LOG_g = 0;
@ -338,7 +338,7 @@ H5Pset_fapl_log(hid_t fapl_id, const char *logfile, unsigned long long flags, si
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value; /* Return value */
FUNC_ENTER_API(H5Pset_fapl_log, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*sULz", fapl_id, logfile, flags, buf_size);
/* Check arguments */
@ -381,7 +381,7 @@ H5FD_log_fapl_get(H5FD_t *_file)
H5FD_log_t *file = (H5FD_log_t *)_file;
void *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_fapl_get)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set return value */
ret_value = H5FD_log_fapl_copy(&(file->fa));
@ -410,7 +410,7 @@ H5FD_log_fapl_copy(const void *_old_fa)
H5FD_log_fapl_t *new_fa = NULL; /* New FAPL info */
void *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FD_log_fapl_copy)
FUNC_ENTER_NOAPI_NOINIT
HDassert(old_fa);
@ -459,7 +459,7 @@ H5FD_log_fapl_free(void *_fa)
{
H5FD_log_fapl_t *fa = (H5FD_log_fapl_t*)_fa;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_fapl_free)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Free the fapl information */
if(fa->logfile)
@ -504,7 +504,7 @@ H5FD_log_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
h5_stat_t sb;
H5FD_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FD_log_open)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check on file offsets */
HDcompile_assert(sizeof(HDoff_t) >= sizeof(size_t));
@ -700,7 +700,7 @@ H5FD_log_close(H5FD_t *_file)
#endif /* H5_HAVE_GETTIMEOFDAY */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FD_log_close)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(file);
@ -848,7 +848,7 @@ H5FD_log_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
const H5FD_log_t *f2 = (const H5FD_log_t *)_f2;
int ret_value = 0;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_cmp)
FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef H5_HAVE_WIN32_API
if(f1->dwVolumeSerialNumber < f2->dwVolumeSerialNumber) HGOTO_DONE(-1)
@ -906,7 +906,7 @@ H5FD_log_query(const H5FD_t *_file, unsigned long *flags /* out */)
{
const H5FD_log_t *file = (const H5FD_log_t *)_file;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_query)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set the VFL feature flags that this driver supports */
if(flags) {
@ -947,7 +947,7 @@ H5FD_log_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, hsize_t siz
haddr_t addr;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_alloc)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Compute the address for the block to allocate */
addr = file->eoa;
@ -1000,7 +1000,7 @@ H5FD_log_get_eoa(const H5FD_t *_file, H5FD_mem_t UNUSED type)
{
const H5FD_log_t *file = (const H5FD_log_t *)_file;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_get_eoa)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(file->eoa)
} /* end H5FD_log_get_eoa() */
@ -1026,7 +1026,7 @@ H5FD_log_set_eoa(H5FD_t *_file, H5FD_mem_t UNUSED type, haddr_t addr)
{
H5FD_log_t *file = (H5FD_log_t *)_file;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_set_eoa)
FUNC_ENTER_NOAPI_NOINIT_NOERR
file->eoa = addr;
@ -1056,7 +1056,7 @@ H5FD_log_get_eof(const H5FD_t *_file)
{
const H5FD_log_t *file = (const H5FD_log_t *)_file;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_get_eof)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(MAX(file->eof, file->eoa))
} /* end H5FD_log_get_eof() */
@ -1081,7 +1081,7 @@ H5FD_log_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void **file_handle)
H5FD_log_t *file = (H5FD_log_t *)_file;
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5FD_log_get_handle)
FUNC_ENTER_NOAPI_NOINIT
if(!file_handle)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
@ -1122,7 +1122,7 @@ H5FD_log_read(H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, haddr_t addr
#endif /* H5_HAVE_GETTIMEOFDAY */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FD_log_read)
FUNC_ENTER_NOAPI_NOINIT
HDassert(file && file->pub.cls);
HDassert(buf);
@ -1323,7 +1323,7 @@ H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, haddr_t add
#endif /* H5_HAVE_GETTIMEOFDAY */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FD_log_write)
FUNC_ENTER_NOAPI_NOINIT
HDassert(file && file->pub.cls);
HDassert(size > 0);
@ -1521,7 +1521,7 @@ H5FD_log_truncate(H5FD_t *_file, hid_t UNUSED dxpl_id, hbool_t UNUSED closing)
H5FD_log_t *file = (H5FD_log_t *)_file;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FD_log_truncate)
FUNC_ENTER_NOAPI_NOINIT
HDassert(file);

23
src/H5FDmpi.c
View File

@ -59,7 +59,7 @@ H5FD_mpi_get_rank(const H5FD_t *file)
const H5FD_class_mpi_t *cls=(const H5FD_class_mpi_t *)(file->cls);
int ret_value;
FUNC_ENTER_NOAPI(H5FD_mpi_get_rank, FAIL)
FUNC_ENTER_NOAPI(FAIL)
assert(file && cls);
assert(cls->get_rank); /* All MPI drivers must implement this */
@ -95,7 +95,7 @@ H5FD_mpi_get_size(const H5FD_t *file)
const H5FD_class_mpi_t *cls=(const H5FD_class_mpi_t *)(file->cls);
int ret_value;
FUNC_ENTER_NOAPI(H5FD_mpi_get_size, FAIL)
FUNC_ENTER_NOAPI(FAIL)
assert(file && cls);
assert(cls->get_size); /* All MPI drivers must implement this */
@ -131,7 +131,7 @@ H5FD_mpi_get_comm(const H5FD_t *file)
const H5FD_class_mpi_t *cls=(const H5FD_class_mpi_t *)(file->cls);
MPI_Comm ret_value;
FUNC_ENTER_NOAPI(H5FD_mpi_get_comm, MPI_COMM_NULL)
FUNC_ENTER_NOAPI(MPI_COMM_NULL)
assert(file && cls);
assert(cls->get_comm); /* All MPI drivers must implement this */
@ -172,7 +172,7 @@ H5FD_mpi_MPIOff_to_haddr(MPI_Offset mpi_off)
{
haddr_t ret_value=HADDR_UNDEF;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpi_MPIOff_to_haddr)
FUNC_ENTER_NOAPI_NOINIT_NOERR
if (mpi_off != (MPI_Offset)(haddr_t)mpi_off)
ret_value=HADDR_UNDEF;
@ -213,7 +213,7 @@ H5FD_mpi_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off/*out*/)
{
herr_t ret_value=FAIL;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpi_haddr_to_MPIOff)
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(mpi_off);
@ -257,7 +257,7 @@ H5FD_mpi_comm_info_dup(MPI_Comm comm, MPI_Info info, MPI_Comm *comm_new, MPI_Inf
MPI_Info info_dup=MPI_INFO_NULL;
int mpi_code;
FUNC_ENTER_NOAPI(H5FD_mpi_comm_info_dup, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments */
if (MPI_COMM_NULL == comm)
@ -316,7 +316,8 @@ herr_t
H5FD_mpi_comm_info_free(MPI_Comm *comm, MPI_Info *info)
{
herr_t ret_value=SUCCEED;
FUNC_ENTER_NOAPI(H5FD_mpi_comm_info_free, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments */
if (!comm || !info)
@ -368,7 +369,7 @@ H5FD_mpio_wait_for_left_neighbor(H5FD_t *_file)
int mpi_code; /* mpi return code */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpio_wait_for_left_neighbor, FAIL)
FUNC_ENTER_NOAPI(FAIL)
assert(file);
assert(H5FD_MPIO==file->pub.driver_id);
@ -422,7 +423,7 @@ H5FD_mpio_signal_right_neighbor(H5FD_t *_file)
int mpi_code; /* mpi return code */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpio_signal_right_neighbor, FAIL)
FUNC_ENTER_NOAPI(FAIL)
assert(file);
assert(H5FD_MPIO==file->pub.driver_id);
@ -470,7 +471,7 @@ H5FD_mpi_setup_collective(hid_t dxpl_id, MPI_Datatype btype, MPI_Datatype ftype)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpi_setup_collective, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments */
if(NULL == (plist = H5P_object_verify(dxpl_id,H5P_DATASET_XFER)))
@ -510,7 +511,7 @@ H5FD_mpi_teardown_collective(hid_t dxpl_id)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpi_teardown_collective, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments */
if(NULL == (plist = H5P_object_verify(dxpl_id,H5P_DATASET_XFER)))

102
src/H5FDmpio.c
View File

@ -171,7 +171,7 @@ DESCRIPTION
static herr_t
H5FD_mpio_init_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpio_init_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5FD_mpio_init())
} /* H5FD_mpio_init_interface() */
@ -202,7 +202,7 @@ H5FD_mpio_init(void)
#endif /* H5FDmpio_DEBUG */
hid_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpio_init, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if (H5I_VFL!=H5I_get_type(H5FD_MPIO_g))
H5FD_MPIO_g = H5FD_register((const H5FD_class_t *)&H5FD_mpio_g,sizeof(H5FD_class_mpi_t),FALSE);
@ -246,7 +246,7 @@ done:
static herr_t
H5FD_mpio_term(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpio_term)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Reset VFL ID */
H5FD_MPIO_g=0;
@ -321,7 +321,7 @@ H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
FUNC_ENTER_API(H5Pset_fapl_mpio, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "iMcMi", fapl_id, comm, info);
if(fapl_id == H5P_DEFAULT)
@ -392,7 +392,7 @@ H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm/*out*/, MPI_Info *info/*out*/)
int mpi_code; /* mpi return code */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_API(H5Pget_fapl_mpio, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ixx", fapl_id, comm, info);
if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
@ -466,7 +466,7 @@ H5Pset_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
FUNC_ENTER_API(H5Pset_dxpl_mpio, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iDt", dxpl_id, xfer_mode);
if(dxpl_id==H5P_DEFAULT)
@ -516,7 +516,7 @@ H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode/*out*/)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_API(H5Pget_dxpl_mpio, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ix", dxpl_id, xfer_mode);
if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
@ -563,7 +563,7 @@ H5Pset_dxpl_mpio_collective_opt(hid_t dxpl_id, H5FD_mpio_collective_opt_t opt_mo
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
FUNC_ENTER_API(H5Pset_dxpl_mpio_collective_opt, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iDc", dxpl_id, opt_mode);
if(dxpl_id == H5P_DEFAULT)
@ -615,7 +615,7 @@ H5Pset_dxpl_mpio_chunk_opt(hid_t dxpl_id, H5FD_mpio_chunk_opt_t opt_mode)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
FUNC_ENTER_API(H5Pset_dxpl_mpio_chunk_opt, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iDh", dxpl_id, opt_mode);
if(dxpl_id == H5P_DEFAULT)
@ -662,7 +662,7 @@ H5Pset_dxpl_mpio_chunk_opt_num(hid_t dxpl_id, unsigned num_chunk_per_proc)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
FUNC_ENTER_API(H5Pset_dxpl_mpio_chunk_opt_num, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iIu", dxpl_id, num_chunk_per_proc);
if(dxpl_id == H5P_DEFAULT)
@ -709,7 +709,7 @@ H5Pset_dxpl_mpio_chunk_opt_ratio(hid_t dxpl_id, unsigned percent_num_proc_per_ch
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
FUNC_ENTER_API(H5Pset_dxpl_mpio_chunk_opt_ratio, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iIu", dxpl_id, percent_num_proc_per_chunk);
if(dxpl_id == H5P_DEFAULT)
@ -758,7 +758,7 @@ H5FD_mpio_fapl_get(H5FD_t *_file)
H5FD_mpio_fapl_t *fa = NULL;
void *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpio_fapl_get, NULL)
FUNC_ENTER_NOAPI_NOINIT
HDassert(file);
HDassert(H5FD_MPIO == file->pub.driver_id);
@ -801,7 +801,7 @@ H5FD_mpio_fapl_copy(const void *_old_fa)
const H5FD_mpio_fapl_t *old_fa = (const H5FD_mpio_fapl_t*)_old_fa;
H5FD_mpio_fapl_t *new_fa = NULL;
FUNC_ENTER_NOAPI(H5FD_mpio_fapl_copy, NULL)
FUNC_ENTER_NOAPI_NOINIT
#ifdef H5FDmpio_DEBUG
if (H5FD_mpio_Debug[(int)'t'])
fprintf(stderr, "enter H5FD_mpio_fapl_copy\n");
@ -855,7 +855,7 @@ H5FD_mpio_fapl_free(void *_fa)
herr_t ret_value = SUCCEED;
H5FD_mpio_fapl_t *fa = (H5FD_mpio_fapl_t*)_fa;
FUNC_ENTER_NOAPI(H5FD_mpio_fapl_free, FAIL)
FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef H5FDmpio_DEBUG
if (H5FD_mpio_Debug[(int)'t'])
fprintf(stderr, "in H5FD_mpio_fapl_free\n");
@ -867,7 +867,6 @@ fprintf(stderr, "in H5FD_mpio_fapl_free\n");
H5FD_mpi_comm_info_free(&fa->comm, &fa->info);
H5MM_xfree(fa);
done:
#ifdef H5FDmpio_DEBUG
if (H5FD_mpio_Debug[(int)'t'])
fprintf(stderr, "leaving H5FD_mpio_fapl_free\n");
@ -943,7 +942,7 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id,
h5_stat_t stat_buf;
#endif
FUNC_ENTER_NOAPI(H5FD_mpio_open, NULL)
FUNC_ENTER_NOAPI_NOINIT
#ifdef H5FDmpio_DEBUG
if (H5FD_mpio_Debug[(int)'t']) {
@ -1103,7 +1102,7 @@ H5FD_mpio_close(H5FD_t *_file)
int mpi_code; /* MPI return code */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpio_close, FAIL)
FUNC_ENTER_NOAPI_NOINIT
#ifdef H5FDmpio_DEBUG
if (H5FD_mpio_Debug[(int)'t'])
@ -1156,9 +1155,7 @@ done:
static herr_t
H5FD_mpio_query(const H5FD_t UNUSED *_file, unsigned long *flags /* out */)
{
herr_t ret_value=SUCCEED;
FUNC_ENTER_NOAPI(H5FD_mpio_query, FAIL)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set the VFL feature flags that this driver supports */
if(flags) {
@ -1169,8 +1166,7 @@ H5FD_mpio_query(const H5FD_t UNUSED *_file, unsigned long *flags /* out */)
*flags|=H5FD_FEAT_ALLOCATE_EARLY; /* Allocate space early instead of late */
} /* end if */
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(SUCCEED)
}
@ -1199,18 +1195,13 @@ static haddr_t
H5FD_mpio_get_eoa(const H5FD_t *_file, H5FD_mem_t UNUSED type)
{
const H5FD_mpio_t *file = (const H5FD_mpio_t*)_file;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpio_get_eoa, HADDR_UNDEF)
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIO==file->pub.driver_id);
/* Set return value */
ret_value=file->eoa;
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(file->eoa)
}
@ -1239,17 +1230,15 @@ static herr_t
H5FD_mpio_set_eoa(H5FD_t *_file, H5FD_mem_t UNUSED type, haddr_t addr)
{
H5FD_mpio_t *file = (H5FD_mpio_t*)_file;
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpio_set_eoa, FAIL)
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIO==file->pub.driver_id);
file->eoa = addr;
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(SUCCEED)
}
@ -1286,18 +1275,13 @@ static haddr_t
H5FD_mpio_get_eof(const H5FD_t *_file)
{
const H5FD_mpio_t *file = (const H5FD_mpio_t*)_file;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpio_get_eof, HADDR_UNDEF)
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIO==file->pub.driver_id);
/* Set return value */
ret_value=file->eof;
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(file->eof)
}
@ -1321,7 +1305,7 @@ H5FD_mpio_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void** file_handle)
H5FD_mpio_t *file = (H5FD_mpio_t *)_file;
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5FD_mpio_get_handle, FAIL)
FUNC_ENTER_NOAPI_NOINIT
if(!file_handle)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
@ -1419,7 +1403,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add
hbool_t use_view_this_time = FALSE;
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5FD_mpio_read, FAIL)
FUNC_ENTER_NOAPI_NOINIT
#ifdef H5FDmpio_DEBUG
if (H5FD_mpio_Debug[(int)'t'])
@ -1703,7 +1687,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
H5P_genplist_t *plist = NULL; /* Property list pointer */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5FD_mpio_write, FAIL)
FUNC_ENTER_NOAPI_NOINIT
#ifdef H5FDmpio_DEBUG
if (H5FD_mpio_Debug[(int)'t'])
@ -1878,7 +1862,7 @@ H5FD_mpio_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned closing)
int mpi_code; /* mpi return code */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5FD_mpio_flush, FAIL)
FUNC_ENTER_NOAPI_NOINIT
#ifdef H5FDmpio_DEBUG
if(H5FD_mpio_Debug[(int)'t'])
@ -1922,7 +1906,7 @@ H5FD_mpio_truncate(H5FD_t *_file, hid_t UNUSED dxpl_id, hbool_t UNUSED closing)
H5FD_mpio_t *file = (H5FD_mpio_t*)_file;
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5FD_mpio_truncate, FAIL)
FUNC_ENTER_NOAPI_NOINIT
#ifdef H5FDmpio_DEBUG
if(H5FD_mpio_Debug[(int)'t'])
@ -2012,18 +1996,13 @@ static int
H5FD_mpio_mpi_rank(const H5FD_t *_file)
{
const H5FD_mpio_t *file = (const H5FD_mpio_t*)_file;
int ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpio_mpi_rank, FAIL)
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIO==file->pub.driver_id);
/* Set return value */
ret_value=file->mpi_rank;
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(file->mpi_rank)
} /* end H5FD_mpio_mpi_rank() */
@ -2046,18 +2025,13 @@ static int
H5FD_mpio_mpi_size(const H5FD_t *_file)
{
const H5FD_mpio_t *file = (const H5FD_mpio_t*)_file;
int ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpio_mpi_size, FAIL)
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIO==file->pub.driver_id);
/* Set return value */
ret_value=file->mpi_size;
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(file->mpi_size)
} /* end H5FD_mpio_mpi_size() */
@ -2081,18 +2055,14 @@ static MPI_Comm
H5FD_mpio_communicator(const H5FD_t *_file)
{
const H5FD_mpio_t *file = (const H5FD_mpio_t*)_file;
MPI_Comm ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpio_communicator, MPI_COMM_NULL)
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIO==file->pub.driver_id);
/* Set return value */
ret_value=file->comm;
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(file->comm)
}
#endif /* H5_HAVE_PARALLEL */

93
src/H5FDmpiposix.c
View File

@ -260,7 +260,7 @@ DESCRIPTION
static herr_t
H5FD_mpiposix_init_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpiposix_init_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5FD_mpiposix_init())
} /* H5FD_mpiposix_init_interface() */
@ -288,7 +288,7 @@ H5FD_mpiposix_init(void)
{
hid_t ret_value=H5FD_MPIPOSIX_g; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpiposix_init, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if (H5I_VFL!=H5Iget_type(H5FD_MPIPOSIX_g))
H5FD_MPIPOSIX_g = H5FD_register((const H5FD_class_t *)&H5FD_mpiposix_g,sizeof(H5FD_class_mpi_t),FALSE);
@ -316,7 +316,7 @@ done:
static herr_t
H5FD_mpiposix_term(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpiposix_term)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Reset VFL ID */
H5FD_MPIPOSIX_g=0;
@ -366,7 +366,7 @@ H5Pset_fapl_mpiposix(hid_t fapl_id, MPI_Comm comm, hbool_t use_gpfs)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
FUNC_ENTER_API(H5Pset_fapl_mpiposix, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "iMcb", fapl_id, comm, use_gpfs);
/* Check arguments */
@ -425,7 +425,7 @@ H5Pget_fapl_mpiposix(hid_t fapl_id, MPI_Comm *comm/*out*/, hbool_t *use_gpfs/*ou
int mpi_code; /* mpi return code */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_API(H5Pget_fapl_mpiposix, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ixx", fapl_id, comm, use_gpfs);
if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
@ -478,7 +478,7 @@ H5FD_mpiposix_fapl_get(H5FD_t *_file)
int mpi_code; /* MPI return code */
void *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpiposix_fapl_get, NULL)
FUNC_ENTER_NOAPI_NOINIT
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
@ -524,7 +524,7 @@ H5FD_mpiposix_fapl_copy(const void *_old_fa)
H5FD_mpiposix_fapl_t *new_fa = NULL;
int mpi_code; /* MPI return code */
FUNC_ENTER_NOAPI(H5FD_mpiposix_fapl_copy, NULL)
FUNC_ENTER_NOAPI_NOINIT
if (NULL==(new_fa=H5MM_malloc(sizeof(H5FD_mpiposix_fapl_t))))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
@ -569,10 +569,10 @@ done:
static herr_t
H5FD_mpiposix_fapl_free(void *_fa)
{
herr_t ret_value = SUCCEED;
H5FD_mpiposix_fapl_t *fa = (H5FD_mpiposix_fapl_t*)_fa;
FUNC_ENTER_NOAPI(H5FD_mpiposix_fapl_free, FAIL)
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(fa);
/* Free the internal communicator */
@ -580,8 +580,7 @@ H5FD_mpiposix_fapl_free(void *_fa)
MPI_Comm_free(&fa->comm);
H5MM_xfree(fa);
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD_mpiposix_fapl_free() */
@ -630,7 +629,7 @@ H5FD_mpiposix_open(const char *name, unsigned flags, hid_t fapl_id,
H5FD_t *ret_value=NULL; /* Return value */
MPI_Comm comm_dup=MPI_COMM_NULL;
FUNC_ENTER_NOAPI(H5FD_mpiposix_open, NULL)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if (!name || !*name)
@ -824,7 +823,7 @@ H5FD_mpiposix_close(H5FD_t *_file)
H5FD_mpiposix_t *file = (H5FD_mpiposix_t*)_file;
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpiposix_close, FAIL)
FUNC_ENTER_NOAPI_NOINIT
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
@ -868,7 +867,7 @@ H5FD_mpiposix_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
const H5FD_mpiposix_t *f2 = (const H5FD_mpiposix_t*)_f2;
int ret_value=0;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpiposix_cmp)
FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef H5_HAVE_WIN32_API
if (f1->fileindexhi < f2->fileindexhi) HGOTO_DONE(-1)
@ -924,9 +923,7 @@ done:
static herr_t
H5FD_mpiposix_query(const H5FD_t UNUSED *_file, unsigned long *flags /* out */)
{
herr_t ret_value=SUCCEED;
FUNC_ENTER_NOAPI(H5FD_mpiposix_query, FAIL)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set the VFL feature flags that this driver supports */
if(flags) {
@ -937,8 +934,7 @@ H5FD_mpiposix_query(const H5FD_t UNUSED *_file, unsigned long *flags /* out */)
*flags|=H5FD_FEAT_ALLOCATE_EARLY; /* Allocate space early instead of late */
} /* end if */
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD_mpiposix_query() */
@ -966,18 +962,13 @@ static haddr_t
H5FD_mpiposix_get_eoa(const H5FD_t *_file, H5FD_mem_t UNUSED type)
{
const H5FD_mpiposix_t *file = (const H5FD_mpiposix_t*)_file;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpiposix_get_eoa, HADDR_UNDEF)
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
/* Set return value */
ret_value=file->eoa;
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(file->eoa)
} /* end H5FD_mpiposix_get_eoa() */
@ -1005,17 +996,15 @@ static herr_t
H5FD_mpiposix_set_eoa(H5FD_t *_file, H5FD_mem_t UNUSED type, haddr_t addr)
{
H5FD_mpiposix_t *file = (H5FD_mpiposix_t*)_file;
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpiposix_set_eoa, FAIL)
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
file->eoa = addr;
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD_mpi_posix_set_eoa() */
@ -1045,18 +1034,13 @@ static haddr_t
H5FD_mpiposix_get_eof(const H5FD_t *_file)
{
const H5FD_mpiposix_t *file = (const H5FD_mpiposix_t*)_file;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpiposix_get_eof, HADDR_UNDEF)
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
/* Set return value */
ret_value=MAX(file->eof,file->eoa);
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(MAX(file->eof,file->eoa))
} /* end H5FD_mpiposix_get_eof() */
@ -1080,7 +1064,7 @@ H5FD_mpiposix_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void** file_handle)
H5FD_mpiposix_t *file = (H5FD_mpiposix_t *)_file;
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5FD_mpiposix_get_handle, FAIL)
FUNC_ENTER_NOAPI_NOINIT
if(!file_handle)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
@ -1122,7 +1106,7 @@ H5FD_mpiposix_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id,
ssize_t nbytes; /* Number of bytes read each I/O call */
herr_t ret_value=SUCCEED;
FUNC_ENTER_NOAPI(H5FD_mpiposix_read, FAIL)
FUNC_ENTER_NOAPI_NOINIT
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
@ -1224,7 +1208,7 @@ H5FD_mpiposix_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpiposix_write, FAIL)
FUNC_ENTER_NOAPI_NOINIT
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
@ -1397,7 +1381,7 @@ H5FD_mpiposix_truncate(H5FD_t *_file, hid_t UNUSED dxpl_id, hbool_t UNUSED closi
int mpi_code; /* MPI return code */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5FD_mpiposix_truncate, FAIL)
FUNC_ENTER_NOAPI_NOINIT
HDassert(file);
HDassert(H5FD_MPIPOSIX == file->pub.driver_id);
@ -1464,18 +1448,13 @@ static int
H5FD_mpiposix_mpi_rank(const H5FD_t *_file)
{
const H5FD_mpiposix_t *file = (const H5FD_mpiposix_t*)_file;
int ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpiposix_mpi_rank, FAIL)
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
/* Set return value */
ret_value=file->mpi_rank;
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(file->mpi_rank)
} /* end H5FD_mpiposix_mpi_rank() */
@ -1498,18 +1477,13 @@ static int
H5FD_mpiposix_mpi_size(const H5FD_t *_file)
{
const H5FD_mpiposix_t *file = (const H5FD_mpiposix_t*)_file;
int ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpiposix_mpi_size, FAIL)
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
/* Set return value */
ret_value=file->mpi_size;
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(file->mpi_size)
} /* end H5FD_mpiposix_mpi_size() */
@ -1533,18 +1507,13 @@ static MPI_Comm
H5FD_mpiposix_communicator(const H5FD_t *_file)
{
const H5FD_mpiposix_t *file = (const H5FD_mpiposix_t*)_file;
MPI_Comm ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_mpiposix_communicator, MPI_COMM_NULL)
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
/* Set return value */
ret_value=file->comm;
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(file->comm)
} /* end H5FD_mpi_posix_communicator() */
#endif /*H5_HAVE_PARALLEL*/

30
src/H5FDsec2.c
View File

@ -214,7 +214,7 @@ DESCRIPTION
static herr_t
H5FD_sec2_init_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_init_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5FD_sec2_init())
} /* H5FD_sec2_init_interface() */
@ -239,7 +239,7 @@ H5FD_sec2_init(void)
{
hid_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_sec2_init, FAIL)
FUNC_ENTER_NOAPI(FAIL)
if(H5I_VFL != H5I_get_type(H5FD_SEC2_g))
H5FD_SEC2_g = H5FD_register(&H5FD_sec2_g, sizeof(H5FD_class_t), FALSE);
@ -267,7 +267,7 @@ done:
static herr_t
H5FD_sec2_term(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_term)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Reset VFL ID */
H5FD_SEC2_g = 0;
@ -296,7 +296,7 @@ H5Pset_fapl_sec2(hid_t fapl_id)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
FUNC_ENTER_API(H5Pset_fapl_sec2, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", fapl_id);
if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
@ -336,7 +336,7 @@ H5FD_sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
h5_stat_t sb;
H5FD_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FD_sec2_open)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check on file offsets */
HDcompile_assert(sizeof(HDoff_t) >= sizeof(size_t));
@ -453,7 +453,7 @@ H5FD_sec2_close(H5FD_t *_file)
H5FD_sec2_t *file = (H5FD_sec2_t *)_file;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FD_sec2_close)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(file);
@ -492,7 +492,7 @@ H5FD_sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
const H5FD_sec2_t *f2 = (const H5FD_sec2_t *)_f2;
int ret_value = 0;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_cmp)
FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef H5_HAVE_WIN32_API
if(f1->dwVolumeSerialNumber < f2->dwVolumeSerialNumber) HGOTO_DONE(-1)
@ -548,7 +548,7 @@ H5FD_sec2_query(const H5FD_t *_file, unsigned long *flags /* out */)
{
const H5FD_sec2_t *file = (const H5FD_sec2_t *)_file; /* sec2 VFD info */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_query)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set the VFL feature flags that this driver supports */
if(flags) {
@ -589,7 +589,7 @@ H5FD_sec2_get_eoa(const H5FD_t *_file, H5FD_mem_t UNUSED type)
{
const H5FD_sec2_t *file = (const H5FD_sec2_t *)_file;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_get_eoa)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(file->eoa)
} /* end H5FD_sec2_get_eoa() */
@ -616,7 +616,7 @@ H5FD_sec2_set_eoa(H5FD_t *_file, H5FD_mem_t UNUSED type, haddr_t addr)
{
H5FD_sec2_t *file = (H5FD_sec2_t *)_file;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_set_eoa)
FUNC_ENTER_NOAPI_NOINIT_NOERR
file->eoa = addr;
@ -646,7 +646,7 @@ H5FD_sec2_get_eof(const H5FD_t *_file)
{
const H5FD_sec2_t *file = (const H5FD_sec2_t *)_file;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_get_eof)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(MAX(file->eof, file->eoa))
} /* end H5FD_sec2_get_eof() */
@ -671,7 +671,7 @@ H5FD_sec2_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void **file_handle)
H5FD_sec2_t *file = (H5FD_sec2_t *)_file;
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5FD_sec2_get_handle)
FUNC_ENTER_NOAPI_NOINIT
if(!file_handle)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
@ -707,7 +707,7 @@ H5FD_sec2_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id,
H5FD_sec2_t *file = (H5FD_sec2_t *)_file;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FD_sec2_read)
FUNC_ENTER_NOAPI_NOINIT
HDassert(file && file->pub.cls);
HDassert(buf);
@ -807,7 +807,7 @@ H5FD_sec2_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id,
H5FD_sec2_t *file = (H5FD_sec2_t *)_file;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FD_sec2_write)
FUNC_ENTER_NOAPI_NOINIT
HDassert(file && file->pub.cls);
HDassert(buf);
@ -900,7 +900,7 @@ H5FD_sec2_truncate(H5FD_t *_file, hid_t UNUSED dxpl_id, hbool_t UNUSED closing)
H5FD_sec2_t *file = (H5FD_sec2_t *)_file;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FD_sec2_truncate)
FUNC_ENTER_NOAPI_NOINIT
HDassert(file);

14
src/H5FDspace.c
View File

@ -102,7 +102,7 @@ DESCRIPTION
static herr_t
H5FD_space_init_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_space_init_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5FD_init())
} /* H5FD_space_init_interface() */
@ -131,7 +131,7 @@ H5FD_extend(H5FD_t *file, H5FD_mem_t type, hbool_t new_block, hsize_t size, hadd
hsize_t extra; /* Extra space to allocate, to align request */
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FD_extend)
FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(file);
@ -199,7 +199,7 @@ H5FD_alloc_real(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, hsize_t size, hadd
{
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_alloc_real, HADDR_UNDEF)
FUNC_ENTER_NOAPI(HADDR_UNDEF)
#ifdef H5FD_ALLOC_DEBUG
HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
#endif /* H5FD_ALLOC_DEBUG */
@ -255,7 +255,7 @@ H5FD_alloc(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, H5F_t *f, hsize_t size,
{
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FD_alloc, HADDR_UNDEF)
FUNC_ENTER_NOAPI(HADDR_UNDEF)
/* check args */
HDassert(file);
@ -295,7 +295,7 @@ H5FD_free_real(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr, hsize
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FD_free_real)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(file);
@ -380,7 +380,7 @@ H5FD_free(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, H5F_t *f, haddr_t addr,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FD_free, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(file);
@ -426,7 +426,7 @@ H5FD_try_extend(H5FD_t *file, H5FD_mem_t type, H5F_t *f, haddr_t blk_end,
haddr_t eoa; /* End of allocated space in file */
htri_t ret_value = FALSE; /* Return value */
FUNC_ENTER_NOAPI(H5FD_try_extend, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(file);

90
src/H5FL.c
View File

@ -164,13 +164,11 @@ DESCRIPTION
static herr_t
H5FL_init_interface(void)
{
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_init_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Nothing currently... */
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5FL_init_interface() */
@ -195,7 +193,7 @@ H5FL_malloc(size_t mem_size)
{
void *ret_value; /* return value*/
FUNC_ENTER_NOAPI(H5FL_malloc, NULL)
FUNC_ENTER_NOAPI_NOINIT
/* Attempt to allocate the memory requested */
if(NULL==(ret_value=H5MM_malloc(mem_size))) {
@ -235,7 +233,7 @@ H5FL_reg_init(H5FL_reg_head_t *head)
H5FL_reg_gc_node_t *new_node; /* Pointer to the node for the new list to garbage collect */
herr_t ret_value=SUCCEED; /* return value*/
FUNC_ENTER_NOAPI_NOINIT(H5FL_reg_init)
FUNC_ENTER_NOAPI_NOINIT
/* Allocate a new garbage collection node */
if(NULL == (new_node = (H5FL_reg_gc_node_t *)H5MM_malloc(sizeof(H5FL_reg_gc_node_t))))
@ -287,7 +285,7 @@ H5FL_reg_free(H5FL_reg_head_t *head, void *obj)
/* NOINIT OK here because this must be called after H5FL_reg_malloc/calloc
* -NAF */
FUNC_ENTER_NOAPI_NOINIT(H5FL_reg_free)
FUNC_ENTER_NOAPI_NOINIT
/* Double check parameters */
HDassert(head);
@ -372,7 +370,7 @@ H5FL_reg_malloc(H5FL_reg_head_t *head H5FL_TRACK_PARAMS)
{
void *ret_value; /* Pointer to object to return */
FUNC_ENTER_NOAPI(H5FL_reg_malloc, NULL)
FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@ -449,7 +447,7 @@ H5FL_reg_calloc(H5FL_reg_head_t *head H5FL_TRACK_PARAMS)
{
void *ret_value; /* Pointer to object to return */
FUNC_ENTER_NOAPI(H5FL_reg_calloc, NULL)
FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@ -489,7 +487,7 @@ H5FL_reg_gc_list(H5FL_reg_head_t *head)
void *tmp; /* Temporary node pointer */
size_t total_mem; /* Total memory used on list */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_reg_gc_list)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Calculate the total memory used on this list */
total_mem=head->onlist*head->size;
@ -541,7 +539,7 @@ H5FL_reg_gc(void)
H5FL_reg_gc_node_t *gc_node; /* Pointer into the list of things to garbage collect */
herr_t ret_value=SUCCEED; /* return value*/
FUNC_ENTER_NOAPI_NOINIT(H5FL_reg_gc)
FUNC_ENTER_NOAPI_NOINIT
/* Walk through all the free lists, free()'ing the nodes */
gc_node=H5FL_reg_gc_head.first;
@ -593,7 +591,7 @@ H5FL_reg_term(void)
H5FL_reg_gc_node_t *left; /* pointer to garbage collection lists with work left */
H5FL_reg_gc_node_t *tmp; /* Temporary pointer to a garbage collection node */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_reg_term)
FUNC_ENTER_NOAPI_NOINIT_NOERR
if (H5_interface_initialize_g) {
/* Free the nodes on the garbage collection list, keeping nodes with allocations outstanding */
@ -658,7 +656,7 @@ H5FL_blk_find_list(H5FL_blk_node_t **head, size_t size)
{
H5FL_blk_node_t *temp; /* Temp. pointer to node in the native list */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_blk_find_list)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Find the correct free list */
temp=*head;
@ -720,7 +718,7 @@ H5FL_blk_create_list(H5FL_blk_node_t **head, size_t size)
H5FL_blk_node_t *temp; /* Temp. pointer to node in the list */
H5FL_blk_node_t *ret_value;
FUNC_ENTER_NOAPI_NOINIT(H5FL_blk_create_list)
FUNC_ENTER_NOAPI_NOINIT
/* Allocate room for the new free list node */
if(NULL==(temp=H5FL_MALLOC(H5FL_blk_node_t)))
@ -771,7 +769,7 @@ H5FL_blk_init(H5FL_blk_head_t *head)
H5FL_blk_gc_node_t *new_node; /* Pointer to the node for the new list to garbage collect */
herr_t ret_value=SUCCEED; /* return value*/
FUNC_ENTER_NOAPI_NOINIT(H5FL_blk_init)
FUNC_ENTER_NOAPI_NOINIT
/* Allocate a new garbage collection node */
if(NULL == (new_node = (H5FL_blk_gc_node_t *)H5MM_malloc(sizeof(H5FL_blk_gc_node_t))))
@ -814,7 +812,7 @@ H5FL_blk_free_block_avail(H5FL_blk_head_t *head, size_t size)
H5FL_blk_node_t *free_list; /* The free list of nodes of correct size */
htri_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FL_blk_free_block_avail, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Double check parameters */
HDassert(head);
@ -855,7 +853,7 @@ H5FL_blk_malloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS)
H5FL_blk_list_t *temp; /* Temp. ptr to the new native list allocated */
void *ret_value; /* Pointer to the block to return to the user */
FUNC_ENTER_NOAPI(H5FL_blk_malloc, NULL)
FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@ -945,7 +943,7 @@ H5FL_blk_calloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS)
{
void *ret_value; /* Pointer to the block to return to the user */
FUNC_ENTER_NOAPI(H5FL_blk_calloc, NULL)
FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@ -991,7 +989,7 @@ H5FL_blk_free(H5FL_blk_head_t *head, void *block)
/* NOINIT OK here because this must be called after H5FL_blk_malloc/calloc
* -NAF */
FUNC_ENTER_NOAPI_NOINIT(H5FL_blk_free)
FUNC_ENTER_NOAPI_NOINIT
/* Double check parameters */
HDassert(head);
@ -1089,7 +1087,7 @@ H5FL_blk_realloc(H5FL_blk_head_t *head, void *block, size_t new_size H5FL_TRACK_
{
void *ret_value=NULL; /* Return value */
FUNC_ENTER_NOAPI(H5FL_blk_realloc, NULL)
FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@ -1163,7 +1161,7 @@ H5FL_blk_gc_list(H5FL_blk_head_t *head)
void *next; /* Temp. ptr to the free list list node */
void *temp; /* Temp. ptr to the free list page node */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_blk_gc_list)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Loop through all the nodes in the block free list queue */
while(head->head!=NULL) {
@ -1226,7 +1224,7 @@ H5FL_blk_gc(void)
H5FL_blk_gc_node_t *gc_node; /* Pointer into the list of things to garbage collect */
herr_t ret_value=SUCCEED; /* return value*/
FUNC_ENTER_NOAPI_NOINIT(H5FL_blk_gc)
FUNC_ENTER_NOAPI_NOINIT
/* Walk through all the free lists, free()'ing the nodes */
gc_node=H5FL_blk_gc_head.first;
@ -1272,7 +1270,7 @@ H5FL_blk_term(void)
H5FL_blk_gc_node_t *left; /* pointer to garbage collection lists with work left */
H5FL_blk_gc_node_t *tmp; /* Temporary pointer to a garbage collection node */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_blk_term)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Free the nodes on the garbage collection list, keeping nodes with allocations outstanding */
left=NULL;
@ -1331,7 +1329,7 @@ H5FL_arr_init(H5FL_arr_head_t *head)
size_t u; /* Local index variable */
herr_t ret_value=SUCCEED; /* return value*/
FUNC_ENTER_NOAPI_NOINIT(H5FL_arr_init)
FUNC_ENTER_NOAPI_NOINIT
/* Allocate a new garbage collection node */
if(NULL == (new_node = (H5FL_gc_arr_node_t *)H5MM_malloc(sizeof(H5FL_gc_arr_node_t))))
@ -1385,7 +1383,7 @@ H5FL_arr_free(H5FL_arr_head_t *head, void *obj)
/* NOINIT OK here because this must be called after H5FL_arr_malloc/calloc
* -NAF */
FUNC_ENTER_NOAPI_NOINIT(H5FL_arr_free)
FUNC_ENTER_NOAPI_NOINIT
/* The H5MM_xfree code allows obj to null */
if (!obj)
@ -1460,7 +1458,7 @@ H5FL_arr_malloc(H5FL_arr_head_t *head, size_t elem)
void *ret_value; /* Pointer to object to return */
size_t mem_size; /* Size of memory block being recycled */
FUNC_ENTER_NOAPI(H5FL_arr_malloc, NULL)
FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@ -1533,7 +1531,7 @@ H5FL_arr_calloc(H5FL_arr_head_t *head, size_t elem)
{
void *ret_value; /* Pointer to object to return */
FUNC_ENTER_NOAPI(H5FL_arr_calloc, NULL)
FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@ -1571,7 +1569,7 @@ H5FL_arr_realloc(H5FL_arr_head_t *head, void * obj, size_t new_elem)
{
void *ret_value; /* Pointer to object to return */
FUNC_ENTER_NOAPI(H5FL_arr_realloc, NULL)
FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@ -1635,7 +1633,7 @@ H5FL_arr_gc_list(H5FL_arr_head_t *head)
unsigned u; /* Counter for array of free lists */
size_t total_mem; /* Total memory used on list */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_arr_gc_list)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Walk through the array of free lists */
for(u=0; u<(unsigned)head->maxelem; u++) {
@ -1695,7 +1693,7 @@ H5FL_arr_gc(void)
H5FL_gc_arr_node_t *gc_arr_node; /* Pointer into the list of things to garbage collect */
herr_t ret_value=SUCCEED; /* return value*/
FUNC_ENTER_NOAPI_NOINIT(H5FL_arr_gc)
FUNC_ENTER_NOAPI_NOINIT
/* Walk through all the free lists, free()'ing the nodes */
gc_arr_node=H5FL_arr_gc_head.first;
@ -1741,7 +1739,7 @@ H5FL_arr_term(void)
H5FL_gc_arr_node_t *left; /* pointer to garbage collection lists with work left */
H5FL_gc_arr_node_t *tmp; /* Temporary pointer to a garbage collection node */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_arr_term)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Free the nodes on the garbage collection list, keeping nodes with allocations outstanding */
left=NULL;
@ -1799,7 +1797,7 @@ H5FL_seq_free(H5FL_seq_head_t *head, void *obj)
{
/* NOINIT OK here because this must be called after H5FL_seq_malloc/calloc
* -NAF */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_seq_free)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Double check parameters */
HDassert(head);
@ -1835,7 +1833,7 @@ H5FL_seq_malloc(H5FL_seq_head_t *head, size_t elem H5FL_TRACK_PARAMS)
{
void *ret_value; /* Pointer to object to return */
FUNC_ENTER_NOAPI(H5FL_seq_malloc, NULL)
FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@ -1869,7 +1867,7 @@ H5FL_seq_calloc(H5FL_seq_head_t *head, size_t elem H5FL_TRACK_PARAMS)
{
void *ret_value; /* Pointer to object to return */
FUNC_ENTER_NOAPI(H5FL_seq_calloc, NULL)
FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@ -1903,7 +1901,7 @@ H5FL_seq_realloc(H5FL_seq_head_t *head, void * obj, size_t new_elem H5FL_TRACK_P
{
void *ret_value; /* Pointer to object to return */
FUNC_ENTER_NOAPI(H5FL_seq_realloc, NULL)
FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@ -1942,7 +1940,7 @@ H5FL_fac_init(size_t size)
H5FL_fac_head_t *factory = NULL; /* Pointer to new block factory */
H5FL_fac_head_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5FL_fac_init, NULL)
FUNC_ENTER_NOAPI(NULL)
/* Sanity check */
HDassert(size > 0);
@ -2018,7 +2016,7 @@ H5FL_fac_free(H5FL_fac_head_t *head, void *obj)
void *ret_value=NULL; /* Return value */
/* NOINIT OK here because this must be called after H5FL_fac_init -NAF */
FUNC_ENTER_NOAPI_NOINIT(H5FL_fac_free)
FUNC_ENTER_NOAPI_NOINIT
/* Double check parameters */
HDassert(head);
@ -2107,7 +2105,7 @@ H5FL_fac_malloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS)
void *ret_value; /* Pointer to object to return */
/* NOINIT OK here because this must be called after H5FL_fac_init -NAF */
FUNC_ENTER_NOAPI_NOINIT(H5FL_fac_malloc)
FUNC_ENTER_NOAPI_NOINIT
/* Double check parameters */
HDassert(head);
@ -2184,7 +2182,7 @@ H5FL_fac_calloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS)
void *ret_value; /* Pointer to object to return */
/* NOINIT OK here because this must be called after H5FL_fac_init -NAF */
FUNC_ENTER_NOAPI_NOINIT(H5FL_fac_calloc)
FUNC_ENTER_NOAPI_NOINIT
/* Double check parameters */
HDassert(head);
@ -2223,7 +2221,7 @@ H5FL_fac_gc_list(H5FL_fac_head_t *head)
void *tmp; /* Temporary node pointer */
size_t total_mem; /* Total memory used on list */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_fac_gc_list)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Calculate the total memory used on this list */
total_mem=head->onlist*head->size;
@ -2273,7 +2271,7 @@ H5FL_fac_gc(void)
H5FL_fac_gc_node_t *gc_node; /* Pointer into the list of things to garbage collect */
herr_t ret_value=SUCCEED; /* return value*/
FUNC_ENTER_NOAPI_NOINIT(H5FL_fac_gc)
FUNC_ENTER_NOAPI_NOINIT
/* Walk through all the free lists, free()'ing the nodes */
gc_node=H5FL_fac_gc_head.first;
@ -2319,7 +2317,7 @@ H5FL_fac_term(H5FL_fac_head_t *factory)
herr_t ret_value = SUCCEED; /* Return value */
/* NOINIT OK here because this must be called after H5FL_fac_init -NAF */
FUNC_ENTER_NOAPI_NOINIT(H5FL_fac_term)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(factory);
@ -2379,7 +2377,7 @@ H5FL_fac_term_all(void)
{
H5FL_fac_gc_node_t *tmp; /* Temporary pointer to a garbage collection node */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_fac_term_all)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Free the nodes on the garbage collection list */
while(H5FL_fac_gc_head.first != NULL) {
@ -2425,7 +2423,7 @@ H5FL_garbage_coll(void)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5FL_garbage_coll, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Garbage collect the free lists for array objects */
if(H5FL_arr_gc()<0)
@ -2486,7 +2484,7 @@ H5FL_set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_l
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5FL_set_free_list_limits, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Set the limit variables */
/* limit on all regular free lists */
@ -2535,7 +2533,7 @@ H5FL_term_interface(void)
{
int ret_value=0;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_term_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Garbage collect any nodes on the free lists */
(void)H5FL_garbage_coll();

24
src/H5FO.c
View File

@ -75,7 +75,7 @@ H5FO_create(const H5F_t *f)
{
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FO_create,FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
assert(f);
@ -116,7 +116,7 @@ H5FO_opened(const H5F_t *f, haddr_t addr)
H5FO_open_obj_t *open_obj; /* Information about open object */
void *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOFUNC(H5FO_opened)
FUNC_ENTER_NOAPI_NOERR
/* Sanity check */
HDassert(f);
@ -163,7 +163,7 @@ H5FO_insert(const H5F_t *f, haddr_t addr, void *obj, hbool_t delete_flag)
H5FO_open_obj_t *open_obj; /* Information about open object */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FO_insert,FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
assert(f);
@ -215,7 +215,7 @@ H5FO_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr)
H5FO_open_obj_t *open_obj; /* Information about open object */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FO_delete,FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@ -266,7 +266,7 @@ H5FO_mark(const H5F_t *f, haddr_t addr, hbool_t deleted)
H5FO_open_obj_t *open_obj; /* Information about open object */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOFUNC(H5FO_mark)
FUNC_ENTER_NOAPI_NOERR
/* Sanity check */
assert(f);
@ -310,7 +310,7 @@ H5FO_marked(const H5F_t *f, haddr_t addr)
H5FO_open_obj_t *open_obj; /* Information about open object */
hbool_t ret_value = FALSE; /* Return value */
FUNC_ENTER_NOAPI_NOFUNC(H5FO_marked)
FUNC_ENTER_NOAPI_NOERR
/* Sanity check */
HDassert(f);
@ -349,7 +349,7 @@ H5FO_dest(const H5F_t *f)
{
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FO_dest,FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
assert(f);
@ -394,7 +394,7 @@ H5FO_top_create(H5F_t *f)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FO_top_create, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@ -433,7 +433,7 @@ H5FO_top_incr(const H5F_t *f, haddr_t addr)
H5FO_obj_count_t *obj_count; /* Ref. count for object */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FO_top_incr, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@ -488,7 +488,7 @@ H5FO_top_decr(const H5F_t *f, haddr_t addr)
H5FO_obj_count_t *obj_count; /* Ref. count for object */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FO_top_decr, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@ -542,7 +542,7 @@ H5FO_top_count(const H5F_t *f, haddr_t addr)
H5FO_obj_count_t *obj_count; /* Ref. count for object */
hsize_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FO_top_count)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@ -582,7 +582,7 @@ H5FO_top_dest(H5F_t *f)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FO_top_dest, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);

34
src/H5FS.c
View File

@ -109,7 +109,7 @@ H5FS_create(H5F_t *f, hid_t dxpl_id, haddr_t *fs_addr, const H5FS_create_t *fs_c
H5FS_t *fspace = NULL; /* New free space structure */
H5FS_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5FS_create, dxpl_id, H5AC__FREESPACE_TAG, NULL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, H5AC__FREESPACE_TAG, NULL)
#ifdef H5FS_DEBUG
HDfprintf(stderr, "%s: Creating free space manager, nclasses = %Zu\n", FUNC, nclasses);
#endif /* H5FS_DEBUG */
@ -198,7 +198,7 @@ H5FS_open(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr, size_t nclasses,
H5FS_hdr_cache_ud_t cache_udata; /* User-data for metadata cache callback */
H5FS_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5FS_open, dxpl_id, H5AC__FREESPACE_TAG, NULL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, H5AC__FREESPACE_TAG, NULL)
#ifdef H5FS_DEBUG
HDfprintf(stderr, "%s: Opening free space manager, fs_addr = %a, nclasses = %Zu\n", FUNC, fs_addr, nclasses);
#endif /* H5FS_DEBUG */
@ -267,7 +267,7 @@ H5FS_delete(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr)
H5FS_hdr_cache_ud_t cache_udata; /* User-data for metadata cache callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5FS_delete, dxpl_id, H5AC__FREESPACE_TAG, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, H5AC__FREESPACE_TAG, FAIL)
#ifdef H5FS_DEBUG
HDfprintf(stderr, "%s: Deleting free space manager, fs_addr = %a\n", FUNC, fs_addr);
#endif /* H5FS_DEBUG */
@ -358,7 +358,7 @@ H5FS_close(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5FS_close, dxpl_id, H5AC__FREESPACE_TAG, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, H5AC__FREESPACE_TAG, FAIL)
/* Check arguments. */
HDassert(f);
@ -522,7 +522,7 @@ H5FS_new(const H5F_t *f, size_t nclasses, const H5FS_section_class_t *classes[],
size_t u; /* Local index variable */
H5FS_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_new)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(nclasses == 0 || (nclasses > 0 && classes));
@ -597,7 +597,7 @@ done:
herr_t
H5FS_size(const H5F_t *f, const H5FS_t *fspace, hsize_t *meta_size)
{
FUNC_ENTER_NOAPI_NOFUNC(H5FS_size)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@ -631,7 +631,7 @@ H5FS_incr(H5FS_t *fspace)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FS_incr, FAIL)
FUNC_ENTER_NOAPI(FAIL)
#ifdef H5FS_DEBUG
HDfprintf(stderr, "%s: Entering, fpace->addr = %a, fspace->rc = %u\n", FUNC, fspace->addr, fspace->rc);
#endif /* H5FS_DEBUG */
@ -672,7 +672,7 @@ H5FS_decr(H5FS_t *fspace)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FS_decr, FAIL)
FUNC_ENTER_NOAPI(FAIL)
#ifdef H5FS_DEBUG
HDfprintf(stderr, "%s: Entering, fpace->addr = %a, fspace->rc = %u\n", FUNC, fspace->addr, fspace->rc);
#endif /* H5FS_DEBUG */
@ -720,7 +720,7 @@ H5FS_dirty(H5FS_t *fspace)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_dirty)
FUNC_ENTER_NOAPI_NOINIT
#ifdef QAK
HDfprintf(stderr, "%s: Marking free space header as dirty\n", FUNC);
#endif /* QAK */
@ -755,7 +755,7 @@ H5FS_alloc_hdr(H5F_t *f, H5FS_t *fspace, haddr_t *fs_addr, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5FS_alloc_hdr, dxpl_id, H5AC__FREESPACE_TAG, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, H5AC__FREESPACE_TAG, FAIL)
/* Check arguments. */
HDassert(f);
@ -795,7 +795,7 @@ H5FS_alloc_sect(H5F_t *f, H5FS_t *fspace, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5FS_alloc_sect, dxpl_id, H5AC__FREESPACE_TAG, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, H5AC__FREESPACE_TAG, FAIL)
/* Check arguments. */
HDassert(f);
@ -843,7 +843,7 @@ H5FS_free(H5F_t *f, H5FS_t *fspace, hid_t dxpl_id)
unsigned cache_flags; /* Flags for unprotecting cache entries */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5FS_free, dxpl_id, H5AC__FREESPACE_TAG, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, H5AC__FREESPACE_TAG, FAIL)
/* Check arguments. */
HDassert(f);
@ -950,7 +950,7 @@ H5FS_hdr_dest(H5FS_t *fspace)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_hdr_dest)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -996,7 +996,7 @@ H5FS_sinfo_free_sect_cb(void *_sect, void UNUSED *key, void *op_data)
H5FS_section_info_t *sect = (H5FS_section_info_t *)_sect; /* Section to free */
const H5FS_sinfo_t *sinfo = (const H5FS_sinfo_t *)op_data; /* Free space manager for section */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_sinfo_free_sect_cb)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(sect);
HDassert(sinfo);
@ -1027,7 +1027,7 @@ H5FS_sinfo_free_node_cb(void *item, void UNUSED *key, void *op_data)
{
H5FS_node_t *fspace_node = (H5FS_node_t *)item; /* Temporary pointer to free space list node */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_sinfo_free_node_cb)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(fspace_node);
HDassert(op_data);
@ -1061,7 +1061,7 @@ H5FS_sinfo_dest(H5FS_sinfo_t *sinfo)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_sinfo_dest)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -1119,7 +1119,7 @@ done:
herr_t
H5FS_assert(const H5FS_t *fspace)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_assert)
FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifndef QAK
HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", "H5FS_assert", fspace->tot_sect_count);
#endif /* QAK */

24
src/H5FScache.c
View File

@ -160,7 +160,7 @@ H5FS_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
unsigned nclasses; /* Number of section classes */
H5FS_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_hdr_load)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@ -287,7 +287,7 @@ H5FS_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5F
uint8_t hdr_buf[H5FS_HDR_BUF_SIZE]; /* Buffer for header */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_hdr_flush)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@ -440,7 +440,7 @@ H5FS_cache_hdr_dest(H5F_t *f, H5FS_t *fspace)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_hdr_dest)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(fspace);
@ -489,7 +489,7 @@ H5FS_cache_hdr_clear(H5F_t *f, H5FS_t *fspace, hbool_t destroy)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_hdr_clear)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -526,7 +526,7 @@ done:
static herr_t
H5FS_cache_hdr_size(const H5F_t UNUSED *f, const H5FS_t *fspace, size_t *size_ptr)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_cache_hdr_size)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(f);
@ -567,7 +567,7 @@ H5FS_cache_sinfo_load(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, void *_udata
uint32_t computed_chksum; /* Computed metadata checksum value */
H5FS_sinfo_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_sinfo_load)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@ -724,7 +724,7 @@ H5FS_sinfo_serialize_sect_cb(void *_item, void UNUSED *key, void *_udata)
H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_sinfo_serialize_sect_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect);
@ -779,7 +779,7 @@ H5FS_sinfo_serialize_node_cb(void *_item, void UNUSED *key, void *_udata)
H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_sinfo_serialize_node_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace_node);
@ -823,7 +823,7 @@ H5FS_cache_sinfo_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_sinfo_flush)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@ -921,7 +921,7 @@ H5FS_cache_sinfo_dest(H5F_t *f, H5FS_sinfo_t *sinfo)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_sinfo_dest)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(sinfo);
@ -967,7 +967,7 @@ H5FS_cache_sinfo_clear(H5F_t *f, H5FS_sinfo_t *sinfo, hbool_t destroy)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_sinfo_clear)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -1004,7 +1004,7 @@ done:
static herr_t
H5FS_cache_sinfo_size(const H5F_t UNUSED *f, const H5FS_sinfo_t *sinfo, size_t *size_ptr)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_cache_sinfo_size)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(sinfo);

6
src/H5FSdbg.c
View File

@ -100,7 +100,7 @@ H5FS_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int
H5FS_hdr_cache_ud_t cache_udata; /* User-data for cache callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FS_debug, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -197,7 +197,7 @@ H5FS_sect_debug(const H5FS_t *fspace, const H5FS_section_info_t *sect, FILE *str
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FS_sect_debug, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -240,7 +240,7 @@ H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, FILE *stream, int
H5FS_hdr_cache_ud_t cache_udata; /* User-data for cache callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FS_sects_debug, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.

52
src/H5FSsection.c
View File

@ -129,7 +129,7 @@ H5FS_sinfo_new(H5F_t *f, H5FS_t *fspace)
H5FS_sinfo_t *sinfo = NULL; /* Section information struct created */
H5FS_sinfo_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_sinfo_new)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(f);
@ -209,7 +209,7 @@ H5FS_sinfo_lock(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5AC_protect_t accmode)
H5FS_sinfo_cache_ud_t cache_udata; /* User-data for cache callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_TAG(H5FS_sinfo_lock, dxpl_id, H5AC__FREESPACE_TAG, FAIL)
FUNC_ENTER_NOAPI_NOINIT_TAG(dxpl_id, H5AC__FREESPACE_TAG, FAIL)
#ifdef H5FS_SINFO_DEBUG
HDfprintf(stderr, "%s: Called, fspace->addr = %a, fspace->sinfo = %p, fspace->sect_addr = %a\n", FUNC, fspace->addr, fspace->sinfo, fspace->sect_addr);
@ -315,7 +315,7 @@ H5FS_sinfo_unlock(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, hbool_t modified)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_sinfo_unlock)
FUNC_ENTER_NOAPI_NOINIT
#ifdef H5FS_SINFO_DEBUG
HDfprintf(stderr, "%s: Called, modified = %t, fspace->addr = %a, fspace->sect_addr = %a\n", FUNC, modified, fspace->addr, fspace->sect_addr);
HDfprintf(stderr, "%s: fspace->sinfo_lock_count = %u, fspace->sinfo_modified = %t, fspace->sinfo_protected = %t\n", FUNC, fspace->sinfo_lock_count, fspace->sinfo_modified, fspace->sinfo_protected);
@ -474,7 +474,7 @@ HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
static herr_t
H5FS_sect_serialize_size(H5FS_t *fspace)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_sect_serialize_size)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(fspace);
@ -542,7 +542,7 @@ H5FS_sect_increase(H5FS_t *fspace, const H5FS_section_class_t *cls,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_increase)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@ -604,7 +604,7 @@ H5FS_sect_decrease(H5FS_t *fspace, const H5FS_section_class_t *cls)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_decrease)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@ -662,7 +662,7 @@ H5FS_size_node_decr(H5FS_sinfo_t *sinfo, unsigned bin, H5FS_node_t *fspace_node,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_size_node_decr)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sinfo);
@ -754,7 +754,7 @@ H5FS_sect_unlink_size(H5FS_sinfo_t *sinfo, const H5FS_section_class_t *cls,
unsigned bin; /* Bin to put the free space section in */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_unlink_size)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sinfo);
@ -808,7 +808,7 @@ H5FS_sect_unlink_rest(H5FS_t *fspace, const H5FS_section_class_t *cls,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_unlink_rest)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@ -862,7 +862,7 @@ H5FS_sect_remove_real(H5FS_t *fspace, H5FS_section_info_t *sect)
const H5FS_section_class_t *cls; /* Class of section */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_remove_real)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@ -905,7 +905,7 @@ H5FS_sect_remove(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
hbool_t sinfo_valid = FALSE; /* Whether the section info is valid */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_remove)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(f);
@ -952,7 +952,7 @@ H5FS_sect_link_size(H5FS_sinfo_t *sinfo, const H5FS_section_class_t *cls,
unsigned bin; /* Bin to put the free space section in */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_link_size)
FUNC_ENTER_NOAPI_NOINIT
#ifdef QAK
HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a\n", FUNC, sect->size, sect->addr);
#endif /* QAK */
@ -1059,7 +1059,7 @@ H5FS_sect_link_rest(H5FS_t *fspace, const H5FS_section_class_t *cls,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_link_rest)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@ -1110,7 +1110,7 @@ H5FS_sect_link(H5FS_t *fspace, H5FS_section_info_t *sect, unsigned flags)
const H5FS_section_class_t *cls; /* Class of section */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_link)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@ -1172,7 +1172,7 @@ H5FS_sect_merge(H5FS_t *fspace, H5FS_section_info_t **sect, void *op_data)
htri_t status; /* Status value */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_merge)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@ -1381,7 +1381,7 @@ H5FS_sect_add(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_section_info_t *sect
hbool_t sinfo_modified = FALSE; /* Whether the section info was modified */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5FS_sect_add, FAIL)
FUNC_ENTER_NOAPI(FAIL)
#ifdef H5FS_SINFO_DEBUG
HDfprintf(stderr, "%s: *sect = {%a, %Hu, %u, %s}\n", FUNC, sect->addr, sect->size, sect->type, (sect->state == H5FS_SECT_LIVE ? "H5FS_SECT_LIVE" : "H5FS_SECT_SERIALIZED"));
@ -1469,7 +1469,7 @@ H5FS_sect_try_extend(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, haddr_t addr,
hbool_t sinfo_modified = FALSE; /* Whether the section info was modified */
htri_t ret_value = FALSE; /* Return value */
FUNC_ENTER_NOAPI(H5FS_sect_try_extend, FAIL)
FUNC_ENTER_NOAPI(FAIL)
#ifdef H5FS_SINFO_DEBUG
HDfprintf(stderr, "%s: addr = %a, size = %Hu, extra_requested = %hu\n", FUNC, addr, size, extra_requested);
@ -1601,7 +1601,7 @@ H5FS_sect_try_merge(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_section_info_t
hsize_t saved_fs_size; /* copy the free-space section size */
htri_t ret_value = FALSE; /* Return value */
FUNC_ENTER_NOAPI(H5FS_sect_try_merge, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(f);
@ -1675,7 +1675,7 @@ H5FS_sect_find_node(H5FS_t *fspace, hsize_t request, H5FS_section_info_t **node)
const H5FS_section_class_t *cls; /* Class of section */
hsize_t alignment;
FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_find_node)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@ -1827,7 +1827,7 @@ H5FS_sect_find(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, hsize_t request,
hbool_t sinfo_modified = FALSE; /* Whether the section info was modified */
htri_t ret_value = FALSE; /* Return value */
FUNC_ENTER_NOAPI(H5FS_sect_find, FAIL)
FUNC_ENTER_NOAPI(FAIL)
#ifdef QAK
HDfprintf(stderr, "%s: request = %Hu\n", FUNC, request);
@ -1899,7 +1899,7 @@ H5FS_iterate_sect_cb(void *_item, void UNUSED *key, void *_udata)
H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_iterate_sect_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect_info);
@ -1937,7 +1937,7 @@ H5FS_iterate_node_cb(void *_item, void UNUSED *key, void *_udata)
H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_iterate_node_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace_node);
@ -1975,7 +1975,7 @@ H5FS_sect_iterate(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_operator_t op, v
hbool_t sinfo_valid = FALSE; /* Whether the section info is valid */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_iterate)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@ -2038,7 +2038,7 @@ done:
herr_t
H5FS_sect_stats(const H5FS_t *fspace, hsize_t *tot_space, hsize_t *nsects)
{
FUNC_ENTER_NOAPI_NOFUNC(H5FS_sect_stats)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(fspace);
@ -2078,7 +2078,7 @@ H5FS_sect_change_class(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
hbool_t sinfo_valid = FALSE; /* Whether the section info is valid */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_change_class)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@ -2243,7 +2243,7 @@ H5FS_sect_assert(const H5FS_t *fspace)
{
hsize_t separate_obj; /* The number of separate objects managed */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_sect_assert)
FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifndef QAK
HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", "H5FS_sect_assert", fspace->tot_sect_count);
#endif /* QAK */

3
src/H5FSstat.c
View File

@ -84,7 +84,7 @@
herr_t
H5FS_stat_info(const H5F_t *f, const H5FS_t *frsp, H5FS_stat_t *stats)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_stat_info)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(frsp);
@ -103,3 +103,4 @@ H5FS_stat_info(const H5F_t *f, const H5FS_t *frsp, H5FS_stat_t *stats)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5FS_stat_info() */

6
src/H5FStest.c
View File

@ -85,7 +85,7 @@
herr_t
H5FS_get_cparam_test(const H5FS_t *frsp, H5FS_create_t *cparam)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_get_cparam_test)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(frsp);
@ -100,6 +100,7 @@ H5FS_get_cparam_test(const H5FS_t *frsp, H5FS_create_t *cparam)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5FS_get_cparam_test() */
/*-------------------------------------------------------------------------
* Function: H5FS_cmp_cparam_test
*
@ -118,7 +119,7 @@ H5FS_cmp_cparam_test(const H5FS_create_t *cparam1, const H5FS_create_t *cparam2)
{
int ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_cmp_cparam_test)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(cparam1);
@ -152,3 +153,4 @@ H5FS_cmp_cparam_test(const H5FS_create_t *cparam1, const H5FS_create_t *cparam2)
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5FS_cmp_cparam_test */

12
src/H5Faccum.c
View File

@ -117,7 +117,7 @@ H5F_accum_read(const H5F_t *f, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_accum_read, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@ -278,7 +278,7 @@ H5F_accum_adjust(H5F_meta_accum_t *accum, H5FD_t *lf, hid_t dxpl_id,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_accum_adjust)
FUNC_ENTER_NOAPI_NOINIT
HDassert(accum);
HDassert(lf);
@ -417,7 +417,7 @@ H5F_accum_write(const H5F_t *f, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_accum_write, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@ -833,7 +833,7 @@ H5F_accum_free(H5F_t *f, hid_t dxpl_id, H5FD_mem_t UNUSED type, haddr_t addr,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_accum_free, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
@ -989,7 +989,7 @@ H5F_accum_flush(const H5F_t *f, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_accum_flush, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@ -1027,7 +1027,7 @@ H5F_accum_reset(const H5F_t *f, hid_t dxpl_id, hbool_t flush)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_accum_reset, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);

8
src/H5Fcwfs.c
View File

@ -109,7 +109,7 @@ H5F_cwfs_add(H5F_t *f, H5HG_heap_t *heap)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_cwfs_add, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
@ -167,7 +167,7 @@ H5F_cwfs_find_free_heap(H5F_t *f, hid_t dxpl_id, size_t need, haddr_t *addr)
hbool_t found = FALSE; /* Flag to indicate a heap with enough space was found */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_cwfs_find_free_heap, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
@ -261,7 +261,7 @@ H5F_cwfs_advance_heap(H5F_t *f, H5HG_heap_t *heap, hbool_t add_heap)
{
unsigned u; /* Local index variable */
FUNC_ENTER_NOAPI_NOFUNC(H5F_cwfs_advance_heap)
FUNC_ENTER_NOAPI_NOERR
/* Check args */
HDassert(f);
@ -303,7 +303,7 @@ H5F_cwfs_remove_heap(H5F_file_t *shared, H5HG_heap_t *heap)
{
unsigned u; /* Local index variable */
FUNC_ENTER_NOAPI_NOFUNC(H5F_cwfs_remove_heap)
FUNC_ENTER_NOAPI_NOERR
/* Check args */
HDassert(shared);

2
src/H5Fdbg.c
View File

@ -53,7 +53,7 @@ H5F_debug(H5F_t *f, FILE *stream, int indent, int fwidth)
hsize_t userblock_size; /* Userblock size */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_debug, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);

4
src/H5Fdeprec.c
View File

@ -98,7 +98,7 @@ DESCRIPTION
static herr_t
H5F_init_deprec_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_init_deprec_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5F_init())
} /* H5F_init_deprec_interface() */
@ -128,7 +128,7 @@ H5Fget_info1(hid_t obj_id, H5F_info1_t *finfo)
H5F_t *f; /* Top file in mount hierarchy */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Fget_info1, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*x", obj_id, finfo);
/* Check args */

20
src/H5Fefc.c
View File

@ -95,7 +95,7 @@ H5F_efc_create(unsigned max_nfiles)
H5F_efc_t *efc = NULL; /* EFC object */
H5F_efc_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5F_efc_create, NULL)
FUNC_ENTER_NOAPI(NULL)
/* Sanity checks */
HDassert(max_nfiles > 0);
@ -149,7 +149,7 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id,
hbool_t open_file = FALSE; /* Whether ent->file needs to be closed in case of error */
H5F_t *ret_value = NULL; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_efc_open)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(parent);
@ -338,7 +338,7 @@ H5F_efc_close(H5F_t *parent, H5F_t *file)
H5F_efc_ent_t *ent = NULL; /* Entry for target file in efc */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_efc_close)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(parent);
@ -396,7 +396,7 @@ done:
unsigned
H5F_efc_max_nfiles(H5F_efc_t *efc)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_efc_max_nfiles)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(efc);
HDassert(efc->max_nfiles > 0);
@ -427,7 +427,7 @@ H5F_efc_release(H5F_efc_t *efc)
H5F_efc_ent_t *prev_ent = NULL; /* Previous EFC entry */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_efc_release)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(efc);
@ -487,7 +487,7 @@ H5F_efc_destroy(H5F_efc_t *efc)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_efc_destroy)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(efc);
@ -538,7 +538,7 @@ H5F_efc_remove_ent(H5F_efc_t *efc, H5F_efc_ent_t *ent)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_efc_remove_ent)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(efc);
@ -605,7 +605,7 @@ H5F_efc_try_close_tag1(H5F_file_t *sf, H5F_file_t **tail)
H5F_efc_ent_t *ent = NULL; /* EFC entry */
H5F_file_t *esf; /* Convenience pointer to ent->file->shared */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_efc_try_close_tag1)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity checks */
HDassert(sf);
@ -679,7 +679,7 @@ H5F_efc_try_close_tag2(H5F_file_t *sf, H5F_file_t **tail)
H5F_efc_ent_t *ent = NULL; /* EFC entry */
H5F_file_t *esf; /* Convenience pointer to ent->file->shared */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_efc_try_close_tag2)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity checks */
HDassert(sf);
@ -790,7 +790,7 @@ H5F_efc_try_close(H5F_t *f)
H5F_file_t *next; /* Temporary file pointer */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_efc_try_close)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(f);

6
src/H5Ffake.c
View File

@ -43,7 +43,7 @@ DESCRIPTION
static herr_t
H5F_init_fake_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_init_fake_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5F_init())
} /* H5F_init_fake_interface() */
@ -72,7 +72,7 @@ H5F_fake_alloc(uint8_t sizeof_size)
H5F_t *f = NULL; /* Pointer to fake file struct */
H5F_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5F_fake_alloc, NULL)
FUNC_ENTER_NOAPI(NULL)
/* Allocate faked file struct */
if(NULL == (f = H5FL_CALLOC(H5F_t)))
@ -114,7 +114,7 @@ done:
herr_t
H5F_fake_free(H5F_t *f)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_fake_free)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Free faked file struct */
if(f) {

4
src/H5Fio.c
View File

@ -97,7 +97,7 @@ H5F_block_read(const H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_block_read, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@ -138,7 +138,7 @@ H5F_block_write(const H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_block_write, FAIL)
FUNC_ENTER_NOAPI(FAIL)
#ifdef QAK
HDfprintf(stderr, "%s: write to addr = %a, size = %Zu\n", FUNC, addr, size);
#endif /* QAK */

29
src/H5Fmount.c
View File

@ -52,7 +52,7 @@ DESCRIPTION
static herr_t
H5F_init_mount_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_init_mount_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5F_init())
} /* H5F_init_mount_interface() */
@ -76,7 +76,7 @@ H5F_close_mounts(H5F_t *f)
unsigned u; /* Local index */
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_close_mounts, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
@ -141,7 +141,7 @@ H5F_mount(H5G_loc_t *loc, const char *name, H5F_t *child,
H5G_loc_t root_loc; /* Group location of root of file to mount */
herr_t ret_value = SUCCEED; /*return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_mount)
FUNC_ENTER_NOAPI_NOINIT
HDassert(loc);
HDassert(name && *name);
@ -307,7 +307,7 @@ H5F_unmount(H5G_loc_t *loc, const char *name, hid_t dxpl_id)
int child_idx; /* Index of child in parent's mtab */
herr_t ret_value = SUCCEED; /*return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_unmount)
FUNC_ENTER_NOAPI_NOINIT
HDassert(loc);
HDassert(name && *name);
@ -441,7 +441,7 @@ H5F_is_mount(const H5F_t *file)
{
hbool_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_is_mount)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(file);
@ -474,7 +474,7 @@ H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id)
H5F_t *child = NULL;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Fmount, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*sii", loc_id, name, child_id, plist_id);
/* Check arguments */
@ -524,7 +524,7 @@ H5Funmount(hid_t loc_id, const char *name)
H5G_loc_t loc;
herr_t ret_value=SUCCEED; /* Return value */
FUNC_ENTER_API(H5Funmount, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*s", loc_id, name);
/* Check args */
@ -560,7 +560,7 @@ H5F_mount_count_ids_recurse(H5F_t *f, unsigned *nopen_files, unsigned *nopen_obj
{
unsigned u; /* Local index value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_mount_count_ids_recurse)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@ -608,9 +608,7 @@ H5F_mount_count_ids_recurse(H5F_t *f, unsigned *nopen_files, unsigned *nopen_obj
herr_t
H5F_mount_count_ids(H5F_t *f, unsigned *nopen_files, unsigned *nopen_objs)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_mount_count_ids, FAIL)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@ -624,8 +622,7 @@ H5F_mount_count_ids(H5F_t *f, unsigned *nopen_files, unsigned *nopen_objs)
/* Count open IDs in the hierarchy */
H5F_mount_count_ids_recurse(f, nopen_files, nopen_objs);
done:
FUNC_LEAVE_NOAPI(ret_value)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5F_mount_count_ids() */
@ -648,7 +645,7 @@ H5F_flush_mounts_recurse(H5F_t *f, hid_t dxpl_id)
unsigned u; /* Index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_flush_mounts_recurse)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@ -688,7 +685,7 @@ H5F_flush_mounts(H5F_t *f, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_flush_mounts, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@ -729,7 +726,7 @@ H5F_traverse_mount(H5O_loc_t *oloc/*in,out*/)
H5O_loc_t *mnt_oloc = NULL; /* Object location for mount points */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_traverse_mount, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(oloc);

6
src/H5Fmpi.c
View File

@ -98,7 +98,7 @@ H5F_mpi_get_rank(const H5F_t *f)
{
int ret_value;
FUNC_ENTER_NOAPI(H5F_mpi_get_rank, FAIL)
FUNC_ENTER_NOAPI(FAIL)
assert(f && f->shared);
@ -132,7 +132,7 @@ H5F_mpi_get_comm(const H5F_t *f)
{
MPI_Comm ret_value;
FUNC_ENTER_NOAPI(H5F_mpi_get_comm, MPI_COMM_NULL)
FUNC_ENTER_NOAPI(MPI_COMM_NULL)
assert(f && f->shared);
@ -166,7 +166,7 @@ H5F_mpi_get_size(const H5F_t *f)
{
int ret_value;
FUNC_ENTER_NOAPI(H5F_mpi_get_size, FAIL)
FUNC_ENTER_NOAPI(FAIL)
assert(f && f->shared);

138
src/H5Fquery.c
View File

@ -93,8 +93,8 @@
unsigned
H5F_get_intent(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_intent)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@ -118,8 +118,8 @@ H5F_get_intent(const H5F_t *f)
char *
H5F_get_open_name(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_open_name)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->open_name);
@ -144,8 +144,8 @@ H5F_get_open_name(const H5F_t *f)
char *
H5F_get_actual_name(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_actual_name)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->actual_name);
@ -170,8 +170,8 @@ H5F_get_actual_name(const H5F_t *f)
char *
H5F_get_extpath(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_extpath)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->extpath);
@ -194,8 +194,8 @@ H5F_get_extpath(const H5F_t *f)
H5F_file_t *
H5F_get_shared(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_shared)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@ -217,8 +217,8 @@ H5F_get_shared(const H5F_t *f)
hbool_t
H5F_same_shared(const H5F_t *f1, const H5F_t *f2)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_same_shared)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f1);
HDassert(f1->shared);
@ -243,8 +243,8 @@ H5F_same_shared(const H5F_t *f1, const H5F_t *f2)
unsigned
H5F_get_nopen_objs(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_nopen_objs)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@ -266,8 +266,8 @@ H5F_get_nopen_objs(const H5F_t *f)
hid_t
H5F_get_file_id(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_file_id)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@ -289,8 +289,8 @@ H5F_get_file_id(const H5F_t *f)
H5F_t *
H5F_get_parent(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_parent)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@ -312,8 +312,8 @@ H5F_get_parent(const H5F_t *f)
unsigned
H5F_get_nmounts(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_nmounts)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@ -339,8 +339,8 @@ H5F_get_nmounts(const H5F_t *f)
hid_t
H5F_get_fcpl(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_fcpl)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -366,8 +366,8 @@ H5F_get_fcpl(const H5F_t *f)
uint8_t
H5F_sizeof_addr(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sizeof_addr)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -393,8 +393,8 @@ H5F_sizeof_addr(const H5F_t *f)
uint8_t
H5F_sizeof_size(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sizeof_size)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -417,8 +417,8 @@ H5F_sizeof_size(const H5F_t *f)
haddr_t
H5F_get_sohm_addr(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_sohm_addr)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -441,8 +441,8 @@ H5F_get_sohm_addr(const H5F_t *f)
unsigned
H5F_get_sohm_vers(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_sohm_vers)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -465,8 +465,8 @@ H5F_get_sohm_vers(const H5F_t *f)
unsigned
H5F_get_sohm_nindexes(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_sohm_nindexes)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -496,8 +496,8 @@ H5F_get_sohm_nindexes(const H5F_t *f)
unsigned
H5F_sym_leaf_k(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sym_leaf_k)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -528,8 +528,8 @@ H5F_sym_leaf_k(const H5F_t *f)
unsigned
H5F_Kvalue(const H5F_t *f, const H5B_class_t *type)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_Kvalue)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -554,8 +554,8 @@ H5F_Kvalue(const H5F_t *f, const H5B_class_t *type)
unsigned
H5F_get_nrefs(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_nrefs)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -585,8 +585,8 @@ H5F_get_nrefs(const H5F_t *f)
size_t
H5F_rdcc_nslots(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_rdcc_nslots)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -616,8 +616,8 @@ H5F_rdcc_nslots(const H5F_t *f)
size_t
H5F_rdcc_nbytes(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_rdcc_nbytes)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -647,8 +647,8 @@ H5F_rdcc_nbytes(const H5F_t *f)
double
H5F_rdcc_w0(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_rdcc_w0)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -674,8 +674,8 @@ H5F_rdcc_w0(const H5F_t *f)
haddr_t
H5F_get_base_addr(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_base_addr)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -706,8 +706,8 @@ H5F_get_base_addr(const H5F_t *f)
H5RC_t *
H5F_grp_btree_shared(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_grp_btree_shared)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -737,8 +737,8 @@ H5F_grp_btree_shared(const H5F_t *f)
size_t
H5F_sieve_buf_size(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sieve_buf_size)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -768,8 +768,8 @@ H5F_sieve_buf_size(const H5F_t *f)
unsigned
H5F_gc_ref(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_gc_ref)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -797,8 +797,8 @@ H5F_gc_ref(const H5F_t *f)
hbool_t
H5F_use_latest_format(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_use_latest_format)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -825,8 +825,8 @@ H5F_use_latest_format(const H5F_t *f)
H5F_close_degree_t
H5F_get_fc_degree(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_fc_degree)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -853,8 +853,8 @@ H5F_get_fc_degree(const H5F_t *f)
hbool_t
H5F_store_msg_crt_idx(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_store_msg_crt_idx)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -880,8 +880,8 @@ H5F_store_msg_crt_idx(const H5F_t *f)
hbool_t
H5F_has_feature(const H5F_t *f, unsigned feature)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_has_feature)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -907,8 +907,8 @@ H5F_has_feature(const H5F_t *f, unsigned feature)
hid_t
H5F_get_driver_id(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_driver_id)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -937,7 +937,7 @@ H5F_get_fileno(const H5F_t *f, unsigned long *filenum)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5F_get_fileno, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@ -970,7 +970,7 @@ H5F_get_eoa(const H5F_t *f, H5FD_mem_t type)
{
haddr_t ret_value;
FUNC_ENTER_NOAPI(H5F_get_eoa, HADDR_UNDEF)
FUNC_ENTER_NOAPI(HADDR_UNDEF)
HDassert(f);
HDassert(f->shared);
@ -1003,7 +1003,7 @@ H5F_get_vfd_handle(const H5F_t *file, hid_t fapl, void **file_handle)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_get_vfd_handle, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(file);
@ -1036,8 +1036,8 @@ done:
hbool_t
H5F_is_tmp_addr(const H5F_t *f, haddr_t addr)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_is_tmp_addr)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@ -1064,8 +1064,8 @@ H5F_is_tmp_addr(const H5F_t *f, haddr_t addr)
hbool_t
H5F_use_tmp_space(const H5F_t *f)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_use_tmp_space)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);

8
src/H5Fsfile.c
View File

@ -58,7 +58,7 @@ H5F_sfile_node_t *H5F_sfile_head_g = NULL;
herr_t
H5F_sfile_assert_num(unsigned n)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sfile_assert_num)
FUNC_ENTER_NOAPI_NOINIT_NOERR
if(n == 0) {
/* Sanity checking */
@ -107,7 +107,7 @@ H5F_sfile_add(H5F_file_t *shared)
H5F_sfile_node_t *new_shared; /* New shared file node */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_sfile_add)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(shared);
@ -149,7 +149,7 @@ H5F_sfile_search(H5FD_t *lf)
H5F_sfile_node_t *curr; /* Current shared file node */
H5F_file_t *ret_value = NULL; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sfile_search)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(lf);
@ -191,7 +191,7 @@ H5F_sfile_remove(H5F_file_t *shared)
H5F_sfile_node_t *last; /* Last shared file node */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_sfile_remove)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(shared);

24
src/H5Fsuper.c
View File

@ -93,7 +93,7 @@ DESCRIPTION
static herr_t
H5F_init_super_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_init_super_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5F_init())
} /* H5F_init_super_interface() */
@ -123,7 +123,7 @@ H5F_locate_signature(H5FD_t *file, hid_t dxpl_id)
unsigned n, maxpow;
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_locate_signature)
FUNC_ENTER_NOAPI_NOINIT
/* Find the least N such that 2^N is larger than the file size */
if(HADDR_UNDEF == (addr = H5FD_get_eof(file)) || HADDR_UNDEF == (eoa = H5FD_get_eoa(file, H5FD_MEM_SUPER)))
@ -180,7 +180,7 @@ H5F_super_ext_create(H5F_t *f, hid_t dxpl_id, H5O_loc_t *ext_ptr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_super_ext_create)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@ -233,7 +233,7 @@ H5F_super_ext_open(H5F_t *f, haddr_t ext_addr, H5O_loc_t *ext_ptr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_super_ext_open)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@ -272,7 +272,7 @@ H5F_super_ext_close(H5F_t *f, H5O_loc_t *ext_ptr, hid_t dxpl_id,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_super_ext_close)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@ -327,7 +327,7 @@ H5F_super_read(H5F_t *f, hid_t dxpl_id)
hbool_t dirtied = FALSE; /* Bool for sblock protect call */
herr_t ret_value = SUCCEED; /* return value */
FUNC_ENTER_NOAPI_TAG(H5F_super_read, dxpl_id, H5AC__SUPERBLOCK_TAG, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, H5AC__SUPERBLOCK_TAG, FAIL)
/* Find the superblock */
if(HADDR_UNDEF == (super_addr = H5F_locate_signature(f->shared->lf, dxpl_id)))
@ -401,7 +401,7 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id)
hbool_t ext_created = FALSE; /* Whether the extension has been created */
herr_t ret_value = SUCCEED; /* Return Value */
FUNC_ENTER_NOAPI_TAG(H5F_super_init, dxpl_id, H5AC__SUPERBLOCK_TAG, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, H5AC__SUPERBLOCK_TAG, FAIL)
/* Allocate space for the superblock */
if(NULL == (sblock = H5FL_CALLOC(H5F_super_t)))
@ -681,7 +681,7 @@ H5F_super_dirty(H5F_t *f)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_super_dirty, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@ -713,7 +713,7 @@ done:
herr_t
H5F_super_free(H5F_super_t *sblock)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_super_free)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(sblock);
@ -746,7 +746,7 @@ H5F_super_size(H5F_t *f, hid_t dxpl_id, hsize_t *super_size, hsize_t *super_ext_
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_super_size, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@ -805,7 +805,7 @@ H5F_super_ext_write_msg(H5F_t *f, hid_t dxpl_id, void *mesg, unsigned id, hbool_
htri_t status; /* Indicate whether the message exists or not */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_super_ext_write_msg, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
HDassert(f);
@ -881,7 +881,7 @@ H5F_super_ext_remove_msg(H5F_t *f, hid_t dxpl_id, unsigned id)
htri_t status; /* Indicate whether the message exists or not */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5F_super_ext_remove_msg, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Make sure that the superblock extension object header exists */
HDassert(H5F_addr_defined(f->shared->sblock->ext_addr));

10
src/H5Fsuper_cache.c
View File

@ -130,7 +130,7 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, void *_udata)
hbool_t *dirtied = (hbool_t *)_udata; /* Set up dirtied out value */
H5F_super_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_sblock_load)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@ -632,7 +632,7 @@ H5F_sblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t UNUSED addr,
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5F_sblock_flush)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@ -830,7 +830,7 @@ H5F_sblock_dest(H5F_t UNUSED *f, H5F_super_t* sblock)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_sblock_dest)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(sblock);
@ -861,7 +861,7 @@ H5F_sblock_clear(H5F_t *f, H5F_super_t *sblock, hbool_t destroy)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_sblock_clear)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -895,7 +895,7 @@ done:
static herr_t
H5F_sblock_size(const H5F_t *f, const H5F_super_t *sblock, size_t *size_ptr)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sblock_size)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(f);

6
src/H5Ftest.c
View File

@ -102,7 +102,7 @@ H5F_get_sohm_mesg_count_test(hid_t file_id, unsigned type_id,
H5F_t *file; /* File info */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_get_sohm_mesg_count_test)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
@ -139,7 +139,7 @@ H5F_check_cached_stab_test(hid_t file_id)
H5F_t *file; /* File info */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_check_cached_stab_test)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
@ -173,7 +173,7 @@ H5F_get_maxaddr_test(hid_t file_id, haddr_t *maxaddr)
H5F_t *file; /* File info */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5F_get_maxaddr_test)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))

64
src/H5G.c
View File

@ -209,7 +209,7 @@ H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id,
H5G_t *grp = NULL; /* New group created */
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Gcreate2, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE5("i", "i*siii", loc_id, name, lcpl_id, gcpl_id, gapl_id);
/* Check arguments */
@ -276,7 +276,7 @@ H5G_create_named(const H5G_loc_t *loc, const char *name, hid_t lcpl_id,
H5G_obj_create_t gcrt_info; /* Information for group creation */
H5G_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_create_named)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(loc);
@ -352,7 +352,7 @@ H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id)
H5G_obj_create_t gcrt_info; /* Information for group creation */
hid_t ret_value;
FUNC_ENTER_API(H5Gcreate_anon, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("i", "iii", loc_id, gcpl_id, gapl_id);
/* Check arguments */
@ -431,7 +431,7 @@ H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id)
H5G_loc_t loc; /* Location of parent for group */
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Gopen2, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("i", "i*si", loc_id, name, gapl_id);
/* Check args */
@ -494,7 +494,7 @@ H5Gget_create_plist(hid_t group_id)
hid_t new_gcpl_id = FAIL;
hid_t ret_value = FAIL;
FUNC_ENTER_API(H5Gget_create_plist, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", group_id);
/* Check args */
@ -586,7 +586,7 @@ H5Gget_info(hid_t grp_id, H5G_info_t *grp_info)
H5G_loc_t loc; /* Location of group */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Gget_info, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*x", grp_id, grp_info);
/* Check args */
@ -633,7 +633,7 @@ H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *grp_info,
hbool_t loc_found = FALSE; /* Location at 'name' found */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Gget_info_by_name, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*s*xi", loc_id, name, grp_info, lapl_id);
/* Check args */
@ -696,7 +696,7 @@ H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
hbool_t loc_found = FALSE; /* Entry at 'name' found */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Gget_info_by_idx, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE7("e", "i*sIiIoh*xi", loc_id, group_name, idx_type, order, n, grp_info,
lapl_id);
@ -758,7 +758,7 @@ H5Gclose(hid_t group_id)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Gclose, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", group_id);
/* Check args */
@ -803,7 +803,7 @@ H5G_init(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_init, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
@ -835,7 +835,7 @@ H5G_init_interface(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_init_interface)
FUNC_ENTER_NOAPI_NOINIT
/* Initialize the atom group for the group IDs */
if(H5I_register_type(H5I_GROUP, (size_t)H5I_GROUPID_HASHSIZE, H5G_RESERVED_ATOMS, (H5I_free_t)H5G_close) < 0)
@ -866,7 +866,7 @@ H5G_term_interface(void)
{
int n = 0;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_term_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
if(H5_interface_initialize_g) {
if((n = H5I_nmembers(H5I_GROUP)))
@ -910,7 +910,7 @@ H5G_create(H5F_t *file, H5G_obj_create_t *gcrt_info, hid_t dxpl_id)
unsigned oloc_init = 0; /* Flag to indicate that the group object location was created successfully */
H5G_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_create)
FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(file);
@ -987,7 +987,7 @@ H5G_open_name(const H5G_loc_t *loc, const char *name, hid_t gapl_id,
H5O_type_t obj_type; /* Type of object at location */
H5G_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5G_open_name, NULL)
FUNC_ENTER_NOAPI(NULL)
/* Check args */
HDassert(loc);
@ -1048,7 +1048,7 @@ H5G_open(const H5G_loc_t *loc, hid_t dxpl_id)
H5G_shared_t *shared_fo; /* Shared group object */
H5G_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5G_open, NULL)
FUNC_ENTER_NOAPI(NULL)
/* Check args */
HDassert(loc);
@ -1140,7 +1140,7 @@ H5G_open_oid(H5G_t *grp, hid_t dxpl_id)
hbool_t obj_opened = FALSE;
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5G_open_oid)
FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(grp);
@ -1188,7 +1188,7 @@ H5G_close(H5G_t *grp)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_close, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(grp && grp->shared);
@ -1260,8 +1260,8 @@ done:
H5O_loc_t *
H5G_oloc(H5G_t *grp)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_oloc)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(grp ? &(grp->oloc) : NULL)
} /* end H5G_oloc() */
@ -1283,8 +1283,8 @@ H5G_oloc(H5G_t *grp)
H5G_name_t *
H5G_nameof(H5G_t *grp)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_nameof)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(grp ? &(grp->path) : NULL)
} /* end H5G_nameof() */
@ -1307,8 +1307,8 @@ H5G_nameof(H5G_t *grp)
H5F_t *
H5G_fileof(H5G_t *grp)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_fileof)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(grp);
@ -1331,7 +1331,7 @@ H5G_fileof(H5G_t *grp)
herr_t
H5G_get_shared_count(H5G_t *grp)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_get_shared_count)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(grp && grp->shared);
@ -1355,7 +1355,7 @@ H5G_get_shared_count(H5G_t *grp)
herr_t
H5G_mount(H5G_t *grp)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_mount)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(grp && grp->shared);
@ -1383,7 +1383,7 @@ H5G_mount(H5G_t *grp)
hbool_t
H5G_mounted(H5G_t *grp)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_mounted)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(grp && grp->shared);
@ -1407,7 +1407,7 @@ H5G_mounted(H5G_t *grp)
herr_t
H5G_unmount(H5G_t *grp)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_unmount)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(grp && grp->shared);
@ -1439,7 +1439,7 @@ H5G_iterate_cb(const H5O_link_t *lnk, void *_udata)
H5G_iter_appcall_ud_t *udata = (H5G_iter_appcall_ud_t *)_udata; /* User data for callback */
herr_t ret_value = H5_ITER_ERROR; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_iterate_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(lnk);
@ -1499,7 +1499,7 @@ H5G_iterate(hid_t loc_id, const char *group_name,
H5G_iter_appcall_ud_t udata; /* User data for callback */
herr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5G_iterate, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(group_name);
@ -1554,7 +1554,7 @@ done:
static herr_t
H5G_free_visit_visited(void *item, void UNUSED *key, void UNUSED *operator_data/*in,out*/)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_free_visit_visited)
FUNC_ENTER_NOAPI_NOINIT_NOERR
item = H5FL_FREE(H5_obj_t, item);
@ -1589,7 +1589,7 @@ H5G_visit_cb(const H5O_link_t *lnk, void *_udata)
size_t len_needed; /* Length of path string needed */
herr_t ret_value = H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_visit_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(lnk);
@ -1772,7 +1772,7 @@ H5G_visit(hid_t loc_id, const char *group_name, H5_index_t idx_type,
/* Portably clear udata struct (before FUNC_ENTER) */
HDmemset(&udata, 0, sizeof(udata));
FUNC_ENTER_NOAPI(H5G_visit, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
if(H5G_loc(loc_id, &loc) < 0)

22
src/H5Gbtree2.c
View File

@ -167,7 +167,7 @@ H5G_dense_fh_name_cmp(const void *obj, size_t UNUSED obj_len, void *_udata)
H5O_link_t *lnk; /* Pointer to link created from heap object */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_dense_fh_name_cmp)
FUNC_ENTER_NOAPI_NOINIT
/* Decode link information */
if(NULL == (lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, (const unsigned char *)obj)))
@ -209,7 +209,7 @@ H5G_dense_btree2_name_store(void *_nrecord, const void *_udata)
const H5G_bt2_ud_ins_t *udata = (const H5G_bt2_ud_ins_t *)_udata;
H5G_dense_bt2_name_rec_t *nrecord = (H5G_dense_bt2_name_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_name_store)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Copy user information info native record */
nrecord->hash = udata->common.name_hash;
@ -240,7 +240,7 @@ H5G_dense_btree2_name_compare(const void *_bt2_udata, const void *_bt2_rec)
const H5G_dense_bt2_name_rec_t *bt2_rec = (const H5G_dense_bt2_name_rec_t *)_bt2_rec;
herr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_name_compare)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(bt2_udata);
@ -310,7 +310,7 @@ H5G_dense_btree2_name_encode(uint8_t *raw, const void *_nrecord, void UNUSED *ct
{
const H5G_dense_bt2_name_rec_t *nrecord = (const H5G_dense_bt2_name_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_name_encode)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Encode the record's fields */
UINT32ENCODE(raw, nrecord->hash)
@ -338,7 +338,7 @@ H5G_dense_btree2_name_decode(const uint8_t *raw, void *_nrecord, void UNUSED *ct
{
H5G_dense_bt2_name_rec_t *nrecord = (H5G_dense_bt2_name_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_name_decode)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Decode the record's fields */
UINT32DECODE(raw, nrecord->hash)
@ -369,7 +369,7 @@ H5G_dense_btree2_name_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED dx
const H5G_dense_bt2_name_rec_t *nrecord = (const H5G_dense_bt2_name_rec_t *)_nrecord;
unsigned u; /* Local index variable */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_name_debug)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDfprintf(stream, "%*s%-*s {%x, ", indent, "", fwidth, "Record:",
(unsigned)nrecord->hash);
@ -399,7 +399,7 @@ H5G_dense_btree2_corder_store(void *_nrecord, const void *_udata)
const H5G_bt2_ud_ins_t *udata = (const H5G_bt2_ud_ins_t *)_udata;
H5G_dense_bt2_corder_rec_t *nrecord = (H5G_dense_bt2_corder_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_corder_store)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Copy user information info native record */
nrecord->corder = udata->common.corder;
@ -430,7 +430,7 @@ H5G_dense_btree2_corder_compare(const void *_bt2_udata, const void *_bt2_rec)
const H5G_dense_bt2_corder_rec_t *bt2_rec = (const H5G_dense_bt2_corder_rec_t *)_bt2_rec;
herr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_corder_compare)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(bt2_udata);
@ -476,7 +476,7 @@ H5G_dense_btree2_corder_encode(uint8_t *raw, const void *_nrecord, void UNUSED *
{
const H5G_dense_bt2_corder_rec_t *nrecord = (const H5G_dense_bt2_corder_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_corder_encode)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Encode the record's fields */
INT64ENCODE(raw, nrecord->corder)
@ -504,7 +504,7 @@ H5G_dense_btree2_corder_decode(const uint8_t *raw, void *_nrecord, void UNUSED *
{
H5G_dense_bt2_corder_rec_t *nrecord = (H5G_dense_bt2_corder_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_corder_decode)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Decode the record's fields */
INT64DECODE(raw, nrecord->corder)
@ -535,7 +535,7 @@ H5G_dense_btree2_corder_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED
const H5G_dense_bt2_corder_rec_t *nrecord = (const H5G_dense_bt2_corder_rec_t *)_nrecord;
unsigned u; /* Local index variable */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_corder_debug)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDfprintf(stream, "%*s%-*s {%llu, ", indent, "", fwidth, "Record:",
(unsigned long long)nrecord->corder);

10
src/H5Gcache.c
View File

@ -130,7 +130,7 @@ H5G_node_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata)
const uint8_t *p;
H5G_node_t *ret_value; /*for error handling */
FUNC_ENTER_NOAPI_NOINIT(H5G_node_load)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -219,7 +219,7 @@ H5G_node_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5G_node_
uint8_t node_buf[H5G_NODE_BUF_SIZE]; /* Buffer for node */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_node_flush)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -307,7 +307,7 @@ H5G_node_dest(H5F_t *f, H5G_node_t *sym)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_node_dest)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -356,7 +356,7 @@ H5G_node_clear(H5F_t *f, H5G_node_t *sym, hbool_t destroy)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_NOINIT(H5G_node_clear)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -396,7 +396,7 @@ done:
static herr_t
H5G_node_size(const H5F_t UNUSED *f, const H5G_node_t *sym, size_t *size_ptr)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_size)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.

24
src/H5Gcompact.c
View File

@ -89,7 +89,7 @@ H5G_compact_build_table_cb(const void *_mesg, unsigned UNUSED idx, void *_udata)
H5G_iter_bt_t *udata = (H5G_iter_bt_t *)_udata; /* 'User data' passed in */
herr_t ret_value=H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_compact_build_table_cb)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(lnk);
@ -128,7 +128,7 @@ H5G_compact_build_table(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_compact_build_table)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(oloc);
@ -191,7 +191,7 @@ H5G_compact_insert(const H5O_loc_t *grp_oloc, H5O_link_t *obj_lnk,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_compact_insert, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(grp_oloc && grp_oloc->file);
@ -227,7 +227,7 @@ H5G_compact_get_name_by_idx(H5O_loc_t *oloc, hid_t dxpl_id,
H5G_link_table_t ltable = {0, NULL}; /* Link table */
ssize_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5G_compact_get_name_by_idx, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(oloc);
@ -280,7 +280,7 @@ H5G_compact_remove_common_cb(const void *_mesg, unsigned UNUSED idx, void *_udat
H5G_iter_rm_t *udata = (H5G_iter_rm_t *)_udata; /* 'User data' passed in */
herr_t ret_value = H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_compact_remove_common_cb)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(lnk);
@ -320,7 +320,7 @@ H5G_compact_remove(const H5O_loc_t *oloc, hid_t dxpl_id, H5RS_str_t *grp_full_pa
H5G_iter_rm_t udata; /* Data to pass through OH iteration */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_compact_remove, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(oloc && oloc->file);
HDassert(name && *name);
@ -361,7 +361,7 @@ H5G_compact_remove_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
H5G_iter_rm_t udata; /* Data to pass through OH iteration */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_compact_remove_by_idx, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(oloc && oloc->file);
HDassert(linfo);
@ -413,7 +413,7 @@ H5G_compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *lin
H5G_link_table_t ltable = {0, NULL}; /* Link table */
herr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5G_compact_iterate, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(oloc);
@ -458,7 +458,7 @@ H5G_compact_lookup_cb(const void *_mesg, unsigned UNUSED idx, void *_udata)
H5G_iter_lkp_t *udata = (H5G_iter_lkp_t *)_udata; /* 'User data' passed in */
herr_t ret_value = H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_compact_lookup_cb)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(lnk);
@ -505,7 +505,7 @@ H5G_compact_lookup(H5O_loc_t *oloc, const char *name, H5O_link_t *lnk,
H5O_mesg_operator_t op; /* Message operator */
htri_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5G_compact_lookup, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(lnk && oloc->file);
@ -551,7 +551,7 @@ H5G_compact_lookup_by_idx(H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *lin
H5G_link_table_t ltable = {0, NULL};/* Link table */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_compact_lookup_by_idx, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(oloc && oloc->file);
@ -600,7 +600,7 @@ H5G_compact_get_type_by_idx(H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *l
H5G_link_table_t ltable = {0, NULL}; /* Link table */
H5G_obj_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5G_compact_get_type_by_idx, H5G_UNKNOWN)
FUNC_ENTER_NOAPI(H5G_UNKNOWN)
/* Sanity check */
HDassert(oloc);

46
src/H5Gdense.c
View File

@ -278,7 +278,7 @@ H5G_dense_create(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
size_t fheap_id_len; /* Fractal heap ID length */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_dense_create, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -397,7 +397,7 @@ H5G_dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
void *link_ptr = NULL; /* Pointer to serialized link */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_dense_insert, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -503,7 +503,7 @@ H5G_dense_lookup_cb(const void *_lnk, void *_user_lnk)
H5O_link_t *user_lnk = (H5O_link_t *)_user_lnk; /* User data from v2 B-tree link lookup */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_dense_lookup_cb)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -542,7 +542,7 @@ H5G_dense_lookup(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */
htri_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5G_dense_lookup, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -605,7 +605,7 @@ H5G_dense_lookup_by_idx_fh_cb(const void *obj, size_t UNUSED obj_len, void *_uda
H5O_link_t *tmp_lnk = NULL; /* Temporary pointer to link */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_dense_lookup_by_idx_fh_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Decode link information & keep a copy */
if(NULL == (tmp_lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, (const unsigned char *)obj)))
@ -645,7 +645,7 @@ H5G_dense_lookup_by_idx_bt2_cb(const void *_record, void *_bt2_udata)
H5G_fh_ud_lbi_t fh_udata; /* User data for fractal heap 'op' callback */
int ret_value = H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_dense_lookup_by_idx_bt2_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Prepare user data for callback */
/* down */
@ -687,7 +687,7 @@ H5G_dense_lookup_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
haddr_t bt2_addr; /* Address of v2 B-tree to use for lookup */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_dense_lookup_by_idx, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -794,7 +794,7 @@ H5G_dense_build_table_cb(const H5O_link_t *lnk, void *_udata)
H5G_dense_bt_ud_t *udata = (H5G_dense_bt_ud_t *)_udata; /* 'User data' passed in */
herr_t ret_value = H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_dense_build_table_cb)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(lnk);
@ -835,7 +835,7 @@ H5G_dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_dense_build_table)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@ -894,7 +894,7 @@ H5G_dense_iterate_fh_cb(const void *obj, size_t UNUSED obj_len, void *_udata)
H5G_fh_ud_it_t *udata = (H5G_fh_ud_it_t *)_udata; /* User data for fractal heap 'op' callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_dense_iterate_fh_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Decode link information & keep a copy */
/* (we make a copy instead of calling the user/library callback directly in
@ -931,7 +931,7 @@ H5G_dense_iterate_bt2_cb(const void *_record, void *_bt2_udata)
H5G_bt2_ud_it_t *bt2_udata = (H5G_bt2_ud_it_t *)_bt2_udata; /* User data for callback */
herr_t ret_value = H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_dense_iterate_bt2_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Check for skipping links */
if(bt2_udata->skip > 0)
@ -993,7 +993,7 @@ H5G_dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
haddr_t bt2_addr; /* Address of v2 B-tree to use for lookup */
herr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5G_dense_iterate, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -1107,7 +1107,7 @@ H5G_dense_get_name_by_idx_fh_cb(const void *obj, size_t UNUSED obj_len, void *_u
H5O_link_t *lnk; /* Pointer to link created from heap object */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_dense_get_name_by_idx_fh_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Decode link information */
if(NULL == (lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, (const unsigned char *)obj)))
@ -1152,7 +1152,7 @@ H5G_dense_get_name_by_idx_bt2_cb(const void *_record, void *_bt2_udata)
H5G_fh_ud_gnbi_t fh_udata; /* User data for fractal heap 'op' callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_dense_get_name_by_idx_bt2_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Prepare user data for callback */
/* down */
@ -1199,7 +1199,7 @@ H5G_dense_get_name_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
haddr_t bt2_addr; /* Address of v2 B-tree to use for lookup */
ssize_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5G_dense_get_name_by_idx, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -1315,7 +1315,7 @@ H5G_dense_remove_fh_cb(const void *obj, size_t UNUSED obj_len, void *_udata)
H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_dense_remove_fh_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Decode link information */
if(NULL == (lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, (const unsigned char *)obj)))
@ -1380,7 +1380,7 @@ H5G_dense_remove_bt2_cb(const void *_record, void *_bt2_udata)
H5G_fh_ud_rm_t fh_udata; /* User data for fractal heap 'op' callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_dense_remove_bt2_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Set up the user data for fractal heap 'op' callback */
fh_udata.f = bt2_udata->common.f;
@ -1426,7 +1426,7 @@ H5G_dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_dense_remove, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -1490,7 +1490,7 @@ H5G_dense_remove_by_idx_fh_cb(const void *obj, size_t UNUSED obj_len, void *_uda
H5G_fh_ud_rmbi_t *udata = (H5G_fh_ud_rmbi_t *)_udata; /* User data for fractal heap 'op' callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_dense_remove_by_idx_fh_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Decode link information */
if(NULL == (udata->lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, (const unsigned char *)obj)))
@ -1525,7 +1525,7 @@ H5G_dense_remove_by_idx_bt2_cb(const void *_record, void *_bt2_udata)
const uint8_t *heap_id; /* Heap ID for link */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_dense_remove_by_idx_bt2_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Determine the index being used */
if(bt2_udata->idx_type == H5_INDEX_NAME) {
@ -1637,7 +1637,7 @@ H5G_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
haddr_t bt2_addr; /* Address of v2 B-tree to use for lookup */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_dense_remove_by_idx, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -1742,7 +1742,7 @@ H5G_dense_delete(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo, hbool_t adj_link)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_dense_delete, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -1839,7 +1839,7 @@ H5G_dense_get_type_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
H5G_link_table_t ltable = {0, NULL}; /* Table of links */
H5G_obj_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5G_dense_get_type_by_idx, H5G_UNKNOWN)
FUNC_ENTER_NOAPI(H5G_UNKNOWN)
/*
* Check arguments.

46
src/H5Gdeprec.c
View File

@ -122,7 +122,7 @@ DESCRIPTION
static herr_t
H5G_init_deprec_interface(void)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_init_deprec_interface)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5G_init())
} /* H5G_init_deprec_interface() */
@ -146,8 +146,8 @@ H5G_map_obj_type(H5O_type_t obj_type)
{
H5G_obj_t ret_value; /* Return value */
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_map_obj_type)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Map object type to older "group" object type */
switch(obj_type) {
@ -206,7 +206,7 @@ H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint)
hid_t tmp_gcpl = (-1); /* Temporary group creation property list */
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Gcreate1, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("i", "i*sz", loc_id, name, size_hint);
/* Check arguments */
@ -288,7 +288,7 @@ H5Gopen1(hid_t loc_id, const char *name)
H5G_loc_t loc; /* Location of parent for group */
hid_t ret_value; /* Return value */
FUNC_ENTER_API(H5Gopen1, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("i", "i*s", loc_id, name);
/* Check args */
@ -328,7 +328,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Glink, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE4("e", "iLl*s*s", cur_loc_id, type, cur_name, new_name);
/* Check arguments */
@ -374,7 +374,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Glink2, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE5("e", "i*sLli*s", cur_loc_id, cur_name, type, new_loc_id, new_name);
/* Check arguments */
@ -435,7 +435,7 @@ H5G_link_hard(hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id,
H5G_loc_t new_loc, *new_loc_p; /* Information about new link's group */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_link_hard)
FUNC_ENTER_NOAPI_NOINIT
/* Finish checking arguments */
if(cur_loc_id == H5L_SAME_LOC && new_loc_id == H5L_SAME_LOC)
@ -477,7 +477,7 @@ H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Gmove, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*s*s", src_loc_id, src_name, dst_name);
/* Call common routine to move the link */
@ -502,7 +502,7 @@ H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Gmove2, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*si*s", src_loc_id, src_name, dst_loc_id, dst_name);
/* Call common routine to move the link */
@ -539,7 +539,7 @@ H5G_move(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
H5G_loc_t dst_loc, *dst_loc_p; /* Group info for destination location */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_move)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(src_loc_id == H5L_SAME_LOC && dst_loc_id == H5L_SAME_LOC)
@ -584,7 +584,7 @@ H5Gunlink(hid_t loc_id, const char *name)
H5G_loc_t loc; /* Group's location */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Gunlink, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*s", loc_id, name);
/* Check arguments */
@ -616,7 +616,7 @@ H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf/*out*/)
H5G_loc_t loc; /* Group's location */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Gget_linkval, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*szx", loc_id, name, size, buf);
/* Check arguments */
@ -657,7 +657,7 @@ H5Gset_comment(hid_t loc_id, const char *name, const char *comment)
H5G_loc_t loc;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Gset_comment, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*s*s", loc_id, name, comment);
if(H5G_loc(loc_id, &loc) < 0)
@ -702,7 +702,7 @@ H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf)
H5G_loc_t loc;
int ret_value;
FUNC_ENTER_API(H5Gget_comment, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE4("Is", "i*sz*s", loc_id, name, bufsize, buf);
if(H5G_loc(loc_id, &loc) < 0)
@ -756,7 +756,7 @@ H5Giterate(hid_t loc_id, const char *name, int *idx_p, H5G_iterate_t op,
hsize_t idx; /* Internal location to hold index */
herr_t ret_value;
FUNC_ENTER_API(H5Giterate, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE5("e", "i*s*Isx*x", loc_id, name, idx_p, op, op_data);
/* Check args */
@ -812,7 +812,7 @@ H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs)
H5O_type_t obj_type; /* Type of object at location */
herr_t ret_value = SUCCEED;
FUNC_ENTER_API(H5Gget_num_objs, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*h", loc_id, num_objs);
/* Check args */
@ -861,7 +861,7 @@ H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link,
H5G_loc_t loc;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_API(H5Gget_objinfo, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*sbx", loc_id, name, follow_link, statbuf);
/* Check arguments */
@ -899,7 +899,7 @@ H5G_get_objinfo_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char *name, const H5O_
H5G_trav_goi_t *udata = (H5G_trav_goi_t *)_udata; /* User data passed in */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_get_objinfo_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Check if the name in this group resolved to a valid link */
if(lnk == NULL && obj_loc == NULL)
@ -981,7 +981,7 @@ H5G_get_objinfo(const H5G_loc_t *loc, const char *name, hbool_t follow_link,
H5G_trav_goi_t udata; /* User data for callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_get_objinfo)
FUNC_ENTER_NOAPI_NOINIT
HDassert(loc);
HDassert(name && *name);
@ -1058,7 +1058,7 @@ H5Gget_objname_by_idx(hid_t loc_id, hsize_t idx, char *name, size_t size)
H5O_type_t obj_type; /* Type of object at location */
ssize_t ret_value;
FUNC_ENTER_API(H5Gget_objname_by_idx, FAIL)
FUNC_ENTER_API(FAIL)
H5TRACE4("Zs", "ih*sz", loc_id, idx, name, size);
/* Check args */
@ -1100,7 +1100,7 @@ H5Gget_objtype_by_idx(hid_t loc_id, hsize_t idx)
H5O_type_t obj_type; /* Type of object at location */
H5G_obj_t ret_value;
FUNC_ENTER_API(H5Gget_objtype_by_idx, H5G_UNKNOWN)
FUNC_ENTER_API(H5G_UNKNOWN)
H5TRACE2("Go", "ih", loc_id, idx);
/* Check args */
@ -1142,7 +1142,7 @@ H5G_obj_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx, hid_t dxpl_id)
htri_t linfo_exists; /* Whether the link info message exists */
H5G_obj_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5G_obj_get_type_by_idx, dxpl_id, oloc->addr, H5G_UNKNOWN)
FUNC_ENTER_NOAPI_TAG(dxpl_id, oloc->addr, H5G_UNKNOWN)
/* Sanity check */
HDassert(oloc);

16
src/H5Gent.c
View File

@ -98,7 +98,7 @@ H5G_ent_decode_vec(const H5F_t *f, const uint8_t **pp, H5G_entry_t *ent, unsigne
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_ent_decode_vec, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
@ -138,7 +138,7 @@ H5G_ent_decode(const H5F_t *f, const uint8_t **pp, H5G_entry_t *ent)
uint32_t tmp;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_ent_decode, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
@ -203,7 +203,7 @@ H5G_ent_encode_vec(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent, unsigne
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_ent_encode_vec, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
@ -243,7 +243,7 @@ H5G_ent_encode(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent)
uint8_t *p_ret = *pp + H5G_SIZEOF_ENTRY(f);
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_ent_encode, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
@ -322,7 +322,7 @@ done:
herr_t
H5G_ent_copy(H5G_entry_t *dst, const H5G_entry_t *src, H5_copy_depth_t depth)
{
FUNC_ENTER_NOAPI_NOFUNC(H5G_ent_copy)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(src);
@ -361,7 +361,7 @@ H5G_ent_copy(H5G_entry_t *dst, const H5G_entry_t *src, H5_copy_depth_t depth)
herr_t
H5G_ent_reset(H5G_entry_t *ent)
{
FUNC_ENTER_NOAPI_NOFUNC(H5G_ent_reset)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(ent);
@ -396,7 +396,7 @@ H5G_ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, const char *name,
size_t name_offset; /* Offset of name in heap */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_ent_convert, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
@ -546,7 +546,7 @@ H5G_ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth,
const char *lval = NULL;
int nested_indent, nested_fwidth;
FUNC_ENTER_NOAPI_NOFUNC(H5G_ent_debug)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Calculate the indent & field width values for nested information */
nested_indent = indent + 3;

8
src/H5Gint.c
View File

@ -96,7 +96,7 @@ H5G_init_int_interface(void)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_init_int_interface, FAIL)
FUNC_ENTER_NOAPI_NOINIT
/* Funnel all work to H5G_init() */
if(H5G_init() < 0)
@ -128,8 +128,8 @@ done:
const char *
H5G_component(const char *name, size_t *size_p)
{
/* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_component)
/* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(name);
@ -164,7 +164,7 @@ H5G_normalize(const char *name)
unsigned last_slash; /* Flag to indicate last character was a slash */
char *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_normalize)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(name);

24
src/H5Glink.c
View File

@ -101,7 +101,7 @@
int
H5G_link_cmp_name_inc(const void *lnk1, const void *lnk2)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_link_cmp_name_inc)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(HDstrcmp(((const H5O_link_t *)lnk1)->name, ((const H5O_link_t *)lnk2)->name))
} /* end H5G_link_cmp_name_inc() */
@ -128,7 +128,7 @@ H5G_link_cmp_name_inc(const void *lnk1, const void *lnk2)
int
H5G_link_cmp_name_dec(const void *lnk1, const void *lnk2)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_link_cmp_name_dec)
FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(HDstrcmp(((const H5O_link_t *)lnk2)->name, ((const H5O_link_t *)lnk1)->name))
} /* end H5G_link_cmp_name_dec() */
@ -156,7 +156,7 @@ H5G_link_cmp_corder_inc(const void *lnk1, const void *lnk2)
{
int ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_link_cmp_corder_inc)
FUNC_ENTER_NOAPI_NOINIT_NOERR
if(((const H5O_link_t *)lnk1)->corder < ((const H5O_link_t *)lnk2)->corder)
ret_value = -1;
@ -191,7 +191,7 @@ H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2)
{
int ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_link_cmp_corder_dec)
FUNC_ENTER_NOAPI_NOINIT_NOERR
if(((const H5O_link_t *)lnk1)->corder < ((const H5O_link_t *)lnk2)->corder)
ret_value = 1;
@ -221,7 +221,7 @@ herr_t
H5G_ent_to_link(H5O_link_t *lnk, const H5HL_t *heap,
const H5G_entry_t *ent, const char *name)
{
FUNC_ENTER_NOAPI_NOFUNC(H5G_ent_to_link)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(lnk);
@ -278,7 +278,7 @@ H5G_link_to_info(const H5O_link_t *lnk, H5L_info_t *info)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_link_to_info, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(lnk);
@ -355,7 +355,7 @@ H5G_link_to_loc(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_link_to_loc, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(grp_loc);
@ -412,7 +412,7 @@ H5G_link_copy_file(H5F_t *dst_file, hid_t dxpl_id, const H5O_link_t *_src_lnk,
H5O_loc_t tmp_src_oloc; /* Object location for target object */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_link_copy_file, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(dst_file);
@ -536,7 +536,7 @@ herr_t
H5G_link_sort_table(H5G_link_table_t *ltable, H5_index_t idx_type,
H5_iter_order_t order)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_link_sort_table)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ltable);
@ -585,7 +585,7 @@ H5G_link_iterate_table(const H5G_link_table_t *ltable, hsize_t skip,
size_t u; /* Local index variable */
herr_t ret_value = H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI_NOERR(H5G_link_iterate_table, -)
FUNC_ENTER_NOAPI_NOERR
/* Sanity check */
HDassert(ltable);
@ -633,7 +633,7 @@ H5G_link_release_table(H5G_link_table_t *ltable)
size_t u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_link_release_table)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(ltable);
@ -677,7 +677,7 @@ H5G_link_name_replace(H5F_t *file, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
H5RS_str_t *obj_path_r = NULL; /* Full path for link being removed */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_link_name_replace, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(file);

34
src/H5Gloc.c
View File

@ -161,7 +161,7 @@ H5G_loc(hid_t loc_id, H5G_loc_t *loc)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_loc, FAIL)
FUNC_ENTER_NOAPI(FAIL)
switch(H5I_get_type(loc_id)) {
case H5I_FILE:
@ -275,7 +275,7 @@ H5G_loc_copy(H5G_loc_t *dst, const H5G_loc_t *src, H5_copy_depth_t depth)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_loc_copy, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args. */
HDassert(dst);
@ -309,7 +309,7 @@ H5G_loc_reset(H5G_loc_t *loc)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_loc_reset, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args. */
HDassert(loc);
@ -342,7 +342,7 @@ H5G_loc_free(H5G_loc_t *loc)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_loc_free, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args. */
HDassert(loc);
@ -378,7 +378,7 @@ H5G_loc_find_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char *name,
H5G_loc_fnd_t *udata = (H5G_loc_fnd_t *)_udata; /* User data passed in */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_loc_find_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Check if the name in this group resolved to a valid object */
if(obj_loc == NULL)
@ -415,7 +415,7 @@ H5G_loc_find(const H5G_loc_t *loc, const char *name, H5G_loc_t *obj_loc/*out*/,
H5G_loc_fnd_t udata; /* User data for traversal callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_loc_find, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args. */
HDassert(loc);
@ -460,7 +460,7 @@ H5G_loc_find_by_idx_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
hbool_t obj_exists = FALSE; /* Whether the object exists (unused) */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_loc_find_by_idx_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Check if the name in this group resolved to a valid link */
if(obj_loc == NULL)
@ -521,7 +521,7 @@ H5G_loc_find_by_idx(H5G_loc_t *loc, const char *group_name, H5_index_t idx_type,
H5G_loc_fbi_t udata; /* User data for traversal callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_loc_find_by_idx, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args. */
HDassert(loc);
@ -564,7 +564,7 @@ H5G_loc_insert(H5G_loc_t *grp_loc, const char *name, H5G_loc_t *obj_loc,
H5O_link_t lnk; /* Link for object to insert */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_loc_insert, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args. */
HDassert(grp_loc);
@ -613,7 +613,7 @@ H5G_loc_exists_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
{
H5G_loc_exists_t *udata = (H5G_loc_exists_t *)_udata; /* User data passed in */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_loc_exists_cb)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check if the name in this group resolved to a valid object */
if(obj_loc == NULL)
@ -651,7 +651,7 @@ H5G_loc_exists(const H5G_loc_t *loc, const char *name, hid_t lapl_id, hid_t dxpl
H5G_loc_exists_t udata; /* User data for traversal callback */
htri_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5G_loc_exists, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args. */
HDassert(loc);
@ -691,7 +691,7 @@ H5G_loc_info_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name, const
H5G_loc_info_t *udata = (H5G_loc_info_t *)_udata; /* User data passed in */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_loc_info_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Check if the name in this group resolved to a valid link */
if(obj_loc == NULL)
@ -730,7 +730,7 @@ H5G_loc_info(H5G_loc_t *loc, const char *name, hbool_t want_ih_info, H5O_info_t
H5G_loc_info_t udata; /* User data for traversal callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_loc_info, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args. */
HDassert(loc);
@ -772,7 +772,7 @@ H5G_loc_set_comment_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
htri_t exists; /* Whether a "comment" message already exists */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_loc_set_comment_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Check if the name in this group resolved to a valid link */
if(obj_loc == NULL)
@ -824,7 +824,7 @@ H5G_loc_set_comment(H5G_loc_t *loc, const char *name, const char *comment,
H5G_loc_sc_t udata; /* User data for traversal callback */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_loc_set_comment, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args. */
HDassert(loc);
@ -863,7 +863,7 @@ H5G_loc_get_comment_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
H5O_name_t comment; /* Object header "comment" message */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_loc_get_comment_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Check if the name in this group resolved to a valid link */
if(obj_loc == NULL)
@ -915,7 +915,7 @@ H5G_loc_get_comment(H5G_loc_t *loc, const char *name, char *comment/*out*/,
H5G_loc_gc_t udata; /* User data for traversal callback */
ssize_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5G_loc_get_comment, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args. */
HDassert(loc);

30
src/H5Gname.c
View File

@ -134,7 +134,7 @@ H5G_common_path(const H5RS_str_t *fullpath_r, const H5RS_str_t *prefix_r)
size_t nchars1,nchars2; /* Number of characters in components */
htri_t ret_value=FALSE; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_common_path)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Get component of each name */
fullpath=H5RS_get_str(fullpath_r);
@ -199,7 +199,7 @@ H5G_build_fullpath(const char *prefix, const char *name)
unsigned need_sep; /* Flag to indicate if separator is needed */
H5RS_str_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_build_fullpath)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(prefix);
@ -255,7 +255,7 @@ H5G_build_fullpath_refstr_str(H5RS_str_t *prefix_r, const char *name)
const char *prefix; /* Pointer to raw string for path */
H5RS_str_t *ret_value;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_build_fullpath_refstr_str)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(prefix_r);
HDassert(name);
@ -293,7 +293,7 @@ H5G_build_fullpath_refstr_refstr(const H5RS_str_t *prefix_r, const H5RS_str_t *n
const char *name; /* Pointer to raw string of name */
H5RS_str_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_build_fullpath_refstr_refstr)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Get the pointer to the prefix */
prefix = H5RS_get_str(prefix_r);
@ -325,7 +325,7 @@ H5G_build_fullpath_refstr_refstr(const H5RS_str_t *prefix_r, const H5RS_str_t *n
herr_t
H5G_name_init(H5G_name_t *name, const char *path)
{
FUNC_ENTER_NOAPI_NOFUNC(H5G_name_init)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(name);
@ -359,7 +359,7 @@ H5G_name_set(H5G_name_t *loc, H5G_name_t *obj, const char *name)
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5G_name_set, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(loc);
HDassert(obj);
@ -413,7 +413,7 @@ done:
herr_t
H5G_name_copy(H5G_name_t *dst, const H5G_name_t *src, H5_copy_depth_t depth)
{
FUNC_ENTER_NOAPI_NOFUNC(H5G_name_copy)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(src);
@ -466,7 +466,7 @@ H5G_get_name(const H5G_loc_t *loc, char *name/*out*/, size_t size,
ssize_t len = 0; /* Length of object's name */
ssize_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5G_get_name, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(loc);
@ -533,7 +533,7 @@ done:
herr_t
H5G_name_reset(H5G_name_t *name)
{
FUNC_ENTER_NOAPI_NOFUNC(H5G_name_reset)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(name);
@ -561,7 +561,7 @@ H5G_name_reset(H5G_name_t *name)
herr_t
H5G_name_free(H5G_name_t *name)
{
FUNC_ENTER_NOAPI_NOFUNC(H5G_name_free)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(name);
@ -602,7 +602,7 @@ H5G_name_move_path(H5RS_str_t **path_r_ptr, const char *full_suffix, const char
size_t full_suffix_len; /* Length of full suffix */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_name_move_path)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(path_r_ptr && *path_r_ptr);
@ -704,7 +704,7 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key)
hbool_t obj_in_child = FALSE; /* Flag to indicate that the object is in the child mount hier. */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_name_replace_cb)
FUNC_ENTER_NOAPI_NOINIT
HDassert(obj_ptr);
@ -972,7 +972,7 @@ H5G_name_replace(const H5O_link_t *lnk, H5G_names_op_t op, H5F_t *src_file,
{
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5G_name_replace, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments */
HDassert(src_file);
@ -1110,7 +1110,7 @@ H5G_get_name_by_addr_cb(hid_t gid, const char *path, const H5L_info_t *linfo,
hbool_t obj_found = FALSE; /* Object at 'path' found */
herr_t ret_value = H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_get_name_by_addr_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(path);
@ -1183,7 +1183,7 @@ H5G_get_name_by_addr(hid_t file, hid_t lapl_id, hid_t dxpl_id, const H5O_loc_t *
/* Portably clear udata struct (before FUNC_ENTER) */
HDmemset(&udata, 0, sizeof(udata));
FUNC_ENTER_NOAPI(H5G_get_name_by_addr, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Construct the link info for the file's root group */
if(H5G_loc(file, &root_loc) < 0)

40
src/H5Gnode.c
View File

@ -159,7 +159,7 @@ H5FL_SEQ_DEFINE(H5G_entry_t);
static H5RC_t *
H5G_node_get_shared(const H5F_t *f, const void UNUSED *_udata)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_get_shared)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@ -186,7 +186,7 @@ H5G_node_decode_key(const H5B_shared_t *shared, const uint8_t *raw, void *_key)
{
H5G_node_key_t *key = (H5G_node_key_t *) _key;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_decode_key)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(shared);
HDassert(raw);
@ -216,7 +216,7 @@ H5G_node_encode_key(const H5B_shared_t *shared, uint8_t *raw, const void *_key)
{
const H5G_node_key_t *key = (const H5G_node_key_t *) _key;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_encode_key)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(shared);
HDassert(raw);
@ -247,7 +247,7 @@ H5G_node_debug_key(FILE *stream, int indent, int fwidth, const void *_key,
const H5G_node_key_t *key = (const H5G_node_key_t *) _key;
const H5G_bt_common_t *udata = (const H5G_bt_common_t *) _udata;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_debug_key)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(key);
@ -285,7 +285,7 @@ H5G_node_debug_key(FILE *stream, int indent, int fwidth, const void *_key,
herr_t
H5G_node_free(H5G_node_t *sym)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_free)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@ -331,7 +331,7 @@ H5G_node_create(H5F_t *f, hid_t dxpl_id, H5B_ins_t UNUSED op, void *_lt_key,
H5G_node_t *sym = NULL;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_node_create)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -406,7 +406,7 @@ H5G_node_cmp2(void *_lt_key, void *_udata, void *_rt_key)
const char *base; /* Base of heap */
int ret_value;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_cmp2)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity checks */
HDassert(udata && udata->heap);
@ -465,7 +465,7 @@ H5G_node_cmp3(void *_lt_key, void *_udata, void *_rt_key)
const char *base; /* Base of heap */
int ret_value = 0; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_cmp3)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity checks */
HDassert(udata && udata->heap);
@ -529,7 +529,7 @@ H5G_node_found(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED *_lt_key
const char *base; /* Base of heap */
htri_t ret_value = TRUE; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_node_found)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -632,7 +632,7 @@ H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr,
H5G_entry_t ent; /* Entry to insert in node */
H5B_ins_t ret_value = H5B_INS_ERROR;
FUNC_ENTER_NOAPI_NOINIT(H5G_node_insert)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -798,7 +798,7 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/,
int cmp = 1;
H5B_ins_t ret_value = H5B_INS_ERROR;
FUNC_ENTER_NOAPI_NOINIT(H5G_node_remove)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@ -991,7 +991,7 @@ H5G_node_iterate(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t ad
unsigned u; /* Local index variable */
int ret_value = H5_ITER_CONT;
FUNC_ENTER_NOAPI(H5G_node_iterate, H5_ITER_ERROR)
FUNC_ENTER_NOAPI(H5_ITER_ERROR)
/*
* Check arguments.
@ -1068,7 +1068,7 @@ H5G_node_sumup(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t addr
H5G_node_t *sn = NULL;
int ret_value = H5_ITER_CONT;
FUNC_ENTER_NOAPI(H5G_node_sumup, H5_ITER_ERROR)
FUNC_ENTER_NOAPI(H5_ITER_ERROR)
/*
* Check arguments.
@ -1113,7 +1113,7 @@ H5G_node_by_idx(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t add
H5G_node_t *sn = NULL;
int ret_value = H5_ITER_CONT;
FUNC_ENTER_NOAPI(H5G_node_by_idx, H5_ITER_ERROR)
FUNC_ENTER_NOAPI(H5_ITER_ERROR)
/*
* Check arguments.
@ -1173,7 +1173,7 @@ H5G_node_init(H5F_t *f)
size_t sizeof_rkey; /* Size of raw (disk) key */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_node_init, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(f);
@ -1215,7 +1215,7 @@ done:
herr_t
H5G_node_close(const H5F_t *f)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_close)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(f);
@ -1253,7 +1253,7 @@ H5G_node_copy(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t addr,
unsigned int i; /* Local index variable */
int ret_value = H5_ITER_CONT;
FUNC_ENTER_NOAPI(H5G_node_copy, H5_ITER_ERROR)
FUNC_ENTER_NOAPI(H5_ITER_ERROR)
/* Check arguments. */
HDassert(f);
@ -1407,7 +1407,7 @@ H5G_node_build_table(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_
unsigned u; /* Local index variable */
int ret_value = H5_ITER_CONT;
FUNC_ENTER_NOAPI(H5G_node_build_table, H5_ITER_ERROR)
FUNC_ENTER_NOAPI(H5_ITER_ERROR)
/*
* Check arguments.
@ -1479,7 +1479,7 @@ H5G_node_iterate_size(H5F_t *f, hid_t UNUSED dxpl_id, const void UNUSED *_lt_key
{
hsize_t *stab_size = (hsize_t *)_udata; /* User data */
FUNC_ENTER_NOAPI_NOFUNC(H5G_node_iterate_size)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(f);
@ -1514,7 +1514,7 @@ H5G_node_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent,
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_node_debug, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.

28
src/H5Gobj.c
View File

@ -135,7 +135,7 @@ H5G_obj_create(H5F_t *f, hid_t dxpl_id, H5G_obj_create_t *gcrt_info,
H5O_pline_t pline; /* Pipeline */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_obj_create, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -191,7 +191,7 @@ H5G_obj_create_real(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
hid_t gcpl_id = gcrt_info->gcpl_id; /* Group creation property list ID */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_obj_create_real, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -323,7 +323,7 @@ H5G_obj_get_linfo(const H5O_loc_t *grp_oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */
htri_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5G_obj_get_linfo, dxpl_id, grp_oloc->addr, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, grp_oloc->addr, FAIL)
/* check arguments */
HDassert(grp_oloc);
@ -388,7 +388,7 @@ H5G_obj_compact_to_dense_cb(const void *_mesg, unsigned UNUSED idx, void *_udata
H5G_obj_oh_it_ud1_t *udata = (H5G_obj_oh_it_ud1_t *)_udata; /* 'User data' passed in */
herr_t ret_value = H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_TAG(H5G_obj_compact_to_dense_cb, udata->dxpl_id, udata->oh_addr, FAIL)
FUNC_ENTER_NOAPI_NOINIT_TAG(udata->dxpl_id, udata->oh_addr, FAIL)
/* check arguments */
HDassert(lnk);
@ -423,7 +423,7 @@ H5G_obj_stab_to_new_cb(const H5O_link_t *lnk, void *_udata)
H5G_obj_stab_it_ud1_t *udata = (H5G_obj_stab_it_ud1_t *)_udata; /* 'User data' passed in */
herr_t ret_value = H5_ITER_CONT; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_obj_stab_to_new_cb)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(lnk);
@ -469,7 +469,7 @@ H5G_obj_insert(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *obj_lnk,
hbool_t use_new_dense = FALSE; /* Whether to use "dense" form of 'new format' group */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5G_obj_insert, dxpl_id, grp_oloc->addr, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, grp_oloc->addr, FAIL)
/* check arguments */
HDassert(grp_oloc && grp_oloc->file);
@ -668,7 +668,7 @@ H5G_obj_iterate(const H5O_loc_t *grp_oloc,
htri_t linfo_exists; /* Whether the link info message exists */
herr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5G_obj_iterate, dxpl_id, grp_oloc->addr, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, grp_oloc->addr, FAIL)
/* Sanity check */
HDassert(grp_oloc);
@ -739,7 +739,7 @@ H5G_obj_info(H5O_loc_t *oloc, H5G_info_t *grp_info, hid_t dxpl_id)
htri_t linfo_exists; /* Whether the link info message exists */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_obj_info, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(oloc);
@ -815,7 +815,7 @@ H5G_obj_get_name_by_idx(H5O_loc_t *oloc, H5_index_t idx_type,
htri_t linfo_exists; /* Whether the link info message exists */
ssize_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5G_obj_get_name_by_idx, dxpl_id, oloc->addr, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, oloc->addr, FAIL)
/* Sanity check */
HDassert(oloc && oloc->file);
@ -876,7 +876,7 @@ H5G_obj_remove_update_linfo(H5O_loc_t *oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_obj_remove_update_linfo)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(oloc);
@ -988,7 +988,7 @@ H5G_obj_remove(H5O_loc_t *oloc, H5RS_str_t *grp_full_path_r, const char *name, h
hbool_t use_old_format; /* Whether to use 'old format' (symbol table) for deletion or not */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5G_obj_remove, dxpl_id, oloc->addr, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, oloc->addr, FAIL)
/* Sanity check */
HDassert(oloc);
@ -1054,7 +1054,7 @@ H5G_obj_remove_by_idx(H5O_loc_t *grp_oloc, H5RS_str_t *grp_full_path_r,
hbool_t use_old_format; /* Whether to use 'old format' (symbol table) for deletion or not */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5G_obj_remove_by_idx, dxpl_id, grp_oloc->addr, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, grp_oloc->addr, FAIL)
/* Sanity check */
HDassert(grp_oloc && grp_oloc->file);
@ -1130,7 +1130,7 @@ H5G_obj_lookup(H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk,
htri_t linfo_exists; /* Whether the link info message exists */
htri_t ret_value = FALSE; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5G_obj_lookup, dxpl_id, grp_oloc->addr, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, grp_oloc->addr, FAIL)
/* check arguments */
HDassert(grp_oloc && grp_oloc->file);
@ -1185,7 +1185,7 @@ H5G_obj_lookup_by_idx(H5O_loc_t *grp_oloc, H5_index_t idx_type,
htri_t linfo_exists; /* Whether the link info message exists */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5G_obj_lookup_by_idx, dxpl_id, grp_oloc->addr, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, grp_oloc->addr, FAIL)
/* check arguments */
HDassert(grp_oloc && grp_oloc->file);

14
src/H5Goh.c
View File

@ -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);

8
src/H5Groot.c
View File

@ -101,7 +101,7 @@
H5G_t *
H5G_rootof(H5F_t *f)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_rootof)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@ -154,7 +154,7 @@ H5G_mkroot(H5F_t *f, hid_t dxpl_id, hbool_t create_root)
hbool_t path_init = FALSE; /* Whether path was initialized */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_mkroot, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@ -347,7 +347,7 @@ done:
herr_t
H5G_root_free(H5G_t *grp)
{
FUNC_ENTER_NOAPI_NOFUNC(H5G_root_free)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(grp && grp->shared);
@ -383,7 +383,7 @@ H5G_root_loc(H5F_t *f, H5G_loc_t *loc)
H5G_t *root_grp; /* Pointer to root group's info */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_root_loc, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(loc);

38
src/H5Gstab.c
View File

@ -142,7 +142,7 @@ H5G_stab_create_components(H5F_t *f, H5O_stab_t *stab, size_t size_hint, hid_t d
size_t name_offset; /* Offset of "" name */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_stab_create_components, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -210,7 +210,7 @@ H5G_stab_create(H5O_loc_t *grp_oloc, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
size_t size_hint; /* Local heap size hint */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5G_stab_create, dxpl_id, grp_oloc->addr, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, grp_oloc->addr, FAIL)
/*
* Check arguments.
@ -267,7 +267,7 @@ H5G_stab_insert_real(H5F_t *f, const H5O_stab_t *stab, const char *name,
H5G_bt_ins_t udata; /* Data to pass through B-tree */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_stab_insert_real, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
@ -322,7 +322,7 @@ H5G_stab_insert(const H5O_loc_t *grp_oloc, const char *name,
H5O_stab_t stab; /* Symbol table message */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5G_stab_insert, dxpl_id, grp_oloc->addr, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, grp_oloc->addr, FAIL)
/* check arguments */
HDassert(grp_oloc && grp_oloc->file);
@ -363,7 +363,7 @@ H5G_stab_remove(H5O_loc_t *loc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
H5G_bt_rm_t udata; /*data to pass through B-tree */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_stab_remove, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(loc && loc->file);
HDassert(name && *name);
@ -417,7 +417,7 @@ H5G_stab_remove_by_idx(H5O_loc_t *grp_oloc, hid_t dxpl_id, H5RS_str_t *grp_full_
hbool_t lnk_copied = FALSE; /* Whether the link was copied */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_stab_remove_by_idx, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(grp_oloc && grp_oloc->file);
@ -477,7 +477,7 @@ H5G_stab_delete(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab)
H5G_bt_rm_t udata; /*data to pass through B-tree */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_stab_delete, FAIL)
FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(stab);
@ -535,7 +535,7 @@ H5G_stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
H5G_link_table_t ltable = {0, NULL}; /* Link table */
herr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5G_stab_iterate, dxpl_id, oloc->addr, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, oloc->addr, FAIL)
/* Sanity check */
HDassert(oloc);
@ -624,7 +624,7 @@ H5G_stab_count(H5O_loc_t *oloc, hsize_t *num_objs, hid_t dxpl_id)
H5O_stab_t stab; /* Info about symbol table */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI_TAG(H5G_stab_count, dxpl_id, oloc->addr, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, oloc->addr, FAIL)
/* Sanity check */
HDassert(oloc);
@ -666,7 +666,7 @@ H5G_stab_bh_size(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab,
H5B_info_t bt_info; /* B-tree node info */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5G_stab_bh_size, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@ -713,7 +713,7 @@ H5G_stab_get_name_by_idx_cb(const H5G_entry_t *ent, void *_udata)
size_t name_off; /* Offset of name in heap */
const char *name; /* Pointer to name string in heap */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_stab_get_name_by_idx_cb)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ent);
@ -756,7 +756,7 @@ H5G_stab_get_name_by_idx(H5O_loc_t *oloc, H5_iter_order_t order, hsize_t n,
/* Portably clear udata struct (before FUNC_ENTER) */
HDmemset(&udata, 0, sizeof(udata));
FUNC_ENTER_NOAPI(H5G_stab_get_name_by_idx, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(oloc);
@ -840,7 +840,7 @@ H5G_stab_lookup_cb(const H5G_entry_t *ent, void *_udata)
H5G_stab_fnd_ud_t *udata = (H5G_stab_fnd_ud_t *)_udata; /* 'User data' passed in */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_stab_lookup_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Check for setting link info */
if(udata->lnk)
@ -876,7 +876,7 @@ H5G_stab_lookup(H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk,
H5O_stab_t stab; /* Symbol table message */
htri_t ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5G_stab_lookup, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(grp_oloc && grp_oloc->file);
@ -936,7 +936,7 @@ H5G_stab_lookup_by_idx_cb(const H5G_entry_t *ent, void *_udata)
const char *name; /* Pointer to name string in heap */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_stab_lookup_by_idx_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(ent);
@ -978,7 +978,7 @@ H5G_stab_lookup_by_idx(H5O_loc_t *grp_oloc, H5_iter_order_t order, hsize_t n,
H5O_stab_t stab; /* Symbol table message */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_stab_lookup_by_idx, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(grp_oloc && grp_oloc->file);
@ -1060,7 +1060,7 @@ H5G_stab_valid(H5O_loc_t *grp_oloc, hid_t dxpl_id, H5O_stab_t *alt_stab)
hbool_t changed = FALSE; /* Whether stab has been modified */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5G_stab_valid, dxpl_id, grp_oloc->addr, FAIL)
FUNC_ENTER_NOAPI_TAG(dxpl_id, grp_oloc->addr, FAIL)
/* Read the symbol table message */
if(NULL == H5O_msg_read(grp_oloc, H5O_STAB_ID, &stab, dxpl_id))
@ -1132,7 +1132,7 @@ H5G_stab_get_type_by_idx_cb(const H5G_entry_t *ent, void *_udata)
H5G_bt_it_gtbi_t *udata = (H5G_bt_it_gtbi_t *)_udata;
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_stab_get_type_by_idx_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(ent);
@ -1193,7 +1193,7 @@ H5G_stab_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx, hid_t dxpl_id)
H5G_bt_it_gtbi_t udata; /* User data for B-tree callback */
H5G_obj_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_TAG(H5G_stab_get_type_by_idx, dxpl_id, oloc->addr, H5G_UNKNOWN)
FUNC_ENTER_NOAPI_TAG(dxpl_id, oloc->addr, H5G_UNKNOWN)
/* Sanity check */
HDassert(oloc);

20
src/H5Gtest.c
View File

@ -99,7 +99,7 @@ H5G_is_empty_test(hid_t gid)
htri_t linfo_exists = FALSE;/* Indicate that the 'link info' message is present */
htri_t ret_value = TRUE; /* Return value */
FUNC_ENTER_NOAPI(H5G_is_empty_test, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Get group structure */
if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
@ -210,7 +210,7 @@ H5G_has_links_test(hid_t gid, unsigned *nmsgs)
htri_t msg_exists = 0; /* Indicate that a header message is present */
htri_t ret_value = TRUE; /* Return value */
FUNC_ENTER_NOAPI(H5G_has_links_test, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Get group structure */
if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
@ -268,7 +268,7 @@ H5G_has_stab_test(hid_t gid)
htri_t msg_exists = 0; /* Indicate that a header message is present */
htri_t ret_value = TRUE; /* Return value */
FUNC_ENTER_NOAPI(H5G_has_stab_test, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Get group structure */
if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
@ -318,7 +318,7 @@ H5G_is_new_dense_test(hid_t gid)
htri_t msg_exists = 0; /* Indicate that a header message is present */
htri_t ret_value = TRUE; /* Return value */
FUNC_ENTER_NOAPI(H5G_is_new_dense_test, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Get group structure */
if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
@ -388,7 +388,7 @@ H5G_new_dense_info_test(hid_t gid, hsize_t *name_count, hsize_t *corder_count)
H5G_t *grp = NULL; /* Pointer to group */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_new_dense_info_test, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Get group structure */
if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
@ -468,7 +468,7 @@ H5G_lheap_size_test(hid_t gid, size_t *lheap_size)
H5O_stab_t stab; /* Symbol table message */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_lheap_size_test, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Get group structure */
if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
@ -516,7 +516,7 @@ H5G_user_path_test(hid_t obj_id, char *user_path, size_t *user_path_len, unsigne
H5G_name_t *obj_path; /* Pointer to group hier. path for obj */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_user_path_test, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(user_path_len);
@ -609,7 +609,7 @@ H5G_verify_cached_stab_test(H5O_loc_t *grp_oloc, H5G_entry_t *ent)
H5HL_t *heap = NULL; /* Pointer to local heap */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_TAG(H5G_verify_cached_stab_test, H5AC_ind_dxpl_id, grp_oloc->addr, FAIL)
FUNC_ENTER_NOAPI_NOINIT_TAG(H5AC_ind_dxpl_id, grp_oloc->addr, FAIL)
/* Verify that stab info is cached in ent */
if(ent->type != H5G_CACHED_STAB)
@ -670,7 +670,7 @@ H5G_verify_cached_stabs_test_cb(H5F_t *f, hid_t dxpl_id,
unsigned i;
int ret_value = H5_ITER_CONT;
FUNC_ENTER_NOAPI(H5G_verify_cached_stabs_test_cb, H5_ITER_ERROR)
FUNC_ENTER_NOAPI(H5_ITER_ERROR)
/*
* Check arguments.
@ -765,7 +765,7 @@ H5G_verify_cached_stabs_test(hid_t gid)
haddr_t prev_tag = HADDR_UNDEF; /* Previous metadata tag */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_verify_cached_stabs_test, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(gid >= 0);

12
src/H5Gtraverse.c
View File

@ -126,7 +126,7 @@ H5G_traverse_slink_cb(H5G_loc_t UNUSED *grp_loc, const char UNUSED *name,
H5G_trav_slink_t *udata = (H5G_trav_slink_t *)_udata; /* User data passed in */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_traverse_slink_cb)
FUNC_ENTER_NOAPI_NOINIT
/* Check for dangling soft link */
if(obj_loc == NULL) {
@ -182,7 +182,7 @@ H5G_traverse_ud(const H5G_loc_t *grp_loc/*in,out*/, const H5O_link_t *lnk,
hid_t cur_grp = (-1);
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_traverse_ud)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(grp_loc);
@ -324,7 +324,7 @@ H5G_traverse_slink(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
hbool_t tmp_grp_loc_set = FALSE; /* Flag to indicate that tmp group location is initialized */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_traverse_slink)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(grp_loc);
@ -399,7 +399,7 @@ H5G_traverse_special(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_traverse_special, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(grp_loc);
@ -502,7 +502,7 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
hbool_t last_comp = FALSE; /* Flag to indicate that a component is the last component in the name */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5G_traverse_real)
FUNC_ENTER_NOAPI_NOINIT
/* Check parameters */
HDassert(_loc);
@ -835,7 +835,7 @@ H5G_traverse(const H5G_loc_t *loc, const char *name, unsigned target, H5G_traver
H5P_genplist_t *lapl; /* Property list with value for nlinks */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5G_traverse, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/* Check args */
if(!name || !*name)

28
src/H5HF.c
View File

@ -99,7 +99,7 @@ H5FL_DEFINE_STATIC(H5HF_t);
herr_t
H5HF_op_read(const void *obj, size_t obj_len, void *op_data)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_op_read)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Perform "read", using memcpy() */
HDmemcpy(op_data, obj, obj_len);
@ -124,7 +124,7 @@ H5HF_op_read(const void *obj, size_t obj_len, void *op_data)
herr_t
H5HF_op_write(const void *obj, size_t obj_len, void *op_data)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_op_write)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Perform "write", using memcpy() */
HDmemcpy((void *)obj, op_data, obj_len); /* Casting away const OK -QAK */
@ -155,7 +155,7 @@ H5HF_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam)
haddr_t fh_addr; /* Heap header address */
H5HF_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5HF_create, NULL)
FUNC_ENTER_NOAPI(NULL)
#ifdef QAK
HDfprintf(stderr, "%s: Called\n", FUNC);
#endif /* QAK */
@ -225,7 +225,7 @@ H5HF_open(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr)
H5HF_hdr_t *hdr = NULL; /* The fractal heap header information */
H5HF_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI(H5HF_open, NULL)
FUNC_ENTER_NOAPI(NULL)
/*
* Check arguments.
@ -293,7 +293,7 @@ done:
herr_t
H5HF_get_id_len(H5HF_t *fh, size_t *id_len_p)
{
FUNC_ENTER_NOAPI_NOFUNC(H5HF_get_id_len)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@ -324,7 +324,7 @@ H5HF_get_id_len(H5HF_t *fh, size_t *id_len_p)
herr_t
H5HF_get_heap_addr(const H5HF_t *fh, haddr_t *heap_addr_p)
{
FUNC_ENTER_NOAPI_NOFUNC(H5HF_get_heap_addr)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@ -360,7 +360,7 @@ H5HF_insert(H5HF_t *fh, hid_t dxpl_id, size_t size, const void *obj,
H5HF_hdr_t *hdr = NULL; /* The fractal heap header information */
herr_t ret_value = SUCCEED;
FUNC_ENTER_NOAPI(H5HF_insert, FAIL)
FUNC_ENTER_NOAPI(FAIL)
#ifdef QAK
HDfprintf(stderr, "%s: size = %Zu\n", FUNC, size);
#endif /* QAK */
@ -433,7 +433,7 @@ H5HF_get_obj_len(H5HF_t *fh, hid_t dxpl_id, const void *_id, size_t *obj_len_p)
uint8_t id_flags; /* Heap ID flag bits */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5HF_get_obj_len, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -501,7 +501,7 @@ H5HF_read(H5HF_t *fh, hid_t dxpl_id, const void *_id, void *obj/*out*/)
uint8_t id_flags; /* Heap ID flag bits */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5HF_read, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -579,7 +579,7 @@ H5HF_write(H5HF_t *fh, hid_t dxpl_id, void *_id, hbool_t UNUSED *id_changed,
uint8_t id_flags; /* Heap ID flag bits */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5HF_write, FAIL)
FUNC_ENTER_NOAPI(FAIL)
#ifdef QAK
HDfprintf(stderr, "%s: Called\n", FUNC);
#endif /* QAK */
@ -654,7 +654,7 @@ H5HF_op(H5HF_t *fh, hid_t dxpl_id, const void *_id, H5HF_operator_t op,
uint8_t id_flags; /* Heap ID flag bits */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5HF_op, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -719,7 +719,7 @@ H5HF_remove(H5HF_t *fh, hid_t dxpl_id, const void *_id)
uint8_t id_flags; /* Heap ID flag bits */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5HF_remove, FAIL)
FUNC_ENTER_NOAPI(FAIL)
#ifdef QAK
HDfprintf(stderr, "%s: Called\n", FUNC);
#endif /* QAK */
@ -787,7 +787,7 @@ H5HF_close(H5HF_t *fh, hid_t dxpl_id)
haddr_t heap_addr = HADDR_UNDEF; /* Address of heap (for deletion) */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5HF_close, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@ -891,7 +891,7 @@ H5HF_delete(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr)
H5HF_hdr_t *hdr = NULL; /* The fractal heap header information */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5HF_delete, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.

60
src/H5HFbtree2.c
View File

@ -211,7 +211,7 @@ H5HF_huge_bt2_crt_context(void *_f)
H5HF_huge_bt2_ctx_t *ctx; /* Callback context structure */
void *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_bt2_crt_context)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@ -252,7 +252,7 @@ H5HF_huge_bt2_dst_context(void *_ctx)
{
H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_dst_context)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@ -283,7 +283,7 @@ H5HF_huge_bt2_crt_dbg_context(H5F_t *f, hid_t UNUSED dxpl_id, haddr_t UNUSED add
H5HF_huge_bt2_ctx_t *ctx; /* Callback context structure */
void *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_bt2_crt_dbg_context)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@ -321,7 +321,7 @@ done:
herr_t
H5HF_huge_bt2_indir_found(const void *nrecord, void *op_data)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_indir_found)
FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef QAK
HDfprintf(stderr, "%s: nrecord = {%a, %Hu, %Hu}\n", "H5HF_huge_bt2_indir_found",
@ -355,7 +355,7 @@ H5HF_huge_bt2_indir_remove(const void *nrecord, void *_udata)
H5HF_huge_remove_ud1_t *udata = (H5HF_huge_remove_ud1_t *)_udata; /* User callback data */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_bt2_indir_remove)
FUNC_ENTER_NOAPI_NOINIT
/* Free the space in the file for the object being removed */
if(H5MF_xfree(udata->hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, udata->dxpl_id, ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->addr, ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->len) < 0)
@ -385,7 +385,7 @@ done:
static herr_t
H5HF_huge_bt2_indir_store(void *nrecord, const void *udata)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_indir_store)
FUNC_ENTER_NOAPI_NOINIT_NOERR
*(H5HF_huge_bt2_indir_rec_t *)nrecord = *(const H5HF_huge_bt2_indir_rec_t *)udata;
@ -410,7 +410,7 @@ H5HF_huge_bt2_indir_store(void *nrecord, const void *udata)
static herr_t
H5HF_huge_bt2_indir_compare(const void *_rec1, const void *_rec2)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_indir_compare)
FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef QAK
{
@ -444,7 +444,7 @@ H5HF_huge_bt2_indir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
const H5HF_huge_bt2_indir_rec_t *nrecord = (const H5HF_huge_bt2_indir_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_indir_encode)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@ -477,7 +477,7 @@ H5HF_huge_bt2_indir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
H5HF_huge_bt2_indir_rec_t *nrecord = (H5HF_huge_bt2_indir_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_indir_decode)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@ -511,7 +511,7 @@ H5HF_huge_bt2_indir_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED dxpl
{
const H5HF_huge_bt2_indir_rec_t *nrecord = (const H5HF_huge_bt2_indir_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_indir_debug)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDfprintf(stream, "%*s%-*s {%a, %Hu, %Hu}\n", indent, "", fwidth, "Record:",
nrecord->addr, nrecord->len, nrecord->id);
@ -537,7 +537,7 @@ H5HF_huge_bt2_indir_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED dxpl
herr_t
H5HF_huge_bt2_filt_indir_found(const void *nrecord, void *op_data)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_indir_found)
FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef QAK
HDfprintf(stderr, "%s: nrecord = {%a, %Hu, %x, %Hu, %Hu}\n", "H5HF_huge_bt2_filt_indir_found",
@ -573,7 +573,7 @@ H5HF_huge_bt2_filt_indir_remove(const void *nrecord, void *_udata)
H5HF_huge_remove_ud1_t *udata = (H5HF_huge_remove_ud1_t *)_udata; /* User callback data */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_bt2_filt_indir_remove)
FUNC_ENTER_NOAPI_NOINIT
/* Free the space in the file for the object being removed */
if(H5MF_xfree(udata->hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, udata->dxpl_id, ((const H5HF_huge_bt2_filt_indir_rec_t *)nrecord)->addr, ((const H5HF_huge_bt2_filt_indir_rec_t *)nrecord)->len) < 0)
@ -603,7 +603,7 @@ done:
static herr_t
H5HF_huge_bt2_filt_indir_store(void *nrecord, const void *udata)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_indir_store)
FUNC_ENTER_NOAPI_NOINIT_NOERR
*(H5HF_huge_bt2_filt_indir_rec_t *)nrecord = *(const H5HF_huge_bt2_filt_indir_rec_t *)udata;
@ -628,7 +628,7 @@ H5HF_huge_bt2_filt_indir_store(void *nrecord, const void *udata)
static herr_t
H5HF_huge_bt2_filt_indir_compare(const void *_rec1, const void *_rec2)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_indir_compare)
FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef QAK
{
@ -662,7 +662,7 @@ H5HF_huge_bt2_filt_indir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
const H5HF_huge_bt2_filt_indir_rec_t *nrecord = (const H5HF_huge_bt2_filt_indir_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_indir_encode)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@ -697,7 +697,7 @@ H5HF_huge_bt2_filt_indir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
H5HF_huge_bt2_filt_indir_rec_t *nrecord = (H5HF_huge_bt2_filt_indir_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_indir_decode)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@ -733,7 +733,7 @@ H5HF_huge_bt2_filt_indir_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED
{
const H5HF_huge_bt2_filt_indir_rec_t *nrecord = (const H5HF_huge_bt2_filt_indir_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_indir_debug)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDfprintf(stream, "%*s%-*s {%a, %Hu, %x, %Hu, %Hu}\n", indent, "", fwidth, "Record:",
nrecord->addr, nrecord->len, nrecord->filter_mask, nrecord->obj_size, nrecord->id);
@ -762,7 +762,7 @@ H5HF_huge_bt2_dir_remove(const void *nrecord, void *_udata)
H5HF_huge_remove_ud1_t *udata = (H5HF_huge_remove_ud1_t *)_udata; /* User callback data */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_bt2_dir_remove)
FUNC_ENTER_NOAPI_NOINIT
/* Free the space in the file for the object being removed */
if(H5MF_xfree(udata->hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, udata->dxpl_id, ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->addr, ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->len) < 0)
@ -792,7 +792,7 @@ done:
static herr_t
H5HF_huge_bt2_dir_store(void *nrecord, const void *udata)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_dir_store)
FUNC_ENTER_NOAPI_NOINIT_NOERR
*(H5HF_huge_bt2_dir_rec_t *)nrecord = *(const H5HF_huge_bt2_dir_rec_t *)udata;
@ -821,7 +821,7 @@ H5HF_huge_bt2_dir_compare(const void *_rec1, const void *_rec2)
const H5HF_huge_bt2_dir_rec_t *rec2 = (const H5HF_huge_bt2_dir_rec_t *)_rec2;
herr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_dir_compare)
FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef QAK
HDfprintf(stderr, "%s: rec1 = {%a, %Hu}\n", "H5HF_huge_bt2_dir_compare", rec1->addr, rec1->len);
@ -861,7 +861,7 @@ H5HF_huge_bt2_dir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
const H5HF_huge_bt2_dir_rec_t *nrecord = (const H5HF_huge_bt2_dir_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_dir_encode)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@ -893,7 +893,7 @@ H5HF_huge_bt2_dir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
H5HF_huge_bt2_dir_rec_t *nrecord = (H5HF_huge_bt2_dir_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_dir_decode)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@ -926,7 +926,7 @@ H5HF_huge_bt2_dir_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED dxpl_i
{
const H5HF_huge_bt2_dir_rec_t *nrecord = (const H5HF_huge_bt2_dir_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_dir_debug)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDfprintf(stream, "%*s%-*s {%a, %Hu}\n", indent, "", fwidth, "Record:",
nrecord->addr, nrecord->len);
@ -952,7 +952,7 @@ H5HF_huge_bt2_dir_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED dxpl_i
herr_t
H5HF_huge_bt2_filt_dir_found(const void *nrecord, void *op_data)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_dir_found)
FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef QAK
HDfprintf(stderr, "%s: nrecord = {%a, %Hu, %x, %Hu}\n", "H5HF_huge_bt2_filt_dir_found",
@ -987,7 +987,7 @@ H5HF_huge_bt2_filt_dir_remove(const void *nrecord, void *_udata)
H5HF_huge_remove_ud1_t *udata = (H5HF_huge_remove_ud1_t *)_udata; /* User callback data */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_bt2_filt_dir_remove)
FUNC_ENTER_NOAPI_NOINIT
/* Free the space in the file for the object being removed */
if(H5MF_xfree(udata->hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, udata->dxpl_id, ((const H5HF_huge_bt2_filt_dir_rec_t *)nrecord)->addr, ((const H5HF_huge_bt2_filt_dir_rec_t *)nrecord)->len) < 0)
@ -1017,7 +1017,7 @@ done:
static herr_t
H5HF_huge_bt2_filt_dir_store(void *nrecord, const void *udata)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_dir_store)
FUNC_ENTER_NOAPI_NOINIT_NOERR
*(H5HF_huge_bt2_filt_dir_rec_t *)nrecord = *(const H5HF_huge_bt2_filt_dir_rec_t *)udata;
@ -1046,7 +1046,7 @@ H5HF_huge_bt2_filt_dir_compare(const void *_rec1, const void *_rec2)
const H5HF_huge_bt2_filt_dir_rec_t *rec2 = (const H5HF_huge_bt2_filt_dir_rec_t *)_rec2;
herr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_dir_compare)
FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef QAK
HDfprintf(stderr, "%s: rec1 = {%a, %Hu, %x, %Hu}\n", "H5HF_huge_bt2_filt_dir_compare", rec1->addr, rec1->len, rec1->filter_mask, rec1->obj_size);
@ -1086,7 +1086,7 @@ H5HF_huge_bt2_filt_dir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
const H5HF_huge_bt2_filt_dir_rec_t *nrecord = (const H5HF_huge_bt2_filt_dir_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_dir_encode)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@ -1120,7 +1120,7 @@ H5HF_huge_bt2_filt_dir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
H5HF_huge_bt2_filt_dir_rec_t *nrecord = (H5HF_huge_bt2_filt_dir_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_dir_decode)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@ -1154,7 +1154,7 @@ H5HF_huge_bt2_filt_dir_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED d
{
const H5HF_huge_bt2_filt_dir_rec_t *nrecord = (const H5HF_huge_bt2_filt_dir_rec_t *)_nrecord;
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_dir_debug)
FUNC_ENTER_NOAPI_NOINIT_NOERR
HDfprintf(stream, "%*s%-*s {%a, %Hu, %x, %Hu}\n", indent, "", fwidth, "Record:",
nrecord->addr, nrecord->len, nrecord->filter_mask, nrecord->obj_size);

34
src/H5HFcache.c
View File

@ -166,7 +166,7 @@ H5FL_BLK_DEFINE(direct_block);
static herr_t
H5HF_dtable_decode(H5F_t *f, const uint8_t **pp, H5HF_dtable_t *dtable)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dtable_decode)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(f);
@ -216,7 +216,7 @@ H5HF_dtable_decode(H5F_t *f, const uint8_t **pp, H5HF_dtable_t *dtable)
static herr_t
H5HF_dtable_encode(H5F_t *f, uint8_t **pp, const H5HF_dtable_t *dtable)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dtable_encode)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(f);
@ -277,7 +277,7 @@ H5HF_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
uint8_t heap_flags; /* Status flags for heap */
H5HF_hdr_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_hdr_load)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@ -457,7 +457,7 @@ H5HF_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5H
uint8_t hdr_buf[H5HF_HDR_BUF_SIZE]; /* Buffer for header */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_hdr_flush)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@ -589,7 +589,7 @@ H5HF_cache_hdr_dest(H5F_t *f, H5HF_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_hdr_dest)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -635,7 +635,7 @@ H5HF_cache_hdr_clear(H5F_t *f, H5HF_hdr_t *hdr, hbool_t destroy)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_hdr_clear)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -672,7 +672,7 @@ done:
static herr_t
H5HF_cache_hdr_size(const H5F_t UNUSED *f, const H5HF_hdr_t *hdr, size_t *size_ptr)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_cache_hdr_size)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(f);
@ -717,7 +717,7 @@ H5HF_cache_iblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
unsigned u; /* Local index variable */
H5HF_indirect_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_iblock_load)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@ -909,7 +909,7 @@ H5HF_cache_iblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
uint8_t iblock_buf[H5HF_IBLOCK_BUF_SIZE]; /* Buffer for indirect block */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_iblock_flush)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@ -1094,7 +1094,7 @@ H5HF_cache_iblock_dest(H5F_t *f, H5HF_indirect_t *iblock)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_iblock_dest)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -1145,7 +1145,7 @@ H5HF_cache_iblock_clear(H5F_t *f, H5HF_indirect_t *iblock, hbool_t destroy)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_iblock_clear)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -1182,7 +1182,7 @@ done:
static herr_t
H5HF_cache_iblock_size(const H5F_t UNUSED *f, const H5HF_indirect_t *iblock, size_t *size_ptr)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_cache_iblock_size)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(iblock);
@ -1221,7 +1221,7 @@ H5HF_cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
haddr_t heap_addr; /* Address of heap header in the file */
H5HF_direct_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_dblock_load)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@ -1391,7 +1391,7 @@ H5HF_cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_dblock_flush)
FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@ -1664,7 +1664,7 @@ H5HF_cache_dblock_dest(H5F_t *f, H5HF_direct_t *dblock)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_dblock_dest)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -1716,7 +1716,7 @@ H5HF_cache_dblock_clear(H5F_t *f, H5HF_direct_t *dblock, hbool_t destroy)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_dblock_clear)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -1753,7 +1753,7 @@ done:
static herr_t
H5HF_cache_dblock_size(const H5F_t UNUSED *f, const H5HF_direct_t *dblock, size_t *size_ptr)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_cache_dblock_size)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(dblock);

14
src/H5HFdbg.c
View File

@ -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.
@ -524,7 +524,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.
@ -653,7 +653,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.
@ -708,7 +708,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.

14
src/H5HFdblock.c
View File

@ -102,7 +102,7 @@ H5HF_man_dblock_create(hid_t dxpl_id, H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblo
size_t free_space; /* Free space in new block */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_man_dblock_create)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -228,7 +228,7 @@ H5HF_man_dblock_destroy(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_direct_t *dblock,
unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting indirect block */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_man_dblock_destroy)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -342,7 +342,7 @@ H5HF_man_dblock_new(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t request,
size_t min_dblock_size; /* Min. size of direct block to allocate */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_man_dblock_new)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -441,7 +441,7 @@ H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr,
H5HF_dblock_cache_ud_t udata; /* parent and other infor for deserializing direct block */
H5HF_direct_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_man_dblock_protect)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -520,7 +520,7 @@ H5HF_man_dblock_locate(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t obj_off,
unsigned entry; /* Entry of block */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_man_dblock_locate)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -621,7 +621,7 @@ H5HF_man_dblock_delete(H5F_t *f, hid_t dxpl_id, haddr_t dblock_addr,
unsigned dblock_status = 0; /* Direct block's status in the metadata cache */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_man_dblock_delete)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -688,7 +688,7 @@ H5HF_man_dblock_dest(H5HF_direct_t *dblock)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_man_dblock_dest)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.

12
src/H5HFdtable.c
View File

@ -96,7 +96,7 @@ H5HF_dtable_init(H5HF_dtable_t *dtable)
size_t u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_dtable_init)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -153,7 +153,7 @@ done:
herr_t
H5HF_dtable_lookup(const H5HF_dtable_t *dtable, hsize_t off, unsigned *row, unsigned *col)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dtable_lookup)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@ -201,7 +201,7 @@ HDfprintf(stderr, "%s: high_bit = %u, off_mask = %Hu\n", "H5HF_dtable_lookup", h
herr_t
H5HF_dtable_dest(H5HF_dtable_t *dtable)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dtable_dest)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@ -242,7 +242,7 @@ H5HF_dtable_size_to_row(const H5HF_dtable_t *dtable, size_t block_size)
{
unsigned row; /* Row where block will fit */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dtable_size_to_row)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@ -276,7 +276,7 @@ H5HF_dtable_size_to_rows(const H5HF_dtable_t *dtable, hsize_t size)
{
unsigned rows; /* # of rows required for indirect block */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dtable_size_to_rows)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@ -312,7 +312,7 @@ H5HF_dtable_span_size(const H5HF_dtable_t *dtable, unsigned start_row,
unsigned end_entry; /* Entry for last block covered */
hsize_t acc_span_size; /* Accumulated span size */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dtable_span_size)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.

48
src/H5HFhdr.c
View File

@ -112,7 +112,7 @@ H5HF_hdr_alloc(H5F_t *f)
H5HF_hdr_t *hdr = NULL; /* Shared fractal heap header */
H5HF_hdr_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_alloc)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -160,7 +160,7 @@ H5HF_hdr_compute_free_space(H5HF_hdr_t *hdr, unsigned iblock_row)
unsigned curr_row; /* Current row in block */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_hdr_compute_free_space)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@ -210,7 +210,7 @@ H5HF_hdr_finish_init_phase1(H5HF_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_finish_init_phase1)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -250,7 +250,7 @@ H5HF_hdr_finish_init_phase2(H5HF_hdr_t *hdr)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_finish_init_phase2)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -304,7 +304,7 @@ H5HF_hdr_finish_init(H5HF_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_finish_init)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -344,7 +344,7 @@ H5HF_hdr_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam)
size_t dblock_overhead; /* Direct block's overhead */
haddr_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_create)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -535,7 +535,7 @@ H5HF_hdr_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw)
H5HF_hdr_t *hdr; /* Fractal heap header */
H5HF_hdr_t *ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_protect)
FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@ -581,7 +581,7 @@ H5HF_hdr_incr(H5HF_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_incr)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@ -617,7 +617,7 @@ H5HF_hdr_decr(H5HF_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_decr)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@ -654,7 +654,7 @@ done:
herr_t
H5HF_hdr_fuse_incr(H5HF_hdr_t *hdr)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_hdr_fuse_incr)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(hdr);
@ -682,7 +682,7 @@ H5HF_hdr_fuse_incr(H5HF_hdr_t *hdr)
size_t
H5HF_hdr_fuse_decr(H5HF_hdr_t *hdr)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_hdr_fuse_decr)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(hdr);
@ -713,7 +713,7 @@ H5HF_hdr_dirty(H5HF_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_dirty)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@ -751,7 +751,7 @@ H5HF_hdr_adj_free(H5HF_hdr_t *hdr, ssize_t amt)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_adj_free)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -789,7 +789,7 @@ H5HF_hdr_adjust_heap(H5HF_hdr_t *hdr, hsize_t new_size, hssize_t extra_free)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_adjust_heap)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -827,7 +827,7 @@ done:
herr_t
H5HF_hdr_inc_alloc(H5HF_hdr_t *hdr, size_t alloc_size)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_hdr_inc_alloc)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@ -860,7 +860,7 @@ H5HF_hdr_start_iter(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock, hsize_t curr_off,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_start_iter)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -898,7 +898,7 @@ H5HF_hdr_reset_iter(H5HF_hdr_t *hdr, hsize_t curr_off)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_reset_iter)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -938,7 +938,7 @@ H5HF_hdr_skip_blocks(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_indirect_t *iblock,
hsize_t sect_size; /* Size of section in heap space */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_skip_blocks)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -987,7 +987,7 @@ H5HF_hdr_update_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_size)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_update_iter)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -1166,7 +1166,7 @@ H5HF_hdr_inc_iter(H5HF_hdr_t *hdr, hsize_t adv_size, unsigned nentries)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_inc_iter)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -1210,7 +1210,7 @@ H5HF_hdr_reverse_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr)
hbool_t walked_up; /* Loop flag */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_reverse_iter)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -1351,7 +1351,7 @@ H5HF_hdr_empty(H5HF_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_empty)
FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@ -1399,7 +1399,7 @@ H5HF_hdr_free(H5HF_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_free)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -1442,7 +1442,7 @@ H5HF_hdr_delete(H5HF_hdr_t *hdr, hid_t dxpl_id)
unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting heap header */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI(H5HF_hdr_delete, FAIL)
FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.

24
src/H5HFhuge.c
View File

@ -108,7 +108,7 @@ H5HF_huge_bt2_create(H5HF_hdr_t *hdr, hid_t dxpl_id)
H5B2_create_t bt2_cparam; /* v2 B-tree creation parameters */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_bt2_create)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -185,7 +185,7 @@ done:
herr_t
H5HF_huge_init(H5HF_hdr_t *hdr)
{
FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_init)
FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@ -263,7 +263,7 @@ H5HF_huge_new_id(H5HF_hdr_t *hdr)
hsize_t new_id; /* New object's ID */
hsize_t ret_value; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_new_id)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -316,7 +316,7 @@ H5HF_huge_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, void *obj,
unsigned filter_mask = 0; /* Filter mask for object (only used for filtered objects) */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_insert)
FUNC_ENTER_NOAPI_NOINIT
#ifdef QAK
HDfprintf(stderr, "%s: obj_size = %Zu\n", FUNC, obj_size);
#endif /* QAK */
@ -511,7 +511,7 @@ H5HF_huge_get_obj_len(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_get_obj_len)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -607,7 +607,7 @@ H5HF_huge_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
unsigned filter_mask = 0; /* Filter mask for object (only used for filtered objects) */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_op_real)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -752,7 +752,7 @@ H5HF_huge_write(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
size_t obj_size; /* Object's size in the file */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_write)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -828,7 +828,7 @@ H5HF_huge_read(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, void *obj)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_read)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -865,7 +865,7 @@ H5HF_huge_op(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_op)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -902,7 +902,7 @@ H5HF_huge_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id)
H5HF_huge_remove_ud1_t udata; /* User callback data for v2 B-tree remove call */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_remove)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -1010,7 +1010,7 @@ H5HF_huge_term(H5HF_hdr_t *hdr, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_term)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@ -1076,7 +1076,7 @@ H5HF_huge_delete(H5HF_hdr_t *hdr, hid_t dxpl_id)
H5B2_remove_t op; /* Callback for v2 B-tree removal */
herr_t ret_value = SUCCEED; /* Return value */
FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_delete)
FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.

Some files were not shown because too many files have changed in this diff Show More