summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/H5.c6
-rw-r--r--src/H5A.c18
-rw-r--r--src/H5AC.c8
-rw-r--r--src/H5B.c16
-rw-r--r--src/H5D.c32
-rw-r--r--src/H5DZ.c2
-rw-r--r--src/H5Dcontig.c3
-rw-r--r--src/H5Dio.c32
-rw-r--r--src/H5Distore.c22
-rw-r--r--src/H5E.c12
-rw-r--r--src/H5F.c60
-rw-r--r--src/H5FD.c14
-rw-r--r--src/H5FDfphdf5.c4
-rw-r--r--src/H5FDmpio.c4
-rw-r--r--src/H5FDstream.c4
-rw-r--r--src/H5FL.c32
-rw-r--r--src/H5FPclient.c4
-rw-r--r--src/H5FPserver.c64
-rw-r--r--src/H5Fcontig.c3
-rw-r--r--src/H5Fistore.c22
-rw-r--r--src/H5Fprivate.h3
-rw-r--r--src/H5G.c26
-rw-r--r--src/H5Gnode.c10
-rw-r--r--src/H5HG.c6
-rw-r--r--src/H5HL.c12
-rw-r--r--src/H5HP.c8
-rw-r--r--src/H5I.c8
-rw-r--r--src/H5MM.c20
-rw-r--r--src/H5O.c42
-rw-r--r--src/H5Odtype.c4
-rw-r--r--src/H5P.c74
-rw-r--r--src/H5R.c12
-rw-r--r--src/H5RS.c4
-rw-r--r--src/H5S.c4
-rw-r--r--src/H5ST.c12
-rw-r--r--src/H5Sall.c14
-rw-r--r--src/H5Shyper.c102
-rw-r--r--src/H5Smpio.c10
-rw-r--r--src/H5Snone.c14
-rw-r--r--src/H5Spoint.c20
-rw-r--r--src/H5Sselect.c8
-rw-r--r--src/H5T.c22
-rw-r--r--src/H5TB.c22
-rw-r--r--src/H5Tarray.c2
-rw-r--r--src/H5Tbit.c8
-rw-r--r--src/H5Tcommit.c6
-rw-r--r--src/H5Tcompound.c4
-rw-r--r--src/H5Tconv.c4
-rw-r--r--src/H5Tcset.c2
-rw-r--r--src/H5Tenum.c2
-rw-r--r--src/H5Tfields.c2
-rw-r--r--src/H5Tfixed.c2
-rw-r--r--src/H5Tfloat.c2
-rw-r--r--src/H5Tnative.c2
-rw-r--r--src/H5Toffset.c2
-rw-r--r--src/H5Topaque.c2
-rw-r--r--src/H5Torder.c2
-rw-r--r--src/H5Tpad.c2
-rw-r--r--src/H5Tprecis.c2
-rw-r--r--src/H5Tstrpad.c2
-rw-r--r--src/H5Tvlen.c38
-rw-r--r--src/H5V.c14
-rw-r--r--src/H5Vprivate.h20
-rw-r--r--src/H5Z.c6
-rw-r--r--src/H5Zfletcher32.c2
-rw-r--r--src/H5detect.c2
-rw-r--r--src/H5private.h86
67 files changed, 521 insertions, 514 deletions
diff --git a/src/H5.c b/src/H5.c
index 12a2964..712e6c6 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -187,8 +187,8 @@ H5_term_library(void)
#ifdef H5_HAVE_THREADSAFE
/* explicit locking of the API */
- H5_FIRST_THREAD_INIT;
- H5_LOCK_API_MUTEX;
+ H5_FIRST_THREAD_INIT
+ H5_API_LOCK
#endif
/* Don't do anything if the library is already closed */
@@ -284,7 +284,7 @@ H5_term_library(void)
H5_INIT_GLOBAL = FALSE;
done:
#ifdef H5_HAVE_THREADSAFE
- H5_UNLOCK_API_MUTEX;
+ H5_API_UNLOCK
#endif
return;
}
diff --git a/src/H5A.c b/src/H5A.c
index f60c0ac..48add49 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -63,7 +63,7 @@ H5A_init_interface(void)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5A_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT(H5A_init_interface)
/*
* Create attribute group.
@@ -97,7 +97,7 @@ H5A_term_interface(void)
{
int n=0;
- FUNC_ENTER_NOINIT(H5A_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_term_interface)
if (interface_initialize_g) {
if ((n=H5I_nmembers(H5I_ATTR))) {
@@ -218,7 +218,7 @@ H5A_create(const H5G_entry_t *ent, const char *name, const H5T_t *type,
int seq=0;
hid_t ret_value = FAIL;
- FUNC_ENTER_NOINIT(H5A_create)
+ FUNC_ENTER_NOAPI_NOINIT(H5A_create)
/* check args */
assert(ent);
@@ -341,7 +341,7 @@ H5A_get_index(H5G_entry_t *ent, const char *name, hid_t dxpl_id)
int i; /* Index variable */
int ret_value=FAIL; /* Return value */
- FUNC_ENTER_NOINIT(H5A_get_index)
+ FUNC_ENTER_NOAPI_NOINIT(H5A_get_index)
assert(ent);
assert(name);
@@ -509,7 +509,7 @@ H5A_open(H5G_entry_t *ent, unsigned idx, hid_t dxpl_id)
H5A_t *attr = NULL;
hid_t ret_value = FAIL;
- FUNC_ENTER_NOINIT(H5A_open)
+ FUNC_ENTER_NOAPI_NOINIT(H5A_open)
/* check args */
assert(ent);
@@ -622,7 +622,7 @@ H5A_write(H5A_t *attr, const H5T_t *mem_type, const void *buf, hid_t dxpl_id)
int idx; /* index of attribute in object header */
herr_t ret_value = FAIL;
- FUNC_ENTER_NOINIT(H5A_write)
+ FUNC_ENTER_NOAPI_NOINIT(H5A_write)
assert(attr);
assert(mem_type);
@@ -768,7 +768,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 = FAIL;
- FUNC_ENTER_NOINIT(H5A_read)
+ FUNC_ENTER_NOAPI_NOINIT(H5A_read)
assert(attr);
assert(mem_type);
@@ -1072,7 +1072,7 @@ H5A_get_storage_size(const H5A_t *attr)
{
hsize_t ret_value; /* Return value */
- FUNC_ENTER_NOINIT(H5A_get_storage_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_get_storage_size)
/* Set return value */
ret_value = attr->data_size;
@@ -1204,7 +1204,7 @@ H5A_rename(H5G_entry_t *ent, const char *old_name, const char *new_name, hid_t d
H5A_t *found_attr; /* Attribute with OLD_NAME */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5A_rename)
+ FUNC_ENTER_NOAPI_NOINIT(H5A_rename)
/* Check arguments */
assert(ent);
diff --git a/src/H5AC.c b/src/H5AC.c
index 6361b0e..0ea967b 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -197,7 +197,7 @@ H5AC_init_interface(void)
#endif /* H5_HAVE_PARALLEL */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5AC_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT(H5AC_init_interface)
/* Sanity check */
assert(H5P_CLS_DATASET_XFER_g!=(-1));
@@ -305,7 +305,7 @@ H5AC_term_interface(void)
{
int n=0;
- FUNC_ENTER_NOINIT(H5AC_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_term_interface)
if (interface_initialize_g) {
if(H5AC_dxpl_id>0 || H5AC_noblock_dxpl_id>0 || H5AC_ind_dxpl_id>0) {
@@ -486,8 +486,8 @@ H5AC_compare(const void *_a, const void *_b)
H5AC_info_t *slot_b;
int ret_value=0;
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5AC_compare)
+ /* Use FUNC_ENTER_NOAPI_NOINIT here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_compare)
assert(current_cache_g);
diff --git a/src/H5B.c b/src/H5B.c
index 1d24ded..87e04ac 100644
--- a/src/H5B.c
+++ b/src/H5B.c
@@ -568,7 +568,7 @@ done:
static herr_t
H5B_dest(H5F_t UNUSED *f, H5B_t *bt)
{
- FUNC_ENTER_NOINIT(H5B_dest)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B_dest)
/*
* Check arguments.
@@ -609,7 +609,7 @@ H5B_clear(H5F_t *f, H5B_t *bt, hbool_t destroy)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5B_clear)
+ FUNC_ENTER_NOAPI_NOINIT(H5B_clear)
/*
* Check arguments.
@@ -650,7 +650,7 @@ H5B_size(H5F_t *f, H5B_t *bt)
{
size_t ret_value = 0;
- FUNC_ENTER_NOINIT(H5B_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B_size)
/* check args */
assert(f);
@@ -804,7 +804,7 @@ H5B_split(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, H5B_t *old_bt, haddr
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5B_split)
+ FUNC_ENTER_NOAPI_NOINIT(H5B_split)
/*
* Check arguments.
@@ -954,7 +954,7 @@ H5B_decode_key(H5F_t *f, H5B_t *bt, unsigned idx)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5B_decode_key)
+ FUNC_ENTER_NOAPI_NOINIT(H5B_decode_key)
assert(bt->key[idx].dirty==0);
@@ -986,7 +986,7 @@ H5B_decode_keys(H5F_t *f, H5B_t *bt, unsigned idx)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5B_decode_keys)
+ FUNC_ENTER_NOAPI_NOINIT(H5B_decode_keys)
assert(f);
assert(bt);
@@ -1231,7 +1231,7 @@ H5B_insert_child(const H5F_t *f, const H5B_class_t *type, H5B_t *bt,
size_t recsize;
unsigned u; /* Local index variable */
- FUNC_ENTER_NOINIT(H5B_insert_child)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B_insert_child)
assert(bt);
assert(bt->nchildren<2*H5F_KVALUE(f, type));
@@ -1364,7 +1364,7 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
H5B_ins_t my_ins = H5B_INS_ERROR;
H5B_ins_t ret_value = H5B_INS_ERROR; /* Return value */
- FUNC_ENTER_NOINIT(H5B_insert_helper)
+ FUNC_ENTER_NOAPI_NOINIT(H5B_insert_helper)
/*
* Check arguments
diff --git a/src/H5D.c b/src/H5D.c
index eedce9c..05ecec0 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -181,7 +181,7 @@ H5D_init_interface(void)
size_t nprops; /* Number of properties */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5D_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT(H5D_init_interface)
/* Initialize the atom group for the dataset IDs */
if (H5I_init_group(H5I_DATASET, H5I_DATASETID_HASHSIZE, H5D_RESERVED_ATOMS, (H5I_free_t)H5D_close)<0)
@@ -381,7 +381,7 @@ H5D_term_interface(void)
{
int n=0;
- FUNC_ENTER_NOINIT(H5D_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_term_interface)
if (interface_initialize_g) {
if ((n=H5I_nmembers(H5I_DATASET))) {
@@ -1012,7 +1012,7 @@ H5D_get_space_status(const H5D_t *dset, H5D_space_status_t *allocation, hid_t dx
hsize_t full_size; /* The number of bytes in the dataset when fully populated */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5D_get_space_status)
+ FUNC_ENTER_NOAPI_NOINIT(H5D_get_space_status)
assert(dset);
@@ -2378,8 +2378,8 @@ done:
H5G_entry_t *
H5D_entof (H5D_t *dataset)
{
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5D_entof)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_entof)
FUNC_LEAVE_NOAPI( dataset ? &(dataset->ent) : (H5G_entry_t *)NULL)
}
@@ -2405,8 +2405,8 @@ H5D_entof (H5D_t *dataset)
H5T_t *
H5D_typeof (const H5D_t *dset)
{
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5D_typeof)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_typeof)
assert (dset);
assert (dset->type);
@@ -2434,8 +2434,8 @@ H5D_typeof (const H5D_t *dset)
static H5F_t *
H5D_get_file (const H5D_t *dset)
{
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5D_get_file)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_get_file)
assert (dset);
assert (dset->ent.file);
@@ -2471,7 +2471,7 @@ H5D_alloc_storage (H5F_t *f, hid_t dxpl_id, H5D_t *dset/*in,out*/, H5D_time_allo
unsigned addr_set=0; /* Flag to indicate that the dataset's storage address was set */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5D_alloc_storage)
+ FUNC_ENTER_NOAPI_NOINIT(H5D_alloc_storage)
/* check args */
assert (f);
@@ -2620,10 +2620,9 @@ H5D_init_storage(H5D_t *dset, hbool_t full_overwrite, hid_t dxpl_id)
hssize_t snpoints; /* Number of points in space (for error checking) */
size_t npoints; /* Number of points in space */
H5S_t *space; /* Dataset's dataspace */
- H5P_genplist_t *plist; /* Property list */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5D_init_storage)
+ FUNC_ENTER_NOAPI_NOINIT(H5D_init_storage)
assert(dset);
@@ -2652,12 +2651,8 @@ H5D_init_storage(H5D_t *dset, hbool_t full_overwrite, hid_t dxpl_id)
/* Don't write default fill values to external files */
/* If we will be immediately overwriting the values, don't bother to clear them */
if((dset->efl.nused==0 || dset->fill.buf) && !full_overwrite) {
- /* Get dataset's creation property list */
- if (NULL == (plist = H5I_object(dset->dcpl_id)))
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list")
-
if (H5F_contig_fill(dset->ent.file, dxpl_id, &(dset->layout),
- plist, space, &dset->fill, H5T_get_size(dset->type))<0)
+ space, &dset->fill, H5T_get_size(dset->type))<0)
HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to allocate all chunks of dataset")
} /* end if */
break;
@@ -2668,7 +2663,7 @@ H5D_init_storage(H5D_t *dset, hbool_t full_overwrite, hid_t dxpl_id)
* for all chunks now and initialize each chunk with the fill value.
*/
{
- /* We only handle simple data spaces so far */
+ H5P_genplist_t *plist; /* Property list */
int ndims;
hsize_t dim[H5O_LAYOUT_NDIMS];
@@ -2676,6 +2671,7 @@ H5D_init_storage(H5D_t *dset, hbool_t full_overwrite, hid_t dxpl_id)
if (NULL == (plist = H5I_object(dset->dcpl_id)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a dataset creation property list")
+ /* We only handle simple data spaces so far */
if ((ndims=H5S_get_simple_extent_dims(space, dim, NULL))<0)
HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to get simple data space info")
dim[ndims] = dset->layout.dim[ndims];
diff --git a/src/H5DZ.c b/src/H5DZ.c
index 7affb47..90cad05 100644
--- a/src/H5DZ.c
+++ b/src/H5DZ.c
@@ -57,7 +57,7 @@ H5DZ_init_interface(void)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5DZ_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT(H5DZ_init_interface)
FUNC_LEAVE_NOAPI(ret_value)
}
diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c
index 777e7c6..32f1759 100644
--- a/src/H5Dcontig.c
+++ b/src/H5Dcontig.c
@@ -119,7 +119,7 @@ done:
*/
herr_t
H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout,
- struct H5P_genplist_t *dc_plist, const struct H5S_t *space,
+ const struct H5S_t *space,
const struct H5O_fill_t *fill, size_t elmt_size)
{
hssize_t snpoints; /* Number of points in space (for error checking) */
@@ -147,7 +147,6 @@ H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout,
assert(layout && H5D_CONTIGUOUS==layout->type);
assert(layout->ndims>0 && layout->ndims<=H5O_LAYOUT_NDIMS);
assert(H5F_addr_defined(layout->addr));
- assert(dc_plist!=NULL);
assert(space);
assert(elmt_size>0);
diff --git a/src/H5Dio.c b/src/H5Dio.c
index c053737..1e6dcaf 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -217,7 +217,7 @@ H5D_fill(const void *fill, const H5T_t *fill_type, void *buf, const H5T_t *buf_t
size_t buf_size; /* Desired buffer size */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5D_fill)
+ FUNC_ENTER_NOAPI_NOINIT(H5D_fill)
/* Check args */
assert(buf);
@@ -526,7 +526,7 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
unsigned sconv_flags=0; /* Flags for the space conversion */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5D_read)
+ FUNC_ENTER_NOAPI_NOINIT(H5D_read)
/* check args */
assert(dataset && dataset->ent.file);
@@ -751,7 +751,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
unsigned sconv_flags=0; /* Flags for the space conversion */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5D_write)
+ FUNC_ENTER_NOAPI_NOINIT(H5D_write)
/* check args */
assert(dataset && dataset->ent.file);
@@ -970,7 +970,7 @@ H5D_contig_read(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type,
hsize_t n, smine_nelmts; /*elements per strip */
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOINIT(H5D_contig_read)
+ FUNC_ENTER_NOAPI_NOINIT(H5D_contig_read)
/*
* If there is no type conversion then read directly into the
@@ -1199,7 +1199,7 @@ H5D_contig_write(hsize_t nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5
hsize_t n, smine_nelmts; /*elements per strip */
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOINIT(H5D_contig_write)
+ FUNC_ENTER_NOAPI_NOINIT(H5D_contig_write)
/*
* If there is no type conversion then write directly from the
@@ -1435,7 +1435,7 @@ UNUSED
H5D_storage_t store; /*union of EFL and chunk pointer in file space */
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOINIT(H5D_chunk_read)
+ FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_read)
/* Map elements between file and memory for each chunk*/
if(H5D_create_chunk_map(dataset, mem_type, file_space, mem_space, &fm)<0)
@@ -1750,7 +1750,7 @@ nelmts, H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
H5D_storage_t store; /*union of EFL and chunk pointer in file space */
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOINIT(H5D_chunk_write)
+ FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_write)
#ifdef QAK
{
@@ -2079,7 +2079,7 @@ H5D_io_assist_mpio(H5P_genplist_t *dx_plist, H5FD_mpio_xfer_t xfer_mode,
{
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOINIT(H5D_io_assist_mpio)
+ FUNC_ENTER_NOAPI_NOINIT(H5D_io_assist_mpio)
/* The following may not handle a collective call correctly
* since it does not ensure all processes can handle the write
@@ -2131,7 +2131,7 @@ H5D_chunk_coords_assist(hssize_t *coords, size_t ndims, const hsize_t chunks[],
hsize_t tmp; /* Size of "down elements" in each dimension */
size_t i, j; /* Local index variables */
- FUNC_ENTER_NOINIT(H5D_chunk_coords_assist)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_coords_assist)
for(i=0; i<ndims; i++) {
tmp=1;
@@ -2180,7 +2180,7 @@ H5D_create_chunk_map(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *file_sp
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5D_create_chunk_map)
+ FUNC_ENTER_NOAPI_NOINIT(H5D_create_chunk_map)
#ifdef QAK
{
int mpi_rank;
@@ -2457,7 +2457,7 @@ H5D_free_chunk_info(void *_chunk_info)
{
H5D_chunk_info_t *chunk_info=(H5D_chunk_info_t *)_chunk_info;
- FUNC_ENTER_NOINIT(H5D_free_chunk_info)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_free_chunk_info)
assert(chunk_info);
@@ -2493,7 +2493,7 @@ H5D_destroy_chunk_map(const fm_map *fm)
{
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOINIT(H5D_destroy_chunk_map)
+ FUNC_ENTER_NOAPI_NOINIT(H5D_destroy_chunk_map)
/* Free the chunk info tree */
if(fm->fsel)
@@ -2548,7 +2548,7 @@ H5D_create_chunk_file_map_hyper(const fm_map *fm)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5D_create_chunk_file_map_hyper)
+ FUNC_ENTER_NOAPI_NOINIT(H5D_create_chunk_file_map_hyper)
/* Sanity check */
assert(fm->f_ndims>0);
@@ -2725,7 +2725,7 @@ H5D_create_chunk_mem_map_hyper(const fm_map *fm)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5D_create_chunk_mem_map_hyper)
+ FUNC_ENTER_NOAPI_NOINIT(H5D_create_chunk_mem_map_hyper)
#ifdef QAK
{
hsize_t mem_dims[H5O_LAYOUT_NDIMS]; /* Dimensions of memory space */
@@ -2879,7 +2879,7 @@ H5D_chunk_file_cb(void UNUSED *elem, hid_t UNUSED type_id, hsize_t ndims, hssize
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5D_chunk_file_cb)
+ FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_file_cb)
/* Calculate the index of this chunk */
if(H5V_chunk_index((unsigned)ndims,coords,fm->layout->dim,fm->chunks,fm->down_chunks,&chunk_index)<0)
@@ -2991,7 +2991,7 @@ H5D_chunk_mem_cb(void UNUSED *elem, hid_t UNUSED type_id, hsize_t ndims, hssize_
hsize_t chunk_index; /* Chunk index */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5D_chunk_mem_cb)
+ FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_mem_cb)
/* Calculate the index of this chunk */
if(H5V_chunk_index((unsigned)ndims,coords,fm->layout->dim,fm->chunks,fm->down_chunks,&chunk_index)<0)
diff --git a/src/H5Distore.c b/src/H5Distore.c
index 90b9168..af66624 100644
--- a/src/H5Distore.c
+++ b/src/H5Distore.c
@@ -241,8 +241,8 @@ H5F_istore_sizeof_rkey(H5F_t UNUSED *f, const void *_udata)
const H5F_istore_ud1_t *udata = (const H5F_istore_ud1_t *) _udata;
size_t nbytes;
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5F_istore_sizeof_rkey);
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_istore_sizeof_rkey);
assert(udata);
assert(udata->mesg.ndims > 0 && udata->mesg.ndims <= H5O_LAYOUT_NDIMS);
@@ -795,7 +795,7 @@ H5F_istore_iter_allocated (H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key,
H5F_istore_ud1_t *bt_udata = (H5F_istore_ud1_t *)_udata;
H5F_istore_key_t *lt_key = (H5F_istore_key_t *)_lt_key;
- FUNC_ENTER_NOINIT(H5F_istore_iter_allocated);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_istore_iter_allocated);
bt_udata->total_storage += lt_key->nbytes;
@@ -832,7 +832,7 @@ H5F_istore_iter_dump (H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key, hadd
H5F_istore_key_t *lt_key = (H5F_istore_key_t *)_lt_key;
unsigned u;
- FUNC_ENTER_NOINIT(H5F_istore_iter_dump);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_istore_iter_dump);
if (bt_udata->stream) {
if (0==bt_udata->total_storage) {
@@ -919,7 +919,7 @@ H5F_istore_flush_entry(H5F_t *f, hid_t dxpl_id, H5F_rdcc_ent_t *ent, hbool_t res
size_t alloc; /*bytes allocated for BUF */
hbool_t point_of_no_return = FALSE;
- FUNC_ENTER_NOINIT(H5F_istore_flush_entry);
+ FUNC_ENTER_NOAPI_NOINIT(H5F_istore_flush_entry);
assert(f);
assert(ent);
@@ -1051,7 +1051,7 @@ H5F_istore_preempt(H5F_t *f, hid_t dxpl_id, H5F_rdcc_ent_t * ent, hbool_t flush)
H5F_rdcc_t *rdcc = &(f->shared->rdcc);
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5F_istore_preempt);
+ FUNC_ENTER_NOAPI_NOINIT(H5F_istore_preempt);
assert(f);
assert(ent);
@@ -1223,7 +1223,7 @@ H5F_istore_prune (H5F_t *f, hid_t dxpl_id, size_t size)
H5F_rdcc_ent_t *n[2]; /*list next pointers */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5F_istore_prune);
+ FUNC_ENTER_NOAPI_NOINIT(H5F_istore_prune);
/*
* Preemption is accomplished by having multiple pointers (currently two)
@@ -1367,7 +1367,7 @@ H5F_istore_lock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
H5Z_EDC_t edc;
H5Z_cb_t cb_struct;
- FUNC_ENTER_NOINIT(H5F_istore_lock);
+ FUNC_ENTER_NOAPI_NOINIT(H5F_istore_lock);
assert(TRUE==H5P_isa_class(dxpl_id,H5P_DATASET_XFER));
plist=H5I_object(dxpl_id);
@@ -1630,7 +1630,7 @@ H5F_istore_unlock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
unsigned u;
H5P_genplist_t *plist; /* Property list */
- FUNC_ENTER_NOINIT(H5F_istore_unlock);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_istore_unlock);
if (UINT_MAX==*idx_hint) {
/*not in cache*/
@@ -2068,7 +2068,7 @@ H5F_istore_get_addr(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
unsigned u;
haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOINIT(H5F_istore_get_addr);
+ FUNC_ENTER_NOAPI_NOINIT(H5F_istore_get_addr);
assert(f);
assert(layout && (layout->ndims > 0));
@@ -2603,7 +2603,7 @@ H5F_istore_prune_extent(H5F_t *f, hid_t dxpl_id, void *_lt_key, haddr_t UNUSED a
* storage that contains the beginning of the logical address space represented by UDATA.
*/
- FUNC_ENTER_NOINIT(H5F_istore_prune_extent);
+ FUNC_ENTER_NOAPI_NOINIT(H5F_istore_prune_extent);
/* Figure out what chunks are no longer in use for the specified extent and release them */
for(u = 0; u < bt_udata->mesg.ndims - 1; u++)
diff --git a/src/H5E.c b/src/H5E.c
index 76aad91..70bafb4 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -142,7 +142,7 @@ H5E_init_interface(void)
char lib_vers[128]; /* Buffer to constructu library version within */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5E_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT(H5E_init_interface)
/* Initialize the atom group for the error class IDs */
if(H5I_init_group(H5I_ERROR_CLASS, H5I_ERRCLS_HASHSIZE, H5E_RESERVED_ATOMS,
@@ -201,7 +201,7 @@ H5E_term_interface(void)
{
int ncls, nmsg, nstk, n=0;
- FUNC_ENTER_NOINIT(H5E_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_term_interface)
if (interface_initialize_g) {
/* Check if there are any open error stacks, classes or messages */
@@ -766,7 +766,7 @@ H5Eget_major(H5E_major_t maj)
char *msg_str;
char *ret_value = NULL;
- FUNC_ENTER_API_NOINIT(H5Eget_major)
+ FUNC_ENTER_API(H5Eget_major)
/* Get the message object */
if((msg = H5I_object_verify(maj, H5I_ERROR_MSG))==NULL)
@@ -816,7 +816,7 @@ H5Eget_minor(H5E_minor_t min)
char *msg_str;
char *ret_value = NULL;
- FUNC_ENTER_API_NOINIT(H5Eget_minor)
+ FUNC_ENTER_API(H5Eget_minor)
/* Get the message object */
if((msg = H5I_object_verify(min, H5I_ERROR_MSG))==NULL)
@@ -1537,7 +1537,7 @@ H5E_push(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_NOINIT(H5E_push)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_push)
/* Sanity check */
assert(cls_id>0);
@@ -2145,7 +2145,7 @@ H5E_walk_cb(unsigned n, const H5E_error_t *err_desc, void *client_data)
const char *min_str = "No minor description"; /* Minor error description */
unsigned have_desc=1; /* Flag to indicate whether the error has a "real" description */
- FUNC_ENTER_NOINIT(H5E_walk_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_walk_cb)
/* Check arguments */
assert (err_desc);
diff --git a/src/H5F.c b/src/H5F.c
index 574f512..2747912 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -235,7 +235,7 @@ H5F_init_interface(void)
H5P_genclass_t *mnt_pclass;
hbool_t local = H5F_MNT_SYM_LOCAL_DEF;
- FUNC_ENTER_NOINIT(H5F_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT(H5F_init_interface)
#ifdef OLD_METADATA_WRITE
#ifdef H5_HAVE_PARALLEL
@@ -483,7 +483,7 @@ H5F_term_interface(void)
{
int n = 0;
- FUNC_ENTER_NOINIT(H5F_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_term_interface)
if (interface_initialize_g) {
if ((n=H5I_nmembers(H5I_FILE))) {
@@ -672,7 +672,7 @@ H5F_flush_all_cb(void *_f, hid_t UNUSED fid, void *_invalidate)
H5F_t *f=(H5F_t *)_f;
unsigned invalidate = (*((hbool_t*)_invalidate);
- FUNC_ENTER_NOINIT(H5F_flush_all_cb)
+ FUNC_ENTER_NOAPI_NOINIT(H5F_flush_all_cb)
H5F_flush(f, H5F_SCOPE_LOCAL, (invalidate ? H5F_FLUSH_INVALIDATE : H5F_FLUSH_NONE));
@@ -964,7 +964,7 @@ H5F_get_obj_count(const H5F_t *f, unsigned types)
{
int ret_value; /* Return value */
- FUNC_ENTER_NOINIT(H5F_get_obj_count)
+ FUNC_ENTER_NOAPI_NOINIT(H5F_get_obj_count)
if((ret_value=H5F_get_objects(f, types, -1, NULL)) < 0)
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get counts of opened file IDs and object IDs in the file")
@@ -1029,7 +1029,7 @@ H5F_get_obj_ids(const H5F_t *f, unsigned types, int max_objs, hid_t *oid_list)
{
int ret_value; /* Return value */
- FUNC_ENTER_NOINIT(H5F_get_obj_ids)
+ FUNC_ENTER_NOAPI_NOINIT(H5F_get_obj_ids)
if((ret_value=H5F_get_objects(f, types, max_objs, oid_list)) < 0)
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get object IDs opened in the file")
@@ -1061,7 +1061,7 @@ H5F_get_objects(const H5F_t *f, unsigned types, int max_index, hid_t *obj_id_lis
H5F_olist_t olist; /* Structure to hold search results */
int ret_value; /* Return value */
- FUNC_ENTER_NOINIT(H5F_get_object)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_object)
/* Set up search information */
olist.obj_id_list = (max_index==0 ? NULL : obj_id_list);
@@ -1140,7 +1140,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_NOINIT(H5F_get_objects_cb)
+ FUNC_ENTER_NOAPI_NOINIT(H5F_get_objects_cb)
assert(obj_ptr);
assert(olist);
@@ -1269,7 +1269,7 @@ H5F_get_vfd_handle(const H5F_t *file, hid_t fapl, void**file_handle)
{
herr_t ret_value;
- FUNC_ENTER_NOINIT(H5F_get_vfd_handle)
+ FUNC_ENTER_NOAPI_NOINIT(H5F_get_vfd_handle)
assert(file_handle);
if((ret_value=H5FD_get_vfd_handle(file->shared->lf, fapl, file_handle)) < 0)
@@ -1305,7 +1305,7 @@ H5F_equal(void *_haystack, hid_t UNUSED id, void *_needle)
const H5FD_t *needle = (const H5FD_t*)_needle;
int retval;
- FUNC_ENTER_NOINIT(H5F_equal)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_equal)
retval = (0==H5FD_cmp(haystack->shared->lf, needle));
@@ -1340,7 +1340,7 @@ H5F_locate_signature(H5FD_t *file, hid_t dxpl_id)
unsigned n, maxpow;
haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOINIT(H5F_locate_signature)
+ FUNC_ENTER_NOAPI_NOINIT(H5F_locate_signature)
/* Find the least N such that 2^N is larger than the file size */
if (HADDR_UNDEF==(addr=H5FD_get_eof(file)) ||
@@ -1466,7 +1466,7 @@ H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id)
int n;
H5P_genplist_t *plist; /* Property list */
- FUNC_ENTER_NOINIT(H5F_new)
+ FUNC_ENTER_NOAPI_NOINIT(H5F_new)
if (NULL==(f=H5FL_CALLOC(H5F_t)))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
@@ -1609,7 +1609,7 @@ H5F_dest(H5F_t *f, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5F_dest)
+ FUNC_ENTER_NOAPI_NOINIT(H5F_dest)
if (f && 1==f->nrefs) {
if (1==f->shared->nrefs) {
@@ -2977,7 +2977,7 @@ H5F_flush(H5F_t *f, hid_t dxpl_id, H5F_scope_t scope, unsigned flags)
unsigned i; /* Index variable */
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOINIT(H5F_flush)
+ FUNC_ENTER_NOAPI_NOINIT(H5F_flush)
/* Sanity check arguments */
assert(f);
@@ -3460,7 +3460,7 @@ H5F_mount(H5G_entry_t *loc, const char *name, H5F_t *child,
H5RS_str_t *name_r; /* Ref-counted version of name */
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOINIT(H5F_mount)
+ FUNC_ENTER_NOAPI_NOINIT(H5F_mount)
assert(loc);
assert(name && *name);
@@ -3583,7 +3583,7 @@ H5F_unmount(H5G_entry_t *loc, const char *name, hid_t dxpl_id)
unsigned lt, rt, md=0; /*binary search indices */
int cmp; /*binary search comparison value*/
- FUNC_ENTER_NOINIT(H5F_unmount)
+ FUNC_ENTER_NOAPI_NOINIT(H5F_unmount)
assert(loc);
assert(name && *name);
@@ -3977,8 +3977,8 @@ done:
unsigned
H5F_get_intent(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5F_get_intent)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_intent)
assert(f);
@@ -4008,8 +4008,8 @@ H5F_get_intent(const H5F_t *f)
size_t
H5F_sizeof_addr(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5F_sizeof_addr)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sizeof_addr)
assert(f);
assert(f->shared);
@@ -4040,8 +4040,8 @@ H5F_sizeof_addr(const H5F_t *f)
size_t
H5F_sizeof_size(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5F_sizeof_size)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sizeof_size)
assert(f);
assert(f->shared);
@@ -4073,8 +4073,8 @@ H5F_sizeof_size(const H5F_t *f)
*/
unsigned H5F_sym_leaf_k(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5F_sym_leaf_k)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sym_leaf_k)
assert(f);
assert(f->shared);
@@ -4107,8 +4107,8 @@ unsigned H5F_sym_leaf_k(const H5F_t *f)
unsigned
H5F_Kvalue(const H5F_t *f, const H5B_class_t *type)
{
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5F_Kvalue)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_Kvalue)
assert(f);
assert(f->shared);
@@ -4137,8 +4137,8 @@ H5F_Kvalue(const H5F_t *f, const H5B_class_t *type)
hid_t
H5F_get_driver_id(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5F_get_driver_id)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_driver_id)
assert(f);
assert(f->shared);
@@ -4204,7 +4204,7 @@ H5F_get_id(H5F_t *file)
{
hid_t ret_value;
- FUNC_ENTER_NOINIT(H5F_get_id)
+ FUNC_ENTER_NOAPI_NOINIT(H5F_get_id)
assert(file);
@@ -4250,8 +4250,8 @@ done:
haddr_t
H5F_get_base_addr(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5F_get_base_addr)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_base_addr)
assert(f);
assert(f->shared);
diff --git a/src/H5FD.c b/src/H5FD.c
index bfe8026..7bc1663 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -113,7 +113,7 @@ H5FD_init_interface(void)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5FD_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT(H5FD_init_interface)
if (H5I_init_group(H5I_VFL, H5I_VFL_HASHSIZE, 0, (H5I_free_t)H5FD_free_cls)<0)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "unable to initialize interface")
@@ -151,7 +151,7 @@ H5FD_term_interface(void)
{
int n = 0;
- FUNC_ENTER_NOINIT(H5FD_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_term_interface)
if (interface_initialize_g) {
if ((n=H5I_nmembers(H5I_VFL))) {
@@ -187,7 +187,7 @@ H5FD_term_interface(void)
static herr_t
H5FD_free_cls(H5FD_class_t *cls)
{
- FUNC_ENTER_NOINIT(H5FD_free_cls)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_free_cls)
H5MM_xfree(cls);
@@ -495,7 +495,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_NOINIT(H5FD_pl_copy)
+ FUNC_ENTER_NOAPI_NOINIT(H5FD_pl_copy)
/* Copy old pl, if one exists */
if (old_pl) {
@@ -540,7 +540,7 @@ H5FD_pl_close(hid_t driver_id, herr_t (*free_func)(void *), void *pl)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5FD_pl_close)
+ FUNC_ENTER_NOAPI_NOINIT(H5FD_pl_close)
/* Allow driver to free or do it ourselves */
if (pl && free_func) {
@@ -2009,7 +2009,7 @@ H5FD_real_alloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
{
haddr_t ret_value = HADDR_UNDEF;
- FUNC_ENTER_NOINIT(H5FD_real_alloc)
+ FUNC_ENTER_NOAPI_NOINIT(H5FD_real_alloc)
/* check args */
assert(file);
@@ -2055,7 +2055,7 @@ H5FD_update_eoa(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
hsize_t wasted;
haddr_t ret_value = HADDR_UNDEF;
- FUNC_ENTER_NOINIT(H5FD_update_eoa)
+ FUNC_ENTER_NOAPI_NOINIT(H5FD_update_eoa)
/* check args */
assert(file);
diff --git a/src/H5FDfphdf5.c b/src/H5FDfphdf5.c
index b47ca7a..6ee76f6 100644
--- a/src/H5FDfphdf5.c
+++ b/src/H5FDfphdf5.c
@@ -1622,7 +1622,7 @@ H5FD_fphdf5_MPIOff_to_haddr(MPI_Offset mpi_off)
{
haddr_t ret_value;
- FUNC_ENTER_NOINIT(H5FD_fphdf5_MPIOff_to_haddr)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_fphdf5_MPIOff_to_haddr)
ret_value = (mpi_off != (MPI_Offset)(haddr_t)mpi_off ? HADDR_UNDEF : (haddr_t)mpi_off);
FUNC_LEAVE_NOAPI(ret_value)
}
@@ -1644,7 +1644,7 @@ H5FD_fphdf5_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off)
{
herr_t ret_value = FAIL;
- FUNC_ENTER_NOINIT(H5FD_fphdf5_haddr_to_MPIOff)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_fphdf5_haddr_to_MPIOff)
if (mpi_off)
*mpi_off = (MPI_Offset)addr;
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 2eda0ab..b48cef4 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -2116,7 +2116,7 @@ H5FD_mpio_MPIOff_to_haddr(MPI_Offset mpi_off)
{
haddr_t ret_value=HADDR_UNDEF;
- FUNC_ENTER_NOINIT(H5FD_mpio_MPIOff_to_haddr)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpio_MPIOff_to_haddr)
if (mpi_off != (MPI_Offset)(haddr_t)mpi_off)
ret_value=HADDR_UNDEF;
@@ -2157,7 +2157,7 @@ H5FD_mpio_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off/*out*/)
{
herr_t ret_value=FAIL;
- FUNC_ENTER_NOINIT(H5FD_mpio_haddr_to_MPIOff)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpio_haddr_to_MPIOff)
if (mpi_off)
*mpi_off = (MPI_Offset)addr;
diff --git a/src/H5FDstream.c b/src/H5FDstream.c
index 0ca16ac..836528c 100644
--- a/src/H5FDstream.c
+++ b/src/H5FDstream.c
@@ -388,7 +388,7 @@ H5FD_stream_open_socket (const char *filename, int o_flags,
int on = 1;
H5FD_STREAM_SOCKET_TYPE ret_value=H5FD_STREAM_INVALID_SOCKET;
- FUNC_ENTER_NOINIT(H5FD_stream_open_socket)
+ FUNC_ENTER_NOAPI_NOINIT(H5FD_stream_open_socket)
/* Parse "hostname:port" from filename argument */
for (separator = filename; *separator != ':' && *separator; separator++)
@@ -492,7 +492,7 @@ H5FD_stream_read_from_socket (H5FD_stream_t *stream)
unsigned char *ptr=NULL;
herr_t ret_value=SUCCEED;
- FUNC_ENTER_NOINIT(H5FD_stream_read_from_socket)
+ FUNC_ENTER_NOAPI_NOINIT(H5FD_stream_read_from_socket)
stream->eof = 0;
stream->mem = NULL;
diff --git a/src/H5FL.c b/src/H5FL.c
index b4c5613..0224b3e 100644
--- a/src/H5FL.c
+++ b/src/H5FL.c
@@ -173,7 +173,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_NOINIT(H5FL_reg_init)
+ FUNC_ENTER_NOAPI_NOINIT(H5FL_reg_init)
/* Allocate a new garbage collection node */
if (NULL==(new_node = H5MM_malloc(sizeof(H5FL_reg_gc_node_t))))
@@ -383,7 +383,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_NOINIT(H5FL_reg_gc_list)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_reg_gc_list)
/* Calculate the total memory used on this list */
total_mem=head->onlist*head->size;
@@ -441,7 +441,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_NOINIT(H5FL_reg_gc)
+ FUNC_ENTER_NOAPI_NOINIT(H5FL_reg_gc)
/* Walk through all the free lists, free()'ing the nodes */
gc_node=H5FL_reg_gc_head.first;
@@ -493,7 +493,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_NOINIT(H5FL_reg_term)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_reg_term)
if (interface_initialize_g) {
/* Free the nodes on the garbage collection list, keeping nodes with allocations outstanding */
@@ -559,7 +559,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 */
H5FL_blk_node_t *ret_value;
- FUNC_ENTER_NOINIT(H5FL_blk_find_list)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_blk_find_list)
/* Find the correct free list */
temp=*head;
@@ -613,7 +613,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_NOINIT(H5FL_blk_create_list)
+ FUNC_ENTER_NOAPI_NOINIT(H5FL_blk_create_list)
/* Allocate room for the new free list node */
if(NULL==(temp=H5FL_MALLOC(H5FL_blk_node_t)))
@@ -664,7 +664,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_NOINIT(H5FL_blk_init)
+ FUNC_ENTER_NOAPI_NOINIT(H5FL_blk_init)
/* Allocate a new garbage collection node */
if (NULL==(new_node = H5MM_malloc(sizeof(H5FL_blk_gc_node_t))))
@@ -990,7 +990,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_NOINIT(H5FL_blk_gc_list)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_blk_gc_list)
/* Loop through all the nodes in the block free list queue */
while(head->head!=NULL) {
@@ -1053,7 +1053,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_NOINIT(H5FL_blk_gc)
+ FUNC_ENTER_NOAPI_NOINIT(H5FL_blk_gc)
/* Walk through all the free lists, free()'ing the nodes */
gc_node=H5FL_blk_gc_head.first;
@@ -1099,7 +1099,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_NOINIT(H5FL_blk_term)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_blk_term)
/* Free the nodes on the garbage collection list, keeping nodes with allocations outstanding */
left=NULL;
@@ -1157,7 +1157,7 @@ H5FL_arr_init(H5FL_arr_head_t *head)
H5FL_gc_arr_node_t *new_node; /* Pointer to the node for the new list to garbage collect */
herr_t ret_value=SUCCEED; /* return value*/
- FUNC_ENTER_NOINIT(H5FL_arr_init)
+ FUNC_ENTER_NOAPI_NOINIT(H5FL_arr_init)
/* Allocate a new garbage collection node */
if (NULL==(new_node = H5MM_malloc(sizeof(H5FL_gc_arr_node_t))))
@@ -1489,7 +1489,7 @@ H5FL_arr_gc_list(H5FL_arr_head_t *head)
size_t total_mem; /* Total memory used on list */
herr_t ret_value=SUCCEED; /* return value*/
- FUNC_ENTER_NOINIT(H5FL_arr_gc_list)
+ FUNC_ENTER_NOAPI_NOINIT(H5FL_arr_gc_list)
/* Check if the array has a fixed maximum number of elements */
if(head->maxelem>0) {
@@ -1559,7 +1559,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_NOINIT(H5FL_arr_gc)
+ FUNC_ENTER_NOAPI_NOINIT(H5FL_arr_gc)
/* Walk through all the free lists, free()'ing the nodes */
gc_arr_node=H5FL_arr_gc_head.first;
@@ -1605,7 +1605,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_NOINIT(H5FL_arr_term)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_arr_term)
/* Free the nodes on the garbage collection list, keeping nodes with allocations outstanding */
left=NULL;
@@ -1689,7 +1689,7 @@ H5FL_garbage_coll(void)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5FL_garbage_coll)
+ FUNC_ENTER_NOAPI_NOINIT(H5FL_garbage_coll)
/* Garbage collect the free lists for array objects */
if(H5FL_arr_gc()<0)
@@ -1788,7 +1788,7 @@ H5FL_term_interface(void)
{
int ret_value=0;
- FUNC_ENTER_NOINIT(H5FL_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_term_interface)
/* Garbage collect any nodes on the free lists */
(void)H5FL_garbage_coll();
diff --git a/src/H5FPclient.c b/src/H5FPclient.c
index 4d78e39..e80288d 100644
--- a/src/H5FPclient.c
+++ b/src/H5FPclient.c
@@ -932,7 +932,7 @@ static unsigned
H5FP_gen_request_id()
{
static unsigned int i = 0;
- FUNC_ENTER_NOINIT(H5FP_gen_request_id);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_gen_request_id);
FUNC_LEAVE_NOAPI(i++);
}
@@ -953,7 +953,7 @@ H5FP_dump_to_file(H5FD_t *file, hid_t dxpl_id)
unsigned dumping = 1;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5FP_dump_to_file);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_dump_to_file);
/* check args */
assert(file);
diff --git a/src/H5FPserver.c b/src/H5FPserver.c
index 47fefe6..13b22f9 100644
--- a/src/H5FPserver.c
+++ b/src/H5FPserver.c
@@ -290,7 +290,7 @@ H5FP_sap_receive(H5FP_request_t *req, int source, int tag, char **buf)
herr_t ret_value = SUCCEED;
int mrc;
- FUNC_ENTER_NOINIT(H5FP_sap_receive);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_receive);
HDmemset(&status, 0, sizeof(status));
@@ -318,7 +318,7 @@ H5FP_object_lock_cmp(H5FP_object_lock *o1,
H5FP_object_lock *o2,
int UNUSED cmparg)
{
- FUNC_ENTER_NOINIT(H5FP_object_lock_cmp);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_object_lock_cmp);
assert(o1);
assert(o2);
FUNC_LEAVE_NOAPI(o2->oid - o1->oid);
@@ -345,7 +345,7 @@ H5FP_new_object_lock(hobj_ref_t oid, unsigned rank, H5FP_obj_t obj_type,
int comm_size;
H5FP_object_lock *ret_value = NULL;
- FUNC_ENTER_NOINIT(H5FP_new_object_lock);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_new_object_lock);
if (MPI_Comm_size(H5FP_SAP_COMM, &comm_size) != MPI_SUCCESS)
HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, NULL, "MPI_Comm_size failed");
@@ -353,7 +353,7 @@ H5FP_new_object_lock(hobj_ref_t oid, unsigned rank, H5FP_obj_t obj_type,
if ((ret_value = (H5FP_object_lock *)H5MM_malloc(sizeof(H5FP_object_lock))) == NULL)
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "out of memory");
- if ((ret_value->num_locks = (unsigned char *)HDcalloc(comm_size, 1)) == NULL) {
+ if ((ret_value->num_locks = (unsigned char *)HDcalloc((size_t)comm_size, 1)) == NULL) {
HDfree(ret_value);
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "out of memory");
}
@@ -378,7 +378,7 @@ done:
static herr_t
H5FP_free_object_lock(H5FP_object_lock *ol)
{
- FUNC_ENTER_NOINIT(H5FP_free_object_lock);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_free_object_lock);
if (ol) {
HDfree(ol->num_locks);
@@ -401,7 +401,7 @@ H5FP_find_object_lock(H5FP_file_info *info, hobj_ref_t oid)
{
H5FP_object_lock *ret_value = NULL;
- FUNC_ENTER_NOINIT(H5FP_find_object_lock);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_find_object_lock);
assert(info);
assert(oid);
@@ -438,7 +438,7 @@ H5FP_remove_object_lock_from_list(H5FP_file_info *info,
H5TB_NODE *node;
herr_t ret_value = FAIL;
- FUNC_ENTER_NOINIT(H5FP_remove_object_lock_from_list);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_remove_object_lock_from_list);
if ((node = H5TB_dfind(info->locks, (void *)ol, NULL)) != NULL) {
H5FP_free_object_lock(H5TB_rem(&info->locks->root, node, NULL));
@@ -460,7 +460,7 @@ H5FP_file_mod_cmp(H5FP_mdata_mod *k1,
H5FP_mdata_mod *k2,
int UNUSED cmparg)
{
- FUNC_ENTER_NOINIT(H5FP_file_mod_cmp);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_file_mod_cmp);
assert(k1);
assert(k2);
FUNC_LEAVE_NOAPI(k2->addr - k1->addr);
@@ -477,7 +477,7 @@ H5FP_file_mod_cmp(H5FP_mdata_mod *k1,
static herr_t
H5FP_free_mod_node(H5FP_mdata_mod *info)
{
- FUNC_ENTER_NOINIT(H5FP_free_mod_node);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_free_mod_node);
if (info) {
HDfree(info->metadata);
@@ -502,7 +502,7 @@ H5FP_new_file_mod_node(H5FD_mem_t mem_type, haddr_t addr, unsigned md_size, char
{
H5FP_mdata_mod *ret_value = NULL;
- FUNC_ENTER_NOINIT(H5FP_new_file_mod_node);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_new_file_mod_node);
if ((ret_value = (H5FP_mdata_mod *)H5MM_malloc(sizeof(H5FP_mdata_mod))) == NULL)
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "out of memory");
@@ -536,7 +536,7 @@ H5FP_add_file_mod_to_list(H5FP_file_info *info, H5FD_mem_t mem_type,
H5TB_NODE *node;
herr_t ret_value = FAIL;
- FUNC_ENTER_NOINIT(H5FP_add_file_mod_to_list);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_add_file_mod_to_list);
/* check args */
assert(info);
@@ -580,7 +580,7 @@ done:
static herr_t
H5FP_free_file_info_node(H5FP_file_info *info)
{
- FUNC_ENTER_NOINIT(H5FP_free_file_info_node);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_free_file_info_node);
if (info) {
H5TB_dfree(info->mod_tree, (void (*)(void*))H5FP_free_mod_node, NULL);
@@ -602,7 +602,7 @@ H5FP_free_file_info_node(H5FP_file_info *info)
static int
H5FP_file_info_cmp(H5FP_file_info *k1, H5FP_file_info *k2, int UNUSED cmparg)
{
- FUNC_ENTER_NOINIT(H5FP_file_info_cmp);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_file_info_cmp);
assert(k1);
assert(k2);
FUNC_LEAVE_NOAPI(k1->file_id - k2->file_id);
@@ -621,7 +621,7 @@ H5FP_new_file_info_node(unsigned file_id)
{
H5FP_file_info *ret_value;
- FUNC_ENTER_NOINIT(H5FP_new_file_info_node);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_new_file_info_node);
if ((ret_value = (H5FP_file_info *)H5MM_malloc(sizeof(H5FP_file_info))) == NULL)
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "out of memory");
@@ -661,7 +661,7 @@ H5FP_find_file_info(unsigned file_id)
H5TB_NODE *node = NULL;
H5FP_file_info *ret_value = NULL;
- FUNC_ENTER_NOINIT(H5FP_find_file_info);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_find_file_info);
if (file_info_tree && file_info_tree->root) {
H5FP_file_info s;
@@ -694,7 +694,7 @@ H5FP_add_new_file_info_to_list(unsigned file_id, haddr_t maxaddr,
H5FP_file_info *info;
herr_t ret_value = FAIL;
- FUNC_ENTER_NOINIT(H5FP_add_new_file_info_to_list);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_add_new_file_info_to_list);
if ((info = H5FP_new_file_info_node(file_id)) != NULL) {
int mrc;
@@ -753,7 +753,7 @@ H5FP_remove_file_id_from_list(unsigned file_id)
H5TB_NODE *node;
herr_t ret_value = FAIL;
- FUNC_ENTER_NOINIT(H5FP_remove_file_id_from_list);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_remove_file_id_from_list);
s.file_id = file_id; /* This is the key field for the TBBT */
@@ -786,7 +786,7 @@ H5FP_send_reply(unsigned to, unsigned req_id, unsigned file_id, H5FP_status_t st
herr_t ret_value = SUCCEED;
int mrc;
- FUNC_ENTER_NOINIT(H5FP_send_reply);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_send_reply);
reply.req_id = req_id;
reply.file_id = file_id;
@@ -817,7 +817,7 @@ H5FP_dump(H5FP_file_info *info, unsigned to, unsigned req_id, unsigned file_id)
herr_t ret_value = SUCCEED;
int mrc;
- FUNC_ENTER_NOINIT(H5FP_dump);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_dump);
/* check args */
assert(info);
@@ -891,7 +891,7 @@ static unsigned
H5FP_gen_sap_file_id()
{
static unsigned i = 0;
- FUNC_ENTER_NOINIT(H5FP_gen_sap_file_id);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_gen_sap_file_id);
FUNC_LEAVE_NOAPI(i++);
}
@@ -909,7 +909,7 @@ H5FP_sap_handle_open_request(H5FP_request_t *req, unsigned UNUSED md_size)
herr_t ret_value = SUCCEED;
int mrc;
- FUNC_ENTER_NOINIT(H5FP_sap_handle_open_request);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_open_request);
if (req->obj_type == H5FP_OBJ_FILE) {
unsigned new_file_id = H5FP_gen_sap_file_id();
@@ -962,7 +962,7 @@ H5FP_sap_handle_lock_request(H5FP_request_t *req)
unsigned i, j;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5FP_sap_handle_lock_request);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_lock_request);
if ((oids = (struct lock_group *)H5MM_malloc(list_size *
sizeof(struct lock_group))) == NULL) {
@@ -1168,7 +1168,7 @@ H5FP_sap_handle_release_lock_request(H5FP_request_t *req)
herr_t ret_value = SUCCEED;
unsigned i, j;
- FUNC_ENTER_NOINIT(H5FP_sap_handle_release_lock_request);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_release_lock_request);
if ((oids = (struct release_group *)H5MM_malloc(list_size *
sizeof(struct release_group))) == NULL) {
@@ -1273,7 +1273,7 @@ H5FP_sap_handle_read_request(H5FP_request_t *req)
char *metadata = NULL;
int mrc;
- FUNC_ENTER_NOINIT(H5FP_sap_handle_read_request);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_read_request);
r.req_id = req->req_id;
r.file_id = req->file_id;
@@ -1355,7 +1355,7 @@ H5FP_sap_handle_write_request(H5FP_request_t *req, char *mdata, unsigned md_size
H5FP_status_t exit_state = H5FP_STATUS_OK;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5FP_sap_handle_write_request);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_write_request);
if ((info = H5FP_find_file_info(req->file_id)) != NULL) {
if (info->num_mods >= H5FP_MDATA_CACHE_HIGHWATER_MARK) {
@@ -1415,7 +1415,7 @@ H5FP_sap_handle_flush_request(H5FP_request_t *req)
H5FP_status_t exit_state = H5FP_STATUS_OK;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5FP_sap_handle_flush_request);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_flush_request);
if ((info = H5FP_find_file_info(req->file_id)) != NULL) {
if (info->num_mods) {
@@ -1461,7 +1461,7 @@ H5FP_sap_handle_close_request(H5FP_request_t *req)
H5FP_status_t exit_state = H5FP_STATUS_OK;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5FP_sap_handle_close_request);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_close_request);
if ((info = H5FP_find_file_info(req->file_id)) != NULL) {
int comm_size;
@@ -1507,7 +1507,7 @@ H5FP_sap_handle_alloc_request(H5FP_request_t *req)
int mrc;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5FP_sap_handle_alloc_request);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_alloc_request);
sap_alloc.req_id = req->req_id;
sap_alloc.file_id = req->file_id;
@@ -1570,7 +1570,7 @@ H5FP_sap_handle_free_request(H5FP_request_t *req)
herr_t ret_value = SUCCEED;
int mrc;
- FUNC_ENTER_NOINIT(H5FP_sap_handle_free_request);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_free_request);
sap_alloc.req_id = req->req_id;
sap_alloc.file_id = req->file_id;
@@ -1617,7 +1617,7 @@ H5FP_sap_handle_get_eoa_request(H5FP_request_t *req)
int mrc;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5FP_sap_handle_get_eoa_request);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_get_eoa_request);
sap_eoa.req_id = req->req_id;
sap_eoa.file_id = req->file_id;
@@ -1656,7 +1656,7 @@ H5FP_sap_handle_set_eoa_request(H5FP_request_t *req)
int mrc;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5FP_sap_handle_set_eoa_request);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FP_sap_handle_set_eoa_request);
if ((info = H5FP_find_file_info(req->file_id)) != NULL) {
/* Get the EOA. */
@@ -1689,7 +1689,7 @@ H5FP_sap_handle_update_eoma_eosda_request(H5FP_request_t *req)
herr_t ret_value = SUCCEED;
int mrc;
- FUNC_ENTER_NOINIT(H5FP_sap_handle_update_eoma_eosda_request);
+ FUNC_ENTER_NOAPI_NOINIT(H5FP_sap_handle_update_eoma_eosda_request);
sap_eoa.req_id = req->req_id;
sap_eoa.file_id = req->file_id;
diff --git a/src/H5Fcontig.c b/src/H5Fcontig.c
index 777e7c6..32f1759 100644
--- a/src/H5Fcontig.c
+++ b/src/H5Fcontig.c
@@ -119,7 +119,7 @@ done:
*/
herr_t
H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout,
- struct H5P_genplist_t *dc_plist, const struct H5S_t *space,
+ const struct H5S_t *space,
const struct H5O_fill_t *fill, size_t elmt_size)
{
hssize_t snpoints; /* Number of points in space (for error checking) */
@@ -147,7 +147,6 @@ H5F_contig_fill(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *layout,
assert(layout && H5D_CONTIGUOUS==layout->type);
assert(layout->ndims>0 && layout->ndims<=H5O_LAYOUT_NDIMS);
assert(H5F_addr_defined(layout->addr));
- assert(dc_plist!=NULL);
assert(space);
assert(elmt_size>0);
diff --git a/src/H5Fistore.c b/src/H5Fistore.c
index 90b9168..af66624 100644
--- a/src/H5Fistore.c
+++ b/src/H5Fistore.c
@@ -241,8 +241,8 @@ H5F_istore_sizeof_rkey(H5F_t UNUSED *f, const void *_udata)
const H5F_istore_ud1_t *udata = (const H5F_istore_ud1_t *) _udata;
size_t nbytes;
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5F_istore_sizeof_rkey);
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_istore_sizeof_rkey);
assert(udata);
assert(udata->mesg.ndims > 0 && udata->mesg.ndims <= H5O_LAYOUT_NDIMS);
@@ -795,7 +795,7 @@ H5F_istore_iter_allocated (H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key,
H5F_istore_ud1_t *bt_udata = (H5F_istore_ud1_t *)_udata;
H5F_istore_key_t *lt_key = (H5F_istore_key_t *)_lt_key;
- FUNC_ENTER_NOINIT(H5F_istore_iter_allocated);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_istore_iter_allocated);
bt_udata->total_storage += lt_key->nbytes;
@@ -832,7 +832,7 @@ H5F_istore_iter_dump (H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_lt_key, hadd
H5F_istore_key_t *lt_key = (H5F_istore_key_t *)_lt_key;
unsigned u;
- FUNC_ENTER_NOINIT(H5F_istore_iter_dump);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_istore_iter_dump);
if (bt_udata->stream) {
if (0==bt_udata->total_storage) {
@@ -919,7 +919,7 @@ H5F_istore_flush_entry(H5F_t *f, hid_t dxpl_id, H5F_rdcc_ent_t *ent, hbool_t res
size_t alloc; /*bytes allocated for BUF */
hbool_t point_of_no_return = FALSE;
- FUNC_ENTER_NOINIT(H5F_istore_flush_entry);
+ FUNC_ENTER_NOAPI_NOINIT(H5F_istore_flush_entry);
assert(f);
assert(ent);
@@ -1051,7 +1051,7 @@ H5F_istore_preempt(H5F_t *f, hid_t dxpl_id, H5F_rdcc_ent_t * ent, hbool_t flush)
H5F_rdcc_t *rdcc = &(f->shared->rdcc);
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5F_istore_preempt);
+ FUNC_ENTER_NOAPI_NOINIT(H5F_istore_preempt);
assert(f);
assert(ent);
@@ -1223,7 +1223,7 @@ H5F_istore_prune (H5F_t *f, hid_t dxpl_id, size_t size)
H5F_rdcc_ent_t *n[2]; /*list next pointers */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5F_istore_prune);
+ FUNC_ENTER_NOAPI_NOINIT(H5F_istore_prune);
/*
* Preemption is accomplished by having multiple pointers (currently two)
@@ -1367,7 +1367,7 @@ H5F_istore_lock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
H5Z_EDC_t edc;
H5Z_cb_t cb_struct;
- FUNC_ENTER_NOINIT(H5F_istore_lock);
+ FUNC_ENTER_NOAPI_NOINIT(H5F_istore_lock);
assert(TRUE==H5P_isa_class(dxpl_id,H5P_DATASET_XFER));
plist=H5I_object(dxpl_id);
@@ -1630,7 +1630,7 @@ H5F_istore_unlock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
unsigned u;
H5P_genplist_t *plist; /* Property list */
- FUNC_ENTER_NOINIT(H5F_istore_unlock);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_istore_unlock);
if (UINT_MAX==*idx_hint) {
/*not in cache*/
@@ -2068,7 +2068,7 @@ H5F_istore_get_addr(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
unsigned u;
haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOINIT(H5F_istore_get_addr);
+ FUNC_ENTER_NOAPI_NOINIT(H5F_istore_get_addr);
assert(f);
assert(layout && (layout->ndims > 0));
@@ -2603,7 +2603,7 @@ H5F_istore_prune_extent(H5F_t *f, hid_t dxpl_id, void *_lt_key, haddr_t UNUSED a
* storage that contains the beginning of the logical address space represented by UDATA.
*/
- FUNC_ENTER_NOINIT(H5F_istore_prune_extent);
+ FUNC_ENTER_NOAPI_NOINIT(H5F_istore_prune_extent);
/* Figure out what chunks are no longer in use for the specified extent and release them */
for(u = 0; u < bt_udata->mesg.ndims - 1; u++)
diff --git a/src/H5Fprivate.h b/src/H5Fprivate.h
index 800d14e..3b2176c 100644
--- a/src/H5Fprivate.h
+++ b/src/H5Fprivate.h
@@ -434,8 +434,7 @@ H5_DLL ssize_t H5F_seq_writevv(H5F_t *f, hid_t dxpl_id, struct H5O_layout_t *lay
H5_DLL herr_t H5F_contig_create(H5F_t *f, hid_t dxpl_id,
struct H5O_layout_t *layout);
H5_DLL herr_t H5F_contig_fill(H5F_t *f, hid_t dxpl_id,
- struct H5O_layout_t *layout, struct H5P_genplist_t *dc_plist,
- const struct H5S_t *space,
+ struct H5O_layout_t *layout, const struct H5S_t *space,
const struct H5O_fill_t *fill, size_t elmt_size);
H5_DLL herr_t H5F_contig_delete(H5F_t *f, hid_t dxpl_id,
const struct H5O_layout_t *layout);
diff --git a/src/H5G.c b/src/H5G.c
index d90278d..f465de6 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -951,7 +951,7 @@ H5G_init_interface(void)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5G_init_interface);
+ FUNC_ENTER_NOAPI_NOINIT(H5G_init_interface);
/* Initialize the atom group for the group IDs */
if (H5I_init_group(H5I_GROUP, H5I_GROUPID_HASHSIZE, H5G_RESERVED_ATOMS,
@@ -996,7 +996,7 @@ H5G_term_interface(void)
size_t i;
int n=0;
- FUNC_ENTER_NOINIT(H5G_term_interface);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_term_interface);
if (interface_initialize_g) {
if ((n=H5I_nmembers(H5I_GROUP))) {
@@ -1124,8 +1124,8 @@ done:
static const char *
H5G_component(const char *name, size_t *size_p)
{
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5G_component);
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_component);
assert(name);
@@ -1165,7 +1165,7 @@ H5G_basename(const char *name, size_t *size_p)
{
size_t i;
- FUNC_ENTER_NOINIT(H5G_basename);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_basename);
/* Find the end of the base name */
i = HDstrlen(name);
@@ -1208,7 +1208,7 @@ H5G_normalize(const char *name)
unsigned last_slash; /* Flag to indicate last character was a slash */
char *ret_value; /* Return value */
- FUNC_ENTER_NOINIT(H5G_normalize);
+ FUNC_ENTER_NOAPI_NOINIT(H5G_normalize);
/* Sanity check */
assert(name);
@@ -1359,7 +1359,7 @@ H5G_namei(H5G_entry_t *loc_ent, const char *name, const char **rest/*out*/,
unsigned last_comp = 0; /* Flag to indicate that a component is the last component in the name */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5G_namei);
+ FUNC_ENTER_NOAPI_NOINIT(H5G_namei);
/* Set up "out" parameters */
if (rest)
@@ -2162,8 +2162,8 @@ done:
H5G_entry_t *
H5G_entof (H5G_t *grp)
{
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5G_entof);
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_entof);
FUNC_LEAVE_NOAPI(grp ? &(grp->ent) : NULL);
}
@@ -2188,8 +2188,8 @@ H5G_entof (H5G_t *grp)
H5F_t *
H5G_fileof (H5G_t *grp)
{
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5G_fileof);
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_fileof);
assert (grp);
@@ -3345,7 +3345,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_NOINIT(H5G_common_path);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_common_path);
/* Get component of each name */
fullpath=H5RS_get_str(fullpath_r);
@@ -3415,7 +3415,7 @@ H5G_replace_ent(void *obj_ptr, hid_t obj_id, void *key)
H5F_t *top_loc_file; /* Top file in location's mounted file chain */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5G_replace_ent);
+ FUNC_ENTER_NOAPI_NOINIT(H5G_replace_ent);
assert(obj_ptr);
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index 928de64..5e5fb4e 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -162,8 +162,8 @@ H5FL_BLK_DEFINE_STATIC(symbol_node);
static size_t
H5G_node_sizeof_rkey(H5F_t *f, const void UNUSED * udata)
{
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5G_node_sizeof_rkey);
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_sizeof_rkey);
FUNC_LEAVE_NOAPI(H5F_SIZEOF_SIZE(f)); /*the name offset */
}
@@ -303,7 +303,7 @@ done:
static size_t
H5G_node_size(H5F_t *f)
{
- FUNC_ENTER_NOINIT(H5G_node_size);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_size);
FUNC_LEAVE_NOAPI(H5G_NODE_SIZEOF_HDR(f) +
(2 * H5F_SYM_LEAF_K(f)) * H5G_SIZEOF_ENTRY(f));
@@ -561,7 +561,7 @@ done:
static herr_t
H5G_node_dest(H5F_t UNUSED *f, H5G_node_t *sym)
{
- FUNC_ENTER_NOINIT(H5G_node_dest);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_dest);
/*
* Check arguments.
@@ -600,7 +600,7 @@ H5G_node_clear(H5F_t *f, H5G_node_t *sym, hbool_t destroy)
int i; /* Local index variable */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5G_node_clear);
+ FUNC_ENTER_NOAPI_NOINIT(H5G_node_clear);
/*
* Check arguments.
diff --git a/src/H5HG.c b/src/H5HG.c
index 67fb7c1..b4b7f17 100644
--- a/src/H5HG.c
+++ b/src/H5HG.c
@@ -481,7 +481,7 @@ H5HG_dest (H5F_t *f, H5HG_heap_t *heap)
{
int i;
- FUNC_ENTER_NOINIT(H5HG_dest);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HG_dest);
/* Check arguments */
assert (heap);
@@ -523,7 +523,7 @@ H5HG_clear(H5F_t *f, H5HG_heap_t *heap, hbool_t destroy)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5HG_clear);
+ FUNC_ENTER_NOAPI_NOINIT(H5HG_clear);
/* Check arguments */
assert (heap);
@@ -567,7 +567,7 @@ H5HG_alloc (H5F_t *f, H5HG_heap_t *heap, int cwfsno, size_t size)
uint8_t *p = NULL;
size_t need = H5HG_SIZEOF_OBJHDR(f) + H5HG_ALIGN(size);
- FUNC_ENTER_NOINIT(H5HG_alloc);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HG_alloc);
/* Check args */
assert (heap);
diff --git a/src/H5HL.c b/src/H5HL.c
index b33b75f..67165d9 100644
--- a/src/H5HL.c
+++ b/src/H5HL.c
@@ -475,7 +475,7 @@ H5HL_serialize(H5F_t *f, H5HL_t *heap, uint8_t *buf)
uint8_t *p;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5HL_serialize)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_serialize)
/* check args */
assert(buf);
@@ -614,7 +614,7 @@ H5HL_dest(H5F_t UNUSED *f, H5HL_t *heap)
{
H5HL_free_t *fl;
- FUNC_ENTER_NOINIT(H5HL_dest);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_dest);
/* check arguments */
assert(heap);
@@ -655,7 +655,7 @@ H5HL_clear(H5F_t *f, H5HL_t *heap, hbool_t destroy)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5HL_clear);
+ FUNC_ENTER_NOAPI_NOINIT(H5HL_clear);
/* check arguments */
assert(heap);
@@ -808,9 +808,9 @@ H5HL_offset_into(H5F_t *f, const H5HL_t *heap, size_t offset)
{
/*
* We need to have called some other function before this to get a
- * valid heap pointer. So, this can remain "FUNC_ENTER_NOINIT"
+ * valid heap pointer. So, this can remain "FUNC_ENTER_NOAPI_NOINIT"
*/
- FUNC_ENTER_NOINIT(H5HL_offset_into)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_offset_into)
assert(f);
assert(heap);
assert(offset < heap->mem_alloc);
@@ -873,7 +873,7 @@ done:
static H5HL_free_t *
H5HL_remove_free(H5HL_t *heap, H5HL_free_t *fl)
{
- FUNC_ENTER_NOINIT(H5HL_remove_free);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_remove_free);
if (fl->prev) fl->prev->next = fl->next;
if (fl->next) fl->next->prev = fl->prev;
diff --git a/src/H5HP.c b/src/H5HP.c
index d62bd4e..2cf4287 100644
--- a/src/H5HP.c
+++ b/src/H5HP.c
@@ -93,7 +93,7 @@ H5HP_swim_max(H5HP_t *heap, size_t loc)
H5HP_info_t *obj; /* Temporary pointer to object to move in heap */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5HP_swim_max);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HP_swim_max);
/* Get copies of the information about the object to move in the heap */
val=heap->heap[loc].val;
@@ -151,7 +151,7 @@ H5HP_swim_min(H5HP_t *heap, size_t loc)
H5HP_info_t *obj; /* Temporary pointer to object to move in heap */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5HP_swim_min);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HP_swim_min);
/* Get copies of the information about the object to move in the heap */
val=heap->heap[loc].val;
@@ -209,7 +209,7 @@ H5HP_sink_max(H5HP_t *heap, size_t loc)
void *obj; /* Temporary pointer to object to move in heap */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5HP_sink_max);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HP_sink_max);
/* Get copies of the information about the object to move in the heap */
val=heap->heap[loc].val;
@@ -278,7 +278,7 @@ H5HP_sink_min(H5HP_t *heap, size_t loc)
void *obj; /* Temporary pointer to object to move in heap */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5HP_sink_min);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HP_sink_min);
/* Get copies of the information about the object to move in the heap */
val=heap->heap[loc].val;
diff --git a/src/H5I.c b/src/H5I.c
index 51e9cf8..6d624cd 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -141,7 +141,7 @@ static herr_t H5I_debug(H5I_type_t grp);
static herr_t
H5I_init_interface(void)
{
- FUNC_ENTER_NOINIT(H5I_init_interface);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5I_init_interface);
/*
* Make certain the ID types don't overflow the number of bits allocated
@@ -178,7 +178,7 @@ H5I_term_interface(void)
H5I_type_t grp;
int n=0;
- FUNC_ENTER_NOINIT(H5I_term_interface);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5I_term_interface);
if (interface_initialize_g) {
/* How many groups are still being used? */
@@ -849,7 +849,7 @@ H5I_get_file_id(hid_t obj_id)
H5G_entry_t *ent;
hid_t ret_value;
- FUNC_ENTER_NOINIT(H5I_get_file_id);
+ FUNC_ENTER_NOAPI_NOINIT(H5I_get_file_id);
/* Get object type */
switch(H5I_GRP(obj_id)) {
@@ -1172,7 +1172,7 @@ H5I_find_id(hid_t id)
unsigned hash_loc; /*bucket pointer */
H5I_id_info_t *ret_value = NULL; /*return value */
- FUNC_ENTER_NOINIT(H5I_find_id);
+ FUNC_ENTER_NOAPI_NOINIT(H5I_find_id);
/* Check arguments */
grp = H5I_GRP(id);
diff --git a/src/H5MM.c b/src/H5MM.c
index 9701bb9..dc3cd2c 100644
--- a/src/H5MM.c
+++ b/src/H5MM.c
@@ -58,8 +58,8 @@ static int interface_initialize_g = 0;
void *
H5MM_malloc(size_t size)
{
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5MM_malloc);
+ /* Use FUNC_ENTER_NOAPI_NOINIT here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT(H5MM_malloc);
assert(size);
@@ -91,8 +91,8 @@ H5MM_malloc(size_t size)
void *
H5MM_calloc(size_t size)
{
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5MM_calloc);
+ /* Use FUNC_ENTER_NOAPI_NOINIT here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT(H5MM_calloc);
assert(size);
@@ -129,8 +129,8 @@ H5MM_realloc(void *mem, size_t size)
{
void *ret_value;
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5MM_realloc);
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MM_realloc);
if (!mem) {
if (0 == size)
@@ -177,8 +177,8 @@ H5MM_xstrdup(const char *s)
{
char *ret_value=NULL;
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5MM_xstrdup);
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MM_xstrdup);
if (s) {
ret_value = H5MM_malloc(HDstrlen(s) + 1);
@@ -254,8 +254,8 @@ done:
void *
H5MM_xfree(void *mem)
{
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5MM_xfree);
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MM_xfree);
if (mem)
HDfree(mem);
diff --git a/src/H5O.c b/src/H5O.c
index 48c0751..c9fc875 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -170,7 +170,7 @@ H5FL_EXTERN(time_t);
static herr_t
H5O_init_interface(void)
{
- FUNC_ENTER_NOINIT(H5O_init_interface);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_init_interface);
/*
* Initialize functions that decode messages from symbol table entries.
@@ -265,7 +265,7 @@ H5O_init(H5F_t *f, hid_t dxpl_id, size_t size_hint, H5G_entry_t *ent/*out*/, had
haddr_t tmp_addr;
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOINIT(H5O_init);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_init);
/* check args */
assert(f);
@@ -810,7 +810,7 @@ H5O_dest(H5F_t UNUSED *f, H5O_t *oh)
{
unsigned i;
- FUNC_ENTER_NOINIT(H5O_dest);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_dest);
/* check args */
assert(oh);
@@ -867,7 +867,7 @@ H5O_clear(H5F_t *f, H5O_t *oh, hbool_t destroy)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5O_clear);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_clear);
/* check args */
assert(oh);
@@ -957,7 +957,7 @@ H5O_reset_real(const H5O_class_t *type, void *native)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5O_reset_real);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_reset_real);
/* check args */
assert(type);
@@ -1036,7 +1036,7 @@ H5O_free_real(const H5O_class_t *type, void *mesg)
{
void * ret_value=NULL; /* Return value */
- FUNC_ENTER_NOINIT(H5O_free_real);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_free_real);
/* check args */
assert(type);
@@ -1118,7 +1118,7 @@ H5O_copy_real (const H5O_class_t *type, const void *mesg, void *dst)
{
void *ret_value = NULL;
- FUNC_ENTER_NOINIT(H5O_copy_real);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_copy_real);
/* check args */
assert (type);
@@ -1393,7 +1393,7 @@ H5O_exists_real(H5G_entry_t *ent, const H5O_class_t *type, int sequence, hid_t d
unsigned u;
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOINIT(H5O_exists_real);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_exists_real);
assert(ent);
assert(ent->file);
@@ -1517,7 +1517,7 @@ H5O_read_real(H5G_entry_t *ent, const H5O_class_t *type, int sequence, void *mes
H5G_type_t cache_type;
void *ret_value = NULL;
- FUNC_ENTER_NOINIT(H5O_read_real);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_read_real);
/* check args */
assert(ent);
@@ -1602,7 +1602,7 @@ H5O_find_in_ohdr(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_class_t **type_p,
const H5O_class_t *type = NULL;
unsigned ret_value;
- FUNC_ENTER_NOINIT(H5O_find_in_ohdr);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_find_in_ohdr);
/* Check args */
assert(f);
@@ -2006,7 +2006,7 @@ H5O_append_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_class_t *type,
H5O_shared_t sh_mesg;
int ret_value = FAIL;
- FUNC_ENTER_NOINIT(H5O_append_real);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_append_real);
/* check args */
assert(f);
@@ -2054,7 +2054,7 @@ H5O_new_mesg(H5F_t *f, H5O_t *oh, unsigned *flags, const H5O_class_t *orig_type,
size_t size; /* Size of space allocated for object header */
unsigned ret_value=UFAIL; /* Return value */
- FUNC_ENTER_NOINIT(H5O_new_mesg);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_new_mesg);
/* check args */
assert(f);
@@ -2128,7 +2128,7 @@ H5O_write_mesg(H5O_t *oh, unsigned idx, const H5O_class_t *type,
H5O_mesg_t *idx_msg; /* Pointer to message to modify */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5O_write_mesg);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_write_mesg);
/* check args */
assert(oh);
@@ -2181,7 +2181,7 @@ H5O_touch_oh(H5F_t *f, H5O_t *oh, hbool_t force)
size_t size;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5O_touch_oh);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_touch_oh);
assert(oh);
@@ -2463,7 +2463,7 @@ H5O_remove_real(H5G_entry_t *ent, const H5O_class_t *type, int sequence, hid_t d
unsigned u;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5O_remove_real);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_remove_real);
/* check args */
assert(ent);
@@ -2559,7 +2559,7 @@ H5O_alloc_extend_chunk(H5O_t *oh, unsigned chunkno, size_t size)
uint8_t *old_addr;
unsigned ret_value;
- FUNC_ENTER_NOINIT(H5O_alloc_extend_chunk);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_alloc_extend_chunk);
/* check args */
assert(oh);
@@ -2694,7 +2694,7 @@ H5O_alloc_new_chunk(H5F_t *f, H5O_t *oh, size_t size)
unsigned u;
unsigned ret_value; /*return value */
- FUNC_ENTER_NOINIT(H5O_alloc_new_chunk);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_alloc_new_chunk);
/* check args */
assert (oh);
@@ -2877,7 +2877,7 @@ H5O_alloc(H5F_t *f, H5O_t *oh, const H5O_class_t *type, size_t size)
size_t aligned_size = H5O_ALIGN(size);
unsigned ret_value; /* Return value */
- FUNC_ENTER_NOINIT(H5O_alloc);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_alloc);
/* check args */
assert (oh);
@@ -3002,7 +3002,7 @@ H5O_share (H5F_t *f, hid_t dxpl_id, const H5O_class_t *type, const void *mesg,
void *buf = NULL;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5O_share);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_share);
/* Check args */
assert (f);
@@ -3188,7 +3188,7 @@ H5O_delete_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
unsigned u;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5O_delete_oh);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_delete_oh);
/* Check args */
assert (f);
@@ -3250,7 +3250,7 @@ H5O_delete_mesg(H5F_t *f, hid_t dxpl_id, H5O_mesg_t *mesg)
const H5O_class_t *type; /* Type of object to free */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5O_delete_mesg);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_delete_mesg);
/* Check args */
assert (f);
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index e399870..4d44075 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -97,7 +97,7 @@ H5O_dtype_decode_helper(H5F_t *f, const uint8_t **pp, H5T_t *dt)
size_t z;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5O_dtype_decode_helper);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_decode_helper);
/* check args */
assert(pp && *pp);
@@ -462,7 +462,7 @@ H5O_dtype_encode_helper(uint8_t **pp, const H5T_t *dt)
size_t n, z, aligned;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5O_dtype_encode_helper);
+ FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_encode_helper);
/* check args */
assert(pp && *pp);
diff --git a/src/H5P.c b/src/H5P.c
index bd09b6a..e41fcc8 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -123,7 +123,7 @@ H5P_do_prop_cb1(H5TB_TREE *tree, H5P_genprop_t *prop, H5P_prp_cb1_t cb)
H5P_genprop_t *pcopy=NULL; /* Copy of property to insert into TBBT */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5P_do_prop_cb1);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_do_prop_cb1);
/* Allocate space for a temporary copy of the property value */
if (NULL==(tmp_value=H5MM_malloc(prop->size)))
@@ -211,7 +211,7 @@ H5P_init_interface(void)
H5P_genclass_t *pclass; /* Pointer to property list class to create */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5P_init_interface);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_init_interface);
/*
* Initialize the Generic Property class & object groups.
@@ -310,7 +310,7 @@ H5P_term_interface(void)
int nclass=0;
int n=0;
- FUNC_ENTER_NOINIT(H5P_term_interface);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_term_interface);
if (interface_initialize_g) {
/* Destroy HDF5 library property classes & lists */
@@ -391,7 +391,7 @@ H5P_copy_pclass(H5P_genclass_t *pclass)
H5P_genprop_t *pcopy; /* Copy of property to insert into class */
H5P_genclass_t *ret_value=NULL; /* return value */
- FUNC_ENTER_NOINIT(H5P_copy_pclass);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_copy_pclass);
assert(pclass);
@@ -729,7 +729,7 @@ H5P_dup_prop(H5P_genprop_t *oprop, H5P_prop_within_t type)
H5P_genprop_t *prop=NULL; /* Pointer to new property copied */
H5P_genprop_t *ret_value; /* Return value */
- FUNC_ENTER_NOINIT(H5P_dup_prop);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_dup_prop);
assert(oprop);
assert(type!=H5P_PROP_WITHIN_UNKNOWN);
@@ -841,7 +841,7 @@ H5P_create_prop(const char *name, size_t size, H5P_prop_within_t type,
H5P_genprop_t *prop=NULL; /* Pointer to new property copied */
H5P_genprop_t *ret_value; /* Return value */
- FUNC_ENTER_NOINIT(H5P_create_prop);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_create_prop);
assert(name);
assert((size>0 && value!=NULL) || (size==0));
@@ -955,7 +955,7 @@ H5P_find_prop_plist(H5P_genplist_t *plist, const char *name)
H5TB_NODE *prop_node; /* TBBT node holding property */
H5P_genprop_t *ret_value; /* Property pointer return value */
- FUNC_ENTER_NOINIT(H5P_find_prop_plist);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_find_prop_plist);
assert(plist);
assert(name);
@@ -1018,7 +1018,7 @@ H5P_find_prop_pclass(H5P_genclass_t *pclass, const char *name)
H5TB_NODE *prop_node; /* TBBT node holding property */
H5P_genprop_t *ret_value; /* Property pointer return value */
- FUNC_ENTER_NOINIT(H5P_find_prop_pclass);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_find_prop_pclass);
assert(pclass);
assert(name);
@@ -1056,7 +1056,7 @@ done:
static herr_t
H5P_free_prop(H5P_genprop_t *prop)
{
- FUNC_ENTER_NOINIT(H5P_free_prop);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_free_prop);
assert(prop);
@@ -1098,7 +1098,7 @@ H5P_free_prop_void(void *_prop)
{
H5P_genprop_t *prop=(H5P_genprop_t *)_prop;
- FUNC_ENTER_NOINIT(H5P_free_prop_void);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_free_prop_void);
assert(prop);
@@ -1134,7 +1134,7 @@ H5P_free_all_prop(H5TB_TREE *tree,unsigned make_cb)
H5TB_NODE *curr_node, *next_node; /* Current & next nodes in TBBT */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5P_free_all_prop);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_free_all_prop);
assert(tree);
@@ -1189,7 +1189,7 @@ done:
herr_t
H5P_access_class(H5P_genclass_t *pclass, H5P_class_mod_t mod)
{
- FUNC_ENTER_NOINIT(H5P_access_class);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_access_class);
assert(pclass);
assert(mod>H5P_MOD_ERR && mod<H5P_MOD_MAX);
@@ -1278,13 +1278,13 @@ H5P_access_class(H5P_genclass_t *pclass, H5P_class_mod_t mod)
REVISION LOG
--------------------------------------------------------------------------*/
static int
-H5P_check_class(void *_obj, hid_t id, void *_key)
+H5P_check_class(void *_obj, hid_t UNUSED id, void *_key)
{
H5P_genclass_t *obj=(H5P_genclass_t *)_obj; /* Pointer to the class for this ID */
const H5P_check_class_t *key=(const H5P_check_class_t *)_key; /* Pointer to key information for comparison */
int ret_value=0; /* Return value */
- FUNC_ENTER_NOINIT(H5P_check_class);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_check_class);
assert(obj);
assert(H5I_GENPROP_CLS==H5I_get_type(id));
@@ -1344,7 +1344,7 @@ H5P_create_class(H5P_genclass_t *par_class, const char *name, unsigned internal,
H5P_genclass_t *pclass=NULL; /* Property list class created */
H5P_genclass_t *ret_value; /* return value */
- FUNC_ENTER_NOINIT(H5P_create_class);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_create_class);
assert(name);
/* Allow internal classes to break some rules */
@@ -1515,7 +1515,7 @@ H5P_create(H5P_genclass_t *pclass)
H5TB_TREE *seen=NULL; /* TBBT to hold names of properties already seen */
H5P_genplist_t *ret_value; /* Return value */
- FUNC_ENTER_NOINIT(H5P_create);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_create);
assert(pclass);
@@ -2228,7 +2228,7 @@ H5P_insert(H5P_genplist_t *plist, const char *name, size_t size,
H5TB_NODE *prop_node; /* TBBT node holding property */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5P_insert);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_insert);
assert(plist);
assert(name);
@@ -2679,7 +2679,7 @@ H5P_exist_plist(H5P_genplist_t *plist, const char *name)
{
htri_t ret_value=FAIL; /* return value */
- FUNC_ENTER_NOINIT(H5P_exist_plist);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_exist_plist);
assert(plist);
assert(name);
@@ -2739,7 +2739,7 @@ H5P_exist_pclass(H5P_genclass_t *pclass, const char *name)
{
htri_t ret_value=FAIL; /* return value */
- FUNC_ENTER_NOINIT(H5P_exist_pclass);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_exist_pclass);
assert(pclass);
assert(name);
@@ -2842,7 +2842,7 @@ H5P_get_size_plist(H5P_genplist_t *plist, const char *name, size_t *size)
H5P_genprop_t *prop; /* Temporary property pointer */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_NOINIT(H5P_get_size_plist);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_get_size_plist);
assert(plist);
assert(name);
@@ -2888,7 +2888,7 @@ H5P_get_size_pclass(H5P_genclass_t *pclass, const char *name, size_t *size)
H5P_genprop_t *prop; /* Temporary property pointer */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_NOINIT(H5P_get_size_pclass);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_get_size_pclass);
assert(pclass);
assert(name);
@@ -2996,7 +2996,7 @@ H5P_get_class(H5P_genplist_t *plist)
{
H5P_genclass_t *ret_value; /* return value */
- FUNC_ENTER_NOINIT(H5P_get_class);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_get_class);
assert(plist);
@@ -3084,7 +3084,7 @@ done:
static herr_t
H5P_get_nprops_plist(H5P_genplist_t *plist, size_t *nprops)
{
- FUNC_ENTER_NOINIT(H5P_get_nprops_plist);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_get_nprops_plist);
assert(plist);
assert(nprops);
@@ -3222,7 +3222,7 @@ H5P_cmp_prop(H5P_genprop_t *prop1, H5P_genprop_t *prop2)
int cmp_value; /* Value from comparison */
int ret_value=0; /* return value */
- FUNC_ENTER_NOINIT(H5P_cmp_prop);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_cmp_prop);
assert(prop1);
assert(prop2);
@@ -3306,7 +3306,7 @@ H5P_cmp_class(H5P_genclass_t *pclass1, H5P_genclass_t *pclass2)
int cmp_value; /* Value from comparison */
int ret_value=0; /* Return value */
- FUNC_ENTER_NOINIT(H5P_cmp_class);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_cmp_class);
assert(pclass1);
assert(pclass2);
@@ -3408,7 +3408,7 @@ H5P_cmp_plist(H5P_genplist_t *plist1, H5P_genplist_t *plist2)
int cmp_value; /* Value from comparison */
int ret_value=0; /* return value */
- FUNC_ENTER_NOINIT(H5P_cmp_plist);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_cmp_plist);
assert(plist1);
assert(plist2);
@@ -3560,7 +3560,7 @@ H5P_isa_class_real(H5P_genclass_t *pclass1, H5P_genclass_t *pclass2)
{
htri_t ret_value;
- FUNC_ENTER_NOINIT(H5P_isa_class_real);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_isa_class_real);
assert(pclass1);
assert(pclass2);
@@ -3786,7 +3786,7 @@ H5P_iterate_plist(hid_t plist_id, int *idx, H5P_iterate_t iter_func, void *iter_
int curr_idx=0; /* Current iteration index */
int ret_value=FAIL; /* Return value */
- FUNC_ENTER_NOINIT(H5P_iterate_plist);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_iterate_plist);
assert(idx);
assert(iter_func);
@@ -3943,7 +3943,7 @@ H5P_iterate_pclass(hid_t pclass_id, int *idx, H5P_iterate_t iter_func, void *ite
int curr_idx=0; /* Current iteration index */
int ret_value=FAIL; /* Return value */
- FUNC_ENTER_NOINIT(H5P_iterate_pclass);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_iterate_pclass);
assert(idx);
assert(iter_func);
@@ -4683,7 +4683,7 @@ H5P_copy_prop_plist(hid_t dst_id, hid_t src_id, const char *name)
H5P_genprop_t *new_prop=NULL; /* Pointer to new property */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_NOINIT(H5P_copy_prop_plist);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_copy_prop_plist);
assert(name);
@@ -4787,7 +4787,7 @@ H5P_copy_prop_pclass(H5P_genclass_t *dst_pclass, H5P_genclass_t *src_pclass, con
H5P_genprop_t *prop; /* Temporary property pointer */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_NOINIT(H5P_copy_prop_pclass);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_copy_prop_pclass);
assert(dst_pclass);
assert(src_pclass);
@@ -4917,7 +4917,7 @@ H5P_unregister(H5P_genclass_t *pclass, const char *name)
H5P_genprop_t *prop; /* Temporary property pointer */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5P_unregister);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_unregister);
assert(pclass);
assert(name);
@@ -5026,7 +5026,7 @@ H5P_close(void *_plist)
H5P_genprop_t *tmp; /* Temporary pointer to properties */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_NOINIT(H5P_close);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_close);
assert(plist);
@@ -5292,7 +5292,7 @@ H5P_get_class_path(H5P_genclass_t *pclass)
size_t my_path_len; /* This class's name's length */
char *ret_value; /* return value */
- FUNC_ENTER_NOINIT(H5P_get_class_path);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_get_class_path);
assert(pclass);
@@ -5359,7 +5359,7 @@ H5P_open_class_path(const char *path)
H5P_genclass_t *ret_value; /* Return value */
H5P_check_class_t check_info; /* Structure to hold the information for checking duplicate names */
- FUNC_ENTER_NOINIT(H5P_open_class_path);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_open_class_path);
assert(path);
@@ -5432,7 +5432,7 @@ H5P_get_class_parent(H5P_genclass_t *pclass)
{
H5P_genclass_t *ret_value; /* return value */
- FUNC_ENTER_NOINIT(H5P_get_class_parent);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_get_class_parent);
assert(pclass);
@@ -5519,7 +5519,7 @@ H5P_close_class(void *_pclass)
H5P_genclass_t *pclass=(H5P_genclass_t *)_pclass;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5P_close_class);
+ FUNC_ENTER_NOAPI_NOINIT(H5P_close_class);
assert(pclass);
diff --git a/src/H5R.c b/src/H5R.c
index 83be25b..a1d3281 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -60,7 +60,7 @@ H5R_init_interface(void)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5R_init_interface);
+ FUNC_ENTER_NOAPI_NOINIT(H5R_init_interface);
/* Initialize the atom group for the file IDs */
if (H5I_init_group(H5I_REFERENCE, H5I_REFID_HASHSIZE, H5R_RESERVED_ATOMS,
@@ -94,7 +94,7 @@ H5R_term_interface(void)
{
int n=0;
- FUNC_ENTER_NOINIT(H5R_term_interface);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5R_term_interface);
if (interface_initialize_g) {
if ((n=H5I_nmembers(H5I_REFERENCE))) {
@@ -143,7 +143,7 @@ H5R_create(void *_ref, H5G_entry_t *loc, const char *name, H5R_type_t ref_type,
H5G_stat_t sb; /* Stat buffer for retrieving OID */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5R_create);
+ FUNC_ENTER_NOAPI_NOINIT(H5R_create);
assert(_ref);
assert(loc);
@@ -333,7 +333,7 @@ H5R_dereference(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, void *_ref)
int oid_type; /* type of object being dereferenced */
hid_t ret_value;
- FUNC_ENTER_NOINIT(H5R_dereference);
+ FUNC_ENTER_NOAPI_NOINIT(H5R_dereference);
assert(_ref);
assert(ref_type>H5R_BADTYPE || ref_type<H5R_MAXTYPE);
@@ -515,7 +515,7 @@ H5R_get_region(H5F_t *file, hid_t dxpl_id, H5R_type_t UNUSED ref_type, void *_re
uint8_t *buf; /* Buffer to store serialized selection in */
H5S_t *ret_value;
- FUNC_ENTER_NOINIT(H5R_get_region);
+ FUNC_ENTER_NOAPI_NOINIT(H5R_get_region);
assert(_ref);
assert(ref_type==H5R_DATASET_REGION);
@@ -642,7 +642,7 @@ H5R_get_obj_type(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, void *_ref)
uint8_t *p; /* Pointer to OID to store */
H5G_obj_t ret_value; /* Return value */
- FUNC_ENTER_NOINIT(H5R_get_obj_type);
+ FUNC_ENTER_NOAPI_NOINIT(H5R_get_obj_type);
assert(file);
assert(_ref);
diff --git a/src/H5RS.c b/src/H5RS.c
index f65244e..d55d725 100644
--- a/src/H5RS.c
+++ b/src/H5RS.c
@@ -68,7 +68,7 @@ H5RS_xstrdup(const char *s)
{
char *ret_value; /* Return value */
- FUNC_ENTER_NOINIT(H5RS_xstrdup);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5RS_xstrdup);
if (s) {
ret_value = H5FL_BLK_MALLOC(str_buf,HDstrlen(s) + 1);
@@ -351,7 +351,7 @@ int
H5RS_cmp(const H5RS_str_t *rs1, const H5RS_str_t *rs2)
{
/* Can't return invalid value from this function */
- FUNC_ENTER_NOINIT(H5RS_cmp);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5RS_cmp);
/* Sanity check */
assert(rs1);
diff --git a/src/H5S.c b/src/H5S.c
index 0f1e905..60af326 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -83,7 +83,7 @@ H5S_init_interface(void)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_init_interface);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_init_interface);
/* Initialize the atom group for the file IDs */
if (H5I_init_group(H5I_DATASPACE, H5I_DATASPACEID_HASHSIZE,
@@ -133,7 +133,7 @@ H5S_term_interface(void)
char buf[256];
#endif
- FUNC_ENTER_NOINIT(H5S_term_interface);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_term_interface);
if (interface_initialize_g) {
if ((n=H5I_nmembers(H5I_DATASPACE))) {
diff --git a/src/H5ST.c b/src/H5ST.c
index e153bf6..90d61a3 100644
--- a/src/H5ST.c
+++ b/src/H5ST.c
@@ -93,7 +93,7 @@ done:
static herr_t
H5ST_close_internal(H5ST_ptr_t p)
{
- FUNC_ENTER_NOINIT(H5ST_close_internal);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5ST_close_internal);
/* Recursively free TST */
if(p) {
@@ -297,7 +297,7 @@ H5ST_find_internal(H5ST_ptr_t p, const char *s)
{
H5ST_ptr_t ret_value=NULL; /* Return value */
- FUNC_ENTER_NOINIT(H5ST_find_internal);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5ST_find_internal);
while (p) {
if (*s < p->splitchar)
@@ -412,7 +412,7 @@ H5ST_findfirst_internal(H5ST_ptr_t p)
{
H5ST_ptr_t ret_value=NULL; /* Return value */
- FUNC_ENTER_NOINIT(H5ST_findfirst_internal);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5ST_findfirst_internal);
while(p) {
/* Find least node in current tree */
@@ -491,7 +491,7 @@ H5ST_getnext(H5ST_ptr_t p)
{
H5ST_ptr_t ret_value=NULL; /* Return value */
- FUNC_ENTER_NOINIT(H5ST_getnext);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5ST_getnext);
/* If the node to continue from has higher-valued nodes attached */
if(p->hikid) {
@@ -593,7 +593,7 @@ H5ST_delete_internal(H5ST_ptr_t *root, H5ST_ptr_t p)
H5ST_ptr_t q, /* Temporary pointer to TST node */
newp; /* Pointer to node which will replace deleted node in tree */
- FUNC_ENTER_NOINIT(H5ST_delete_internal);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5ST_delete_internal);
/* Find node to replace one being deleted */
if(p->lokid) {
@@ -743,7 +743,7 @@ done:
herr_t
H5ST_dump_internal(H5ST_ptr_t p)
{
- FUNC_ENTER_NOINIT(H5ST_dump_internal);
+ FUNC_ENTER_NOAPI_NOINIT(H5ST_dump_internal);
if (p) {
printf("p=%p\n",p);
diff --git a/src/H5Sall.c b/src/H5Sall.c
index 01e0077..4dfcc70 100644
--- a/src/H5Sall.c
+++ b/src/H5Sall.c
@@ -110,7 +110,7 @@ H5S_all_iter_coords (const H5S_sel_iter_t *iter, hssize_t *coords)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_all_iter_coords);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_all_iter_coords);
/* Check args */
assert (iter);
@@ -145,7 +145,7 @@ H5S_all_iter_block (const H5S_sel_iter_t *iter, hssize_t *start, hssize_t *end)
{
unsigned u; /* Local index variable */
- FUNC_ENTER_NOINIT(H5S_all_iter_block);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_all_iter_block);
/* Check args */
assert (iter);
@@ -182,7 +182,7 @@ H5S_all_iter_block (const H5S_sel_iter_t *iter, hssize_t *start, hssize_t *end)
static hsize_t
H5S_all_iter_nelmts (const H5S_sel_iter_t *iter)
{
- FUNC_ENTER_NOINIT(H5S_all_iter_nelmts);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_all_iter_nelmts);
/* Check args */
assert (iter);
@@ -211,7 +211,7 @@ H5S_all_iter_nelmts (const H5S_sel_iter_t *iter)
static htri_t
H5S_all_iter_has_next_block (const H5S_sel_iter_t UNUSED *iter)
{
- FUNC_ENTER_NOINIT(H5S_all_iter_has_next_block);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_all_iter_has_next_block);
/* Check args */
assert (iter);
@@ -241,7 +241,7 @@ H5S_all_iter_has_next_block (const H5S_sel_iter_t UNUSED *iter)
static herr_t
H5S_all_iter_next(H5S_sel_iter_t *iter, size_t nelem)
{
- FUNC_ENTER_NOINIT(H5S_all_iter_next);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_all_iter_next);
/* Check args */
assert (iter);
@@ -274,7 +274,7 @@ H5S_all_iter_next(H5S_sel_iter_t *iter, size_t nelem)
static herr_t
H5S_all_iter_next_block(H5S_sel_iter_t UNUSED *iter)
{
- FUNC_ENTER_NOINIT(H5S_all_iter_next_block);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_all_iter_next_block);
/* Check args */
assert (iter);
@@ -303,7 +303,7 @@ H5S_all_iter_next_block(H5S_sel_iter_t UNUSED *iter)
static herr_t
H5S_all_iter_release (H5S_sel_iter_t UNUSED * iter)
{
- FUNC_ENTER_NOINIT(H5S_all_iter_release);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_all_iter_release);
/* Check args */
assert (iter);
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index c3be043..5ddf5a3 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -81,7 +81,7 @@ H5S_hyper_print_spans_helper(struct H5S_hyper_span_t *span,unsigned depth)
{
struct H5S_hyper_span_t *tmp_span;
- FUNC_ENTER_NOINIT(H5S_hyper_print_spans_helper);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_print_spans_helper);
tmp_span=span;
while(tmp_span) {
@@ -99,7 +99,7 @@ H5S_hyper_print_spans_helper(struct H5S_hyper_span_t *span,unsigned depth)
static herr_t
H5S_hyper_print_spans(const struct H5S_hyper_span_info_t *span_lst)
{
- FUNC_ENTER_NOINIT(H5S_hyper_print_spans);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_print_spans);
if(span_lst!=NULL) {
HDfprintf(stderr,"%s: spans=%p, count=%u, scratch=%p, head=%p\n",FUNC,span_lst,span_lst->count,span_lst->scratch,span_lst->head);
@@ -354,7 +354,7 @@ done:
static herr_t
H5S_hyper_iter_coords (const H5S_sel_iter_t *iter, hssize_t *coords)
{
- FUNC_ENTER_NOINIT(H5S_hyper_iter_coords);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_coords);
/* Check args */
assert (iter);
@@ -411,7 +411,7 @@ H5S_hyper_iter_block (const H5S_sel_iter_t *iter, hssize_t *start, hssize_t *end
{
unsigned u; /* Local index variable */
- FUNC_ENTER_NOINIT(H5S_hyper_iter_block);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_block);
/* Check args */
assert (iter);
@@ -460,7 +460,7 @@ H5S_hyper_iter_block (const H5S_sel_iter_t *iter, hssize_t *start, hssize_t *end
static hsize_t
H5S_hyper_iter_nelmts (const H5S_sel_iter_t *iter)
{
- FUNC_ENTER_NOINIT(H5S_hyper_iter_nelmts);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_nelmts);
/* Check args */
assert (iter);
@@ -492,7 +492,7 @@ H5S_hyper_iter_has_next_block(const H5S_sel_iter_t *iter)
unsigned u; /* Local index variable */
herr_t ret_value=FALSE; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_iter_has_next_block);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_has_next_block);
/* Check args */
assert (iter);
@@ -551,7 +551,7 @@ H5S_hyper_iter_next(H5S_sel_iter_t *iter, size_t nelem)
int fast_dim; /* Rank of the fastest changing dimension for the dataspace */
unsigned i; /* Counters */
- FUNC_ENTER_NOINIT(H5S_hyper_iter_next);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_next);
/* Check for the special case of just one H5Sselect_hyperslab call made */
/* (i.e. a regular hyperslab selection */
@@ -766,7 +766,7 @@ H5S_hyper_iter_next_block(H5S_sel_iter_t *iter)
int fast_dim; /* Rank of the fastest changing dimension for the dataspace */
unsigned u; /* Counters */
- FUNC_ENTER_NOINIT(H5S_hyper_iter_next_block);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_next_block);
/* Check for the special case of just one H5Sselect_hyperslab call made */
/* (i.e. a regular hyperslab selection */
@@ -948,7 +948,7 @@ H5S_hyper_iter_next_block(H5S_sel_iter_t *iter)
static herr_t
H5S_hyper_iter_release (H5S_sel_iter_t *iter)
{
- FUNC_ENTER_NOINIT(H5S_hyper_iter_release);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_release);
/* Check args */
assert (iter);
@@ -1044,7 +1044,7 @@ H5S_hyper_new_span (hssize_t low, hssize_t high, H5S_hyper_span_info_t *down, H5
{
H5S_hyper_span_t *ret_value;
- FUNC_ENTER_NOINIT(H5S_hyper_new_span);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_new_span);
/* Allocate a new span node */
if((ret_value = H5FL_MALLOC(H5S_hyper_span_t))==NULL)
@@ -1092,7 +1092,7 @@ H5S_hyper_span_precompute_helper (H5S_hyper_span_info_t *spans, size_t elmt_size
H5S_hyper_span_t *span; /* Hyperslab span */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_span_precompute_helper);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_span_precompute_helper);
assert(spans);
@@ -1150,7 +1150,7 @@ H5S_hyper_span_precompute (H5S_hyper_span_info_t *spans, size_t elmt_size)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_span_precompute);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_span_precompute);
assert(spans);
@@ -1190,7 +1190,7 @@ H5S_hyper_span_scratch (H5S_hyper_span_info_t *spans, void *scr_value)
H5S_hyper_span_t *span; /* Hyperslab span */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_span_scratch);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_span_scratch);
assert(spans);
@@ -1244,7 +1244,7 @@ H5S_hyper_copy_span_helper (H5S_hyper_span_info_t *spans)
H5S_hyper_span_info_t *new_down; /* New down span tree */
H5S_hyper_span_info_t *ret_value;
- FUNC_ENTER_NOINIT(H5S_hyper_copy_span_helper);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_copy_span_helper);
assert(spans);
@@ -1330,7 +1330,7 @@ H5S_hyper_copy_span (H5S_hyper_span_info_t *spans)
{
H5S_hyper_span_info_t *ret_value;
- FUNC_ENTER_NOINIT(H5S_hyper_copy_span);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_copy_span);
assert(spans);
@@ -1373,7 +1373,7 @@ H5S_hyper_cmp_spans (H5S_hyper_span_info_t *span_info1, H5S_hyper_span_info_t *s
htri_t nest=FAIL;
htri_t ret_value=FAIL;
- FUNC_ENTER_NOINIT(H5S_hyper_cmp_spans);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_cmp_spans);
/* Check for redundant comparison */
if(span_info1==span_info2)
@@ -1477,7 +1477,7 @@ H5S_hyper_free_span_info (H5S_hyper_span_info_t *span_info)
H5S_hyper_span_t *span, *next_span;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_free_span_info);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_free_span_info);
assert(span_info);
@@ -1529,7 +1529,7 @@ H5S_hyper_free_span (H5S_hyper_span_t *span)
{
herr_t ret_value=SUCCEED;
- FUNC_ENTER_NOINIT(H5S_hyper_free_span);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_free_span);
assert(span);
@@ -1652,7 +1652,7 @@ H5S_hyper_is_valid_helper (const H5S_hyper_span_info_t *spans, const hssize_t *o
htri_t tmp; /* temporary return value */
htri_t ret_value=TRUE; /* return value */
- FUNC_ENTER_NOINIT(H5S_hyper_is_valid_helper);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_is_valid_helper);
assert(spans);
assert(offset);
@@ -1779,7 +1779,7 @@ H5S_hyper_span_nblocks (H5S_hyper_span_info_t *spans)
H5S_hyper_span_t *span; /* Hyperslab span */
hssize_t ret_value;
- FUNC_ENTER_NOINIT(H5S_hyper_span_nblocks);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_span_nblocks);
/* Count the number of elements in the span tree */
if(spans==NULL)
@@ -1827,7 +1827,7 @@ H5S_get_select_hyper_nblocks(H5S_t *space)
hssize_t ret_value; /* return value */
unsigned u; /* Counter */
- FUNC_ENTER_NOINIT(H5S_get_select_hyper_nblocks);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_get_select_hyper_nblocks);
assert(space);
@@ -1966,7 +1966,7 @@ H5S_hyper_serialize_helper (const H5S_hyper_span_info_t *spans, hssize_t *start,
hsize_t u; /* Index variable */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_NOINIT(H5S_hyper_serialize_helper);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_serialize_helper);
/* Sanity checks */
assert(spans);
@@ -2425,7 +2425,7 @@ H5S_get_select_hyper_blocklist(H5S_t *space, hsize_t startblock, hsize_t numbloc
int done; /* Whether we are done with the iteration */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_get_select_hyper_blocklist);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_get_select_hyper_blocklist);
assert(space);
assert(buf);
@@ -2613,7 +2613,7 @@ H5S_hyper_bounds_helper (const H5S_hyper_span_info_t *spans, const hssize_t *off
H5S_hyper_span_t *curr; /* Hyperslab information nodes */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_bounds_helper);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_bounds_helper);
assert(spans);
assert(offset);
@@ -3096,7 +3096,7 @@ done:
static herr_t
H5S_hyper_recover_span (unsigned *recover, H5S_hyper_span_t **curr_span, H5S_hyper_span_t *next_span)
{
- FUNC_ENTER_NOINIT(H5S_hyper_recover_span);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_recover_span);
assert(recover);
assert(curr_span);
@@ -3139,7 +3139,7 @@ H5S_hyper_coord_to_span(unsigned rank, hssize_t *coords)
H5S_hyper_span_info_t *down=NULL; /* Pointer to new span tree for next level down */
H5S_hyper_span_t *ret_value=NULL; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_coord_to_span);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_coord_to_span);
assert(rank>0);
assert(coords);
@@ -3208,7 +3208,7 @@ H5S_hyper_add_span_element_helper(H5S_hyper_span_info_t *span_tree, unsigned ran
H5S_hyper_span_t *new_span; /* New span created for element */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_add_span_element_helper);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_add_span_element_helper);
assert(span_tree);
assert(rank>0);
@@ -3402,7 +3402,7 @@ H5S_hyper_add_span_element(H5S_t *space, unsigned rank, hssize_t *coords)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_add_span_element);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_add_span_element);
assert(space);
assert(rank>0);
@@ -3488,7 +3488,7 @@ H5S_hyper_reset_scratch(H5S_t *space)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_reset_scratch);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_reset_scratch);
assert(space);
@@ -3528,7 +3528,7 @@ H5S_hyper_convert(H5S_t *space)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_convert);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_convert);
assert(space);
@@ -3597,7 +3597,7 @@ H5S_hyper_intersect_helper (H5S_hyper_span_info_t *spans1, H5S_hyper_span_info_t
htri_t status; /* Status from recursive call */
htri_t ret_value=FALSE; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_intersect_helper);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_intersect_helper);
/* Sanity check */
assert((spans1 && spans2) || (spans1==NULL && spans2==NULL));
@@ -3664,7 +3664,7 @@ H5S_hyper_intersect (H5S_t *space1, H5S_t *space2)
{
htri_t ret_value=FAIL; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_intersect);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_intersect);
/* Sanity check */
assert(space1);
@@ -3712,7 +3712,7 @@ H5S_hyper_adjust_helper (H5S_hyper_span_info_t *spans, const hssize_t *offset)
H5S_hyper_span_t *span; /* Pointer to current span in span tree */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_adjust_helper);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_adjust_helper);
/* Sanity check */
assert(spans);
@@ -3774,7 +3774,7 @@ H5S_hyper_adjust(H5S_t *space, const hssize_t *offset)
unsigned u; /* Local index variable */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_adjust);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_adjust);
assert(space);
assert(offset);
@@ -3827,7 +3827,7 @@ H5S_hyper_move_helper (H5S_hyper_span_info_t *spans, const hssize_t *offset)
H5S_hyper_span_t *span; /* Pointer to current span in span tree */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_move_helper);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_move_helper);
/* Sanity check */
assert(spans);
@@ -3889,7 +3889,7 @@ H5S_hyper_move(H5S_t *space, const hssize_t *offset)
unsigned u; /* Local index variable */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_move);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_move);
assert(space);
assert(offset);
@@ -3945,7 +3945,7 @@ H5S_hyper_append_span (H5S_hyper_span_t **prev_span, H5S_hyper_span_info_t ** sp
H5S_hyper_span_t *new_span;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_append_span);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_append_span);
assert(prev_span);
assert(span_tree);
@@ -4063,7 +4063,7 @@ H5S_hyper_clip_spans (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_s
unsigned recover_a, recover_b; /* Flags to indicate when to recover temporary spans */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_clip_spans);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_clip_spans);
/* Check args */
assert (a_spans);
@@ -4553,7 +4553,7 @@ H5S_hyper_merge_spans_helper (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_inf
unsigned recover_a, recover_b; /* Flags to indicate when to recover temporary spans */
H5S_hyper_span_info_t *ret_value;
- FUNC_ENTER_NOINIT(H5S_hyper_merge_spans_helper);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_merge_spans_helper);
/* Make certain both 'a' & 'b' spans have down span trees or neither does */
assert((a_spans!=NULL && b_spans!=NULL) || (a_spans==NULL && b_spans==NULL));
@@ -4856,7 +4856,7 @@ done:
static herr_t
H5S_hyper_merge_spans (H5S_t *space, H5S_hyper_span_info_t *new_spans)
{
- FUNC_ENTER_NOINIT(H5S_hyper_merge_spans);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_merge_spans);
/* Check args */
assert (space);
@@ -4909,7 +4909,7 @@ H5S_hyper_spans_nelem (H5S_hyper_span_info_t *spans)
H5S_hyper_span_t *span; /* Hyperslab span */
hssize_t ret_value;
- FUNC_ENTER_NOINIT(H5S_hyper_spans_nelem);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_spans_nelem);
/* Count the number of elements in the span tree */
if(spans==NULL)
@@ -4971,7 +4971,7 @@ H5S_hyper_make_spans (unsigned rank, const hssize_t *start, const hsize_t *strid
unsigned u; /* Counters */
H5S_hyper_span_info_t *ret_value;
- FUNC_ENTER_NOINIT(H5S_hyper_make_spans);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_make_spans);
/* Check args */
assert (rank>0);
@@ -5073,7 +5073,7 @@ H5S_hyper_can_rebuild (const H5S_t *space)
H5S_hyper_span_t *span; /* Current hyperslab span */
htri_t ret_value=TRUE; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_can_rebuild);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_can_rebuild);
/* Check args */
assert (space);
@@ -5126,7 +5126,7 @@ H5S_hyper_rebuild (H5S_t *space)
unsigned curr_dim; /* Current dimension being worked on */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_hyper_rebuild);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_rebuild);
/* Check args */
assert (space);
@@ -5211,7 +5211,7 @@ H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op,
htri_t status; /* Status from internal calls */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_generate_hyperslab);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_generate_hyperslab);
/* Check args */
assert(space);
@@ -5765,7 +5765,7 @@ H5S_operate_hyperslab (H5S_t *result, H5S_hyper_span_info_t *spans1, H5S_seloper
htri_t status; /* Status from internal calls */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_operate_hyperslab);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_operate_hyperslab);
/* Check args */
assert(result);
@@ -5979,7 +5979,7 @@ H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op,
unsigned u; /* Counters */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_generate_hyperslab);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_generate_hyperslab);
/* Check args */
assert(space);
@@ -6422,7 +6422,7 @@ H5S_combine_select (H5S_t *space1, H5S_seloper_t op, H5S_t *space2)
H5S_t *new_space=NULL; /* New dataspace generated */
H5S_t *ret_value; /* return value */
- FUNC_ENTER_NOINIT(H5S_combine_select);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_combine_select);
/* Check args */
assert(space1);
@@ -6533,7 +6533,7 @@ H5S_select_select (H5S_t *space1, H5S_seloper_t op, H5S_t *space2)
H5S_hyper_span_info_t *tmp_spans=NULL; /* Temporary copy of selection */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_select_select);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_select_select);
/* Check args */
assert(space1);
@@ -6668,7 +6668,7 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
int curr_dim; /* Current dimension being operated on */
int i; /* Index variable */
- FUNC_ENTER_NOINIT (H5S_hyper_get_seq_list_gen);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_get_seq_list_gen);
/* Check args */
assert(space);
@@ -7116,7 +7116,7 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space,H5S_sel_iter_t *iter,
size_t io_left; /* The number of elements left in I/O operation */
size_t start_io_left; /* The initial number of elements left in I/O operation */
- FUNC_ENTER_NOINIT (H5S_hyper_get_seq_list_opt);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_get_seq_list_opt);
/* Check args */
assert(space);
diff --git a/src/H5Smpio.c b/src/H5Smpio.c
index 7745374..b4d6cae 100644
--- a/src/H5Smpio.c
+++ b/src/H5Smpio.c
@@ -106,7 +106,7 @@ H5S_mpio_all_type( const H5S_t *space, size_t elmt_size,
hsize_t total_bytes;
unsigned u;
- FUNC_ENTER_NOINIT(H5S_mpio_all_type);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_mpio_all_type);
/* Check args */
assert (space);
@@ -153,7 +153,7 @@ H5S_mpio_none_type( const H5S_t UNUSED *space, size_t UNUSED elmt_size,
hsize_t *extra_offset,
hbool_t *is_derived_type )
{
- FUNC_ENTER_NOINIT(H5S_mpio_none_type);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_mpio_none_type);
/* fill in the return values */
*new_type = MPI_BYTE;
@@ -223,7 +223,7 @@ H5S_mpio_hyper_type( const H5S_t *space, size_t elmt_size,
int mpi_code; /* MPI return code */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5S_mpio_hyper_type);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_mpio_hyper_type);
/* Check args */
assert (space);
@@ -524,7 +524,7 @@ H5S_mpio_space_type( const H5S_t *space, size_t elmt_size,
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5S_mpio_space_type);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_mpio_space_type);
/* Check args */
assert (space);
@@ -638,7 +638,7 @@ H5S_mpio_spaces_xfer(H5F_t *f, const H5O_layout_t *layout, size_t elmt_size,
int mpi_code; /* MPI return code */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5S_mpio_spaces_xfer);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_mpio_spaces_xfer);
/* Check args */
assert (f);
diff --git a/src/H5Snone.c b/src/H5Snone.c
index 24dfb34..e07f5ae 100644
--- a/src/H5Snone.c
+++ b/src/H5Snone.c
@@ -103,7 +103,7 @@ done:
static herr_t
H5S_none_iter_coords (const H5S_sel_iter_t UNUSED *iter, hssize_t UNUSED *coords)
{
- FUNC_ENTER_NOINIT(H5S_none_iter_coords);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_iter_coords);
/* Check args */
assert (iter);
@@ -131,7 +131,7 @@ H5S_none_iter_coords (const H5S_sel_iter_t UNUSED *iter, hssize_t UNUSED *coords
static herr_t
H5S_none_iter_block (const H5S_sel_iter_t UNUSED *iter, hssize_t UNUSED *start, hssize_t UNUSED *end)
{
- FUNC_ENTER_NOINIT(H5S_none_iter_block);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_iter_block);
/* Check args */
assert (iter);
@@ -159,7 +159,7 @@ H5S_none_iter_block (const H5S_sel_iter_t UNUSED *iter, hssize_t UNUSED *start,
static hsize_t
H5S_none_iter_nelmts (const H5S_sel_iter_t UNUSED *iter)
{
- FUNC_ENTER_NOINIT(H5S_none_iter_nelmts);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_iter_nelmts);
/* Check args */
assert (iter);
@@ -188,7 +188,7 @@ H5S_none_iter_nelmts (const H5S_sel_iter_t UNUSED *iter)
static htri_t
H5S_none_iter_has_next_block(const H5S_sel_iter_t UNUSED *iter)
{
- FUNC_ENTER_NOINIT(H5S_none_iter_has_next_block);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_iter_has_next_block);
/* Check args */
assert (iter);
@@ -218,7 +218,7 @@ H5S_none_iter_has_next_block(const H5S_sel_iter_t UNUSED *iter)
static herr_t
H5S_none_iter_next(H5S_sel_iter_t UNUSED *iter, size_t UNUSED nelem)
{
- FUNC_ENTER_NOINIT(H5S_none_iter_next);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_iter_next);
/* Check args */
assert (iter);
@@ -248,7 +248,7 @@ H5S_none_iter_next(H5S_sel_iter_t UNUSED *iter, size_t UNUSED nelem)
static herr_t
H5S_none_iter_next_block(H5S_sel_iter_t UNUSED *iter)
{
- FUNC_ENTER_NOINIT(H5S_none_iter_next);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_iter_next);
/* Check args */
assert (iter);
@@ -277,7 +277,7 @@ H5S_none_iter_next_block(H5S_sel_iter_t UNUSED *iter)
static herr_t
H5S_none_iter_release (H5S_sel_iter_t UNUSED * iter)
{
- FUNC_ENTER_NOINIT(H5S_none_iter_release);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_iter_release);
/* Check args */
assert (iter);
diff --git a/src/H5Spoint.c b/src/H5Spoint.c
index 2c98b96..9b469c5 100644
--- a/src/H5Spoint.c
+++ b/src/H5Spoint.c
@@ -116,7 +116,7 @@ done:
static herr_t
H5S_point_iter_coords (const H5S_sel_iter_t *iter, hssize_t *coords)
{
- FUNC_ENTER_NOINIT(H5S_point_iter_coords);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_coords);
/* Check args */
assert (iter);
@@ -147,7 +147,7 @@ H5S_point_iter_coords (const H5S_sel_iter_t *iter, hssize_t *coords)
static herr_t
H5S_point_iter_block (const H5S_sel_iter_t *iter, hssize_t *start, hssize_t *end)
{
- FUNC_ENTER_NOINIT(H5S_point_iter_block);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_block);
/* Check args */
assert (iter);
@@ -179,7 +179,7 @@ H5S_point_iter_block (const H5S_sel_iter_t *iter, hssize_t *start, hssize_t *end
static hsize_t
H5S_point_iter_nelmts (const H5S_sel_iter_t *iter)
{
- FUNC_ENTER_NOINIT(H5S_point_iter_nelmts);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_nelmts);
/* Check args */
assert (iter);
@@ -210,7 +210,7 @@ H5S_point_iter_has_next_block(const H5S_sel_iter_t *iter)
{
htri_t ret_value=TRUE; /* Return value */
- FUNC_ENTER_NOINIT(H5S_point_iter_has_next_block);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_has_next_block);
/* Check args */
assert (iter);
@@ -245,7 +245,7 @@ done:
static herr_t
H5S_point_iter_next(H5S_sel_iter_t *iter, size_t nelem)
{
- FUNC_ENTER_NOINIT(H5S_point_iter_next);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_next);
/* Check args */
assert (iter);
@@ -281,7 +281,7 @@ H5S_point_iter_next(H5S_sel_iter_t *iter, size_t nelem)
static herr_t
H5S_point_iter_next_block(H5S_sel_iter_t *iter)
{
- FUNC_ENTER_NOINIT(H5S_point_iter_next_block);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_next_block);
/* Check args */
assert (iter);
@@ -313,7 +313,7 @@ H5S_point_iter_next_block(H5S_sel_iter_t *iter)
static herr_t
H5S_point_iter_release (H5S_sel_iter_t UNUSED * iter)
{
- FUNC_ENTER_NOINIT(H5S_point_iter_release);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_release);
/* Check args */
assert (iter);
@@ -526,7 +526,7 @@ H5S_select_elements (H5S_t *space, H5S_seloper_t op, size_t num_elem,
{
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_NOINIT(H5S_select_elements);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_select_elements);
/* Check args */
assert(space);
@@ -707,7 +707,7 @@ H5S_get_select_elem_npoints(H5S_t *space)
{
hssize_t ret_value=FAIL; /* return value */
- FUNC_ENTER_NOINIT(H5S_get_select_elem_npoints);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_get_select_elem_npoints);
assert(space);
@@ -971,7 +971,7 @@ H5S_get_select_elem_pointlist(H5S_t *space, hsize_t startpoint, hsize_t numpoint
H5S_pnt_node_t *node; /* Point node */
int rank; /* Dataspace rank */
- FUNC_ENTER_NOINIT(H5S_get_select_elem_pointlist);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_get_select_elem_pointlist);
assert(space);
assert(buf);
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index 7431715..494c956 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -78,7 +78,7 @@ H5S_get_vector_size(hid_t dxpl_id)
{
ssize_t ret_value; /* return value */
- FUNC_ENTER_NOINIT(H5S_get_vector_size);
+ FUNC_ENTER_NOAPI_NOINIT(H5S_get_vector_size);
if(dxpl_id==H5P_DATASET_XFER_DEFAULT) {
ret_value=H5D_XFER_HYPER_VECTOR_SIZE_DEF;
@@ -674,7 +674,7 @@ H5S_select_iter_block (const H5S_sel_iter_t *iter, hssize_t *start, hssize_t *en
{
herr_t ret_value; /* return value */
- FUNC_ENTER_NOINIT(H5S_select_iter_block);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_select_iter_block);
/* Check args */
assert(iter);
@@ -746,7 +746,7 @@ H5S_select_iter_has_next_block (const H5S_sel_iter_t *iter)
{
herr_t ret_value; /* return value */
- FUNC_ENTER_NOINIT(H5S_select_iter_has_next_block);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_select_iter_has_next_block);
/* Check args */
assert(iter);
@@ -823,7 +823,7 @@ H5S_select_iter_next_block(H5S_sel_iter_t *iter)
{
herr_t ret_value; /* return value */
- FUNC_ENTER_NOINIT(H5S_select_iter_next_block);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_select_iter_next_block);
/* Check args */
assert(iter);
diff --git a/src/H5T.c b/src/H5T.c
index e1e463c..6f670b0 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -506,7 +506,7 @@ H5T_init_inf(void)
size_t u; /* Local index value */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5T_init_inf);
+ FUNC_ENTER_NOAPI_NOINIT(H5T_init_inf);
/* Get the float datatype */
if (NULL==(dst_p=H5I_object(H5T_NATIVE_FLOAT_g)))
@@ -619,7 +619,7 @@ H5T_init_hw(void)
#endif /* H5_HAVE_GET_FPC_CSR */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5T_init_hw);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_hw);
#ifdef H5_HAVE_GET_FPC_CSR
/* [This code is specific to SGI machines] */
@@ -690,7 +690,7 @@ H5T_init_interface(void)
unsigned copied_dtype=1; /* Flag to indicate whether datatype was copied or allocated (for error cleanup) */
herr_t ret_value=SUCCEED;
- FUNC_ENTER_NOINIT(H5T_init_interface);
+ FUNC_ENTER_NOAPI_NOINIT(H5T_init_interface);
/* Initialize the atom group for the file IDs */
if (H5I_init_group(H5I_DATATYPE, H5I_DATATYPEID_HASHSIZE, H5T_RESERVED_ATOMS, (H5I_free_t)H5T_close)<0)
@@ -1221,7 +1221,7 @@ H5T_unlock_cb (void *_dt, hid_t UNUSED id, void UNUSED *key)
{
H5T_t *dt = (H5T_t *)_dt;
- FUNC_ENTER_NOINIT(H5T_unlock_cb);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_unlock_cb);
assert (dt);
if (H5T_STATE_IMMUTABLE==dt->state)
@@ -1257,7 +1257,7 @@ H5T_term_interface(void)
int i, nprint=0, n=0;
H5T_path_t *path = NULL;
- FUNC_ENTER_NOINIT(H5T_term_interface);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_term_interface);
if (interface_initialize_g) {
/* Unregister all conversion functions */
@@ -2116,7 +2116,7 @@ H5T_register(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst,
int i; /*counter */
herr_t ret_value=SUCCEED; /*return value */
- FUNC_ENTER_NOINIT(H5T_register);
+ FUNC_ENTER_NOAPI_NOINIT(H5T_register);
/* Check args */
assert(src);
@@ -3420,8 +3420,8 @@ done:
size_t
H5T_get_size(const H5T_t *dt)
{
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5T_get_size);
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_get_size);
/* check args */
assert(dt);
@@ -4094,7 +4094,7 @@ done:
hbool_t
H5T_path_noop(const H5T_path_t *p)
{
- FUNC_ENTER_NOINIT(H5T_path_noop);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_path_noop);
assert(p);
@@ -4119,7 +4119,7 @@ H5T_path_noop(const H5T_path_t *p)
H5T_bkg_t
H5T_path_bkg(const H5T_path_t *p)
{
- FUNC_ENTER_NOINIT(H5T_path_bkg);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_path_bkg);
assert(p);
@@ -4576,7 +4576,7 @@ H5T_print_stats(H5T_path_t UNUSED * path, int UNUSED * nprint/*in,out*/)
char bandwidth[32];
#endif
- FUNC_ENTER_NOINIT(H5T_print_stats);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_print_stats);
#ifdef H5T_DEBUG
if (H5DEBUG(T) && path->stats.ncalls>0) {
diff --git a/src/H5TB.c b/src/H5TB.c
index be1b1aa..7b3e3f2 100644
--- a/src/H5TB.c
+++ b/src/H5TB.c
@@ -130,7 +130,7 @@ static int interface_initialize_g = 0;
static int
H5TB_strcmp(const void *k1, const void *k2, int UNUSED cmparg)
{
- FUNC_ENTER_NOINIT(H5TB_strcmp);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TB_strcmp);
assert(k1);
assert(k2);
@@ -156,7 +156,7 @@ H5TB_strcmp(const void *k1, const void *k2, int UNUSED cmparg)
static int
H5TB_addr_cmp(const void *k1, const void *k2, int UNUSED cmparg)
{
- FUNC_ENTER_NOINIT(H5TB_addr_cmp);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TB_addr_cmp);
assert(k1);
assert(k2);
@@ -182,7 +182,7 @@ H5TB_addr_cmp(const void *k1, const void *k2, int UNUSED cmparg)
static int
H5TB_int_cmp(const void *k1, const void *k2, int UNUSED cmparg)
{
- FUNC_ENTER_NOINIT(H5TB_int_cmp);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TB_int_cmp);
assert(k1);
assert(k2);
@@ -208,7 +208,7 @@ H5TB_int_cmp(const void *k1, const void *k2, int UNUSED cmparg)
static int
H5TB_hsize_cmp(const void *k1, const void *k2, int UNUSED cmparg)
{
- FUNC_ENTER_NOINIT(H5TB_hsize_cmp);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TB_hsize_cmp);
assert(k1);
assert(k2);
@@ -1291,7 +1291,7 @@ H5TB_printNode(H5TB_NODE * node, void(*key_dump)(void *,void *))
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5TB_printNode);
+ FUNC_ENTER_NOAPI_NOINIT(H5TB_printNode);
if (node == NULL) {
printf("ERROR: null node pointer\n");
@@ -1335,7 +1335,7 @@ H5TB_dumpNode(H5TB_NODE *node, void (*key_dump)(void *,void *),
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5TB_dumpNode);
+ FUNC_ENTER_NOAPI_NOINIT(H5TB_dumpNode);
if (node == NULL)
HGOTO_DONE(FAIL);
@@ -1394,7 +1394,7 @@ done:
static H5TB_NODE *
H5TB_end(H5TB_NODE * root, int side)
{
- FUNC_ENTER_NOINIT(H5TB_end);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TB_end);
assert(root);
assert(side==LEFT || side==RIGHT);
@@ -1411,7 +1411,7 @@ H5TB_nbr(H5TB_NODE * ptr, int side)
{
H5TB_NODE *ret_value; /* Return value */
- FUNC_ENTER_NOINIT(H5TB_nbr);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TB_nbr);
if (!HasChild(ptr, side))
HGOTO_DONE (ptr->link[side]);
@@ -1440,7 +1440,7 @@ H5TB_ffind(H5TB_NODE * root, const void * key, unsigned fast_compare, H5TB_NODE
int cmp = 1;
H5TB_NODE *ret_value = NULL;
- FUNC_ENTER_NOINIT(H5TB_ffind);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TB_ffind);
switch(fast_compare) {
case H5TB_FAST_HADDR_COMPARE:
@@ -1548,7 +1548,7 @@ H5TB_swapkid(H5TB_NODE ** root, H5TB_NODE * ptr, int side)
H5TB_leaf plcnt, prcnt, /* current values of the ptr's and kid's leaf count */
klcnt, krcnt;
- FUNC_ENTER_NOINIT(H5TB_swapkid);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TB_swapkid);
deep[2] = (deep[1] = 0) + Delta(kid, side);
deep[0] = Max(0, deep[2]) + 1 - Delta(ptr, side);
@@ -1650,7 +1650,7 @@ H5TB_balance(H5TB_NODE ** root, H5TB_NODE * ptr, int side, int added)
int odelta;
int obal;
- FUNC_ENTER_NOINIT(H5TB_balance);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TB_balance);
while (NULL != ptr) {
odelta = Delta(ptr, side); /* delta before the node was added */
diff --git a/src/H5Tarray.c b/src/H5Tarray.c
index 215151e..6c51307 100644
--- a/src/H5Tarray.c
+++ b/src/H5Tarray.c
@@ -54,7 +54,7 @@ DESCRIPTION
static herr_t
H5T_init_array_interface(void)
{
- FUNC_ENTER_NOINIT(H5T_init_array_interface);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_array_interface);
FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_array_interface() */
diff --git a/src/H5Tbit.c b/src/H5Tbit.c
index f2ad5f1..f6e36c7 100644
--- a/src/H5Tbit.c
+++ b/src/H5Tbit.c
@@ -336,8 +336,8 @@ H5T_bit_find (uint8_t *buf, size_t offset, size_t size, H5T_sdir_t direction,
size_t iu;
ssize_t ret_value=(-1); /* Return value */
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5T_bit_find);
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_bit_find);
/* Some functions call this with value=TRUE */
assert (TRUE==1);
@@ -438,8 +438,8 @@ H5T_bit_inc(uint8_t *buf, size_t start, size_t size)
unsigned carry = 1;
unsigned acc, mask;
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5T_bit_find);
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_bit_find);
assert(buf);
start %= 8;
diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index 38e0e06..fccb313 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -55,7 +55,7 @@ DESCRIPTION
static herr_t
H5T_init_commit_interface(void)
{
- FUNC_ENTER_NOINIT(H5T_init_commit_interface);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_commit_interface);
FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_commit_interface() */
@@ -124,7 +124,7 @@ H5T_commit (H5G_entry_t *loc, const char *name, H5T_t *type, hid_t dxpl_id)
H5F_t *file = NULL;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5T_commit);
+ FUNC_ENTER_NOAPI_NOINIT(H5T_commit);
assert (loc);
assert (name && *name);
@@ -229,7 +229,7 @@ htri_t
H5T_committed(H5T_t *type)
{
/* Use no-init for efficiency */
- FUNC_ENTER_NOINIT(H5T_committed);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_committed);
assert (type);
diff --git a/src/H5Tcompound.c b/src/H5Tcompound.c
index 88f1696..5d3306c 100644
--- a/src/H5Tcompound.c
+++ b/src/H5Tcompound.c
@@ -58,7 +58,7 @@ DESCRIPTION
static herr_t
H5T_init_compound_interface(void)
{
- FUNC_ENTER_NOINIT(H5T_init_compound_interface);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_compound_interface);
FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_compound_interface() */
@@ -525,7 +525,7 @@ H5T_pack(H5T_t *dt)
size_t offset;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5T_pack);
+ FUNC_ENTER_NOAPI_NOINIT(H5T_pack);
assert(dt);
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 53f0b29..daa37f5 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -1353,7 +1353,7 @@ H5T_conv_struct_init (H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata, hid_t dxpl_id)
hid_t tid;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5T_conv_struct_init);
+ FUNC_ENTER_NOAPI_NOINIT(H5T_conv_struct_init);
if (!priv) {
/*
@@ -1957,7 +1957,7 @@ H5T_conv_enum_init(H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata)
unsigned i, j; /*counters */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5T_conv_enum_init);
+ FUNC_ENTER_NOAPI_NOINIT(H5T_conv_enum_init);
cdata->need_bkg = H5T_BKG_NO;
if (NULL==(priv=cdata->priv=H5MM_calloc(sizeof(*priv))))
diff --git a/src/H5Tcset.c b/src/H5Tcset.c
index ec51af8..c02bec1 100644
--- a/src/H5Tcset.c
+++ b/src/H5Tcset.c
@@ -48,7 +48,7 @@ DESCRIPTION
static herr_t
H5T_init_cset_interface(void)
{
- FUNC_ENTER_NOINIT(H5T_init_cset_interface);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_cset_interface);
FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_cset_interface() */
diff --git a/src/H5Tenum.c b/src/H5Tenum.c
index 10adab3..fd31375 100644
--- a/src/H5Tenum.c
+++ b/src/H5Tenum.c
@@ -59,7 +59,7 @@ DESCRIPTION
static herr_t
H5T_init_enum_interface(void)
{
- FUNC_ENTER_NOINIT(H5T_init_enum_interface);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_enum_interface);
FUNC_LEAVE_NOAPI(H5T_init());
} /* H5T_init_enum_interface() */
diff --git a/src/H5Tfields.c b/src/H5Tfields.c
index b3baa8e..b8c39e1 100644
--- a/src/H5Tfields.c
+++ b/src/H5Tfields.c
@@ -51,7 +51,7 @@ DESCRIPTION
static herr_t
H5T_init_fields_interface(void)
{
- FUNC_ENTER_NOINIT(H5T_init_fields_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_fields_interface)
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_fields_interface() */
diff --git a/src/H5Tfixed.c b/src/H5Tfixed.c
index 058874b..d91b3a2 100644
--- a/src/H5Tfixed.c
+++ b/src/H5Tfixed.c
@@ -50,7 +50,7 @@ DESCRIPTION
static herr_t
H5T_init_fixed_interface(void)
{
- FUNC_ENTER_NOINIT(H5T_init_fixed_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_fixed_interface)
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_fixed_interface() */
diff --git a/src/H5Tfloat.c b/src/H5Tfloat.c
index 6a3f749..306ef09 100644
--- a/src/H5Tfloat.c
+++ b/src/H5Tfloat.c
@@ -50,7 +50,7 @@ DESCRIPTION
static herr_t
H5T_init_float_interface(void)
{
- FUNC_ENTER_NOINIT(H5T_init_float_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_float_interface)
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_float_interface() */
diff --git a/src/H5Tnative.c b/src/H5Tnative.c
index f013271..0f272ad 100644
--- a/src/H5Tnative.c
+++ b/src/H5Tnative.c
@@ -62,7 +62,7 @@ DESCRIPTION
static herr_t
H5T_init_native_interface(void)
{
- FUNC_ENTER_NOINIT(H5T_init_native_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_native_interface)
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_native_interface() */
diff --git a/src/H5Toffset.c b/src/H5Toffset.c
index f4151a3..0d6577b 100644
--- a/src/H5Toffset.c
+++ b/src/H5Toffset.c
@@ -53,7 +53,7 @@ DESCRIPTION
static herr_t
H5T_init_offset_interface(void)
{
- FUNC_ENTER_NOINIT(H5T_init_offset_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_offset_interface)
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_offset_interface() */
diff --git a/src/H5Topaque.c b/src/H5Topaque.c
index 3d708c7..b4b0764 100644
--- a/src/H5Topaque.c
+++ b/src/H5Topaque.c
@@ -51,7 +51,7 @@ DESCRIPTION
static herr_t
H5T_init_opaque_interface(void)
{
- FUNC_ENTER_NOINIT(H5T_init_opaque_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_opaque_interface)
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_opaque_interface() */
diff --git a/src/H5Torder.c b/src/H5Torder.c
index 9e5d76e..9d1a864 100644
--- a/src/H5Torder.c
+++ b/src/H5Torder.c
@@ -50,7 +50,7 @@ DESCRIPTION
static herr_t
H5T_init_order_interface(void)
{
- FUNC_ENTER_NOINIT(H5T_init_order_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_order_interface)
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_order_interface() */
diff --git a/src/H5Tpad.c b/src/H5Tpad.c
index c3fbd04..33d1902 100644
--- a/src/H5Tpad.c
+++ b/src/H5Tpad.c
@@ -50,7 +50,7 @@ DESCRIPTION
static herr_t
H5T_init_pad_interface(void)
{
- FUNC_ENTER_NOINIT(H5T_init_pad_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_pad_interface)
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_pad_interface() */
diff --git a/src/H5Tprecis.c b/src/H5Tprecis.c
index 9cc10f6..6175242 100644
--- a/src/H5Tprecis.c
+++ b/src/H5Tprecis.c
@@ -53,7 +53,7 @@ DESCRIPTION
static herr_t
H5T_init_precis_interface(void)
{
- FUNC_ENTER_NOINIT(H5T_init_precis_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_precis_interface)
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_precis_interface() */
diff --git a/src/H5Tstrpad.c b/src/H5Tstrpad.c
index 6848298..cd7f9a2 100644
--- a/src/H5Tstrpad.c
+++ b/src/H5Tstrpad.c
@@ -50,7 +50,7 @@ DESCRIPTION
static herr_t
H5T_init_strpad_interface(void)
{
- FUNC_ENTER_NOINIT(H5T_init_strpad_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_strpad_interface)
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_strpad_interface() */
diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c
index 13ff95f..1a01458 100644
--- a/src/H5Tvlen.c
+++ b/src/H5Tvlen.c
@@ -76,7 +76,7 @@ DESCRIPTION
static herr_t
H5T_init_vlen_interface(void)
{
- FUNC_ENTER_NOINIT(H5T_init_vlen_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_vlen_interface)
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_vlen_interface() */
@@ -149,7 +149,7 @@ H5T_vlen_create(const H5T_t *base)
H5T_t *dt = NULL; /*new VL datatype */
H5T_t *ret_value; /*return value */
- FUNC_ENTER_NOINIT(H5T_vlen_create)
+ FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_create)
/* Check args */
assert(base);
@@ -205,7 +205,7 @@ H5T_vlen_set_loc(H5T_t *dt, H5F_t *f, H5T_loc_t loc)
{
htri_t ret_value = 0; /* Indicate that success, but no location change */
- FUNC_ENTER_NOINIT(H5T_vlen_set_loc)
+ FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_set_loc)
/* check parameters */
assert(dt);
@@ -305,7 +305,7 @@ H5T_vlen_seq_mem_getlen(void *_vl)
{
hvl_t *vl=(hvl_t *)_vl; /* Pointer to the user's hvl_t information */
- FUNC_ENTER_NOINIT(H5T_vlen_seq_mem_getlen)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_seq_mem_getlen)
/* check parameters */
assert(vl);
@@ -334,7 +334,7 @@ H5T_vlen_seq_mem_isnull(H5F_t UNUSED *f, void *_vl)
{
hvl_t *vl=(hvl_t *)_vl; /* Pointer to the user's hvl_t information */
- FUNC_ENTER_NOINIT(H5T_vlen_seq_mem_isnull)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_seq_mem_isnull)
/* check parameters */
assert(vl);
@@ -363,7 +363,7 @@ H5T_vlen_seq_mem_read(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_vl, void *bu
{
hvl_t *vl=(hvl_t *)_vl; /* Pointer to the user's hvl_t information */
- FUNC_ENTER_NOINIT(H5T_vlen_seq_mem_read)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_seq_mem_read)
/* check parameters */
assert(vl && vl->p);
@@ -400,7 +400,7 @@ H5T_vlen_seq_mem_write(H5F_t UNUSED *f, hid_t dxpl_id, void *_vl, void *buf, voi
H5P_genplist_t *plist; /* Property list */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5T_vlen_seq_mem_write)
+ FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_seq_mem_write)
/* check parameters */
assert(_vl);
@@ -466,7 +466,7 @@ H5T_vlen_seq_mem_setnull(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_vl, void
{
hvl_t vl; /* Temporary hvl_t to use during operation */
- FUNC_ENTER_NOINIT(H5T_vlen_seq_mem_setnull)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_seq_mem_setnull)
/* check parameters */
assert(_vl);
@@ -501,7 +501,7 @@ H5T_vlen_str_mem_getlen(void *_vl)
{
char *s=*(char **)_vl; /* Pointer to the user's string information */
- FUNC_ENTER_NOINIT(H5T_vlen_str_mem_getlen)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_str_mem_getlen)
/* check parameters */
assert(s);
@@ -530,7 +530,7 @@ H5T_vlen_str_mem_isnull(H5F_t UNUSED *f, void *_vl)
{
char *s=*(char **)_vl; /* Pointer to the user's string information */
- FUNC_ENTER_NOINIT(H5T_vlen_str_mem_isnull)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_str_mem_isnull)
FUNC_LEAVE_NOAPI(s==NULL ? TRUE : FALSE);
} /* end H5T_vlen_str_mem_isnull() */
@@ -556,7 +556,7 @@ H5T_vlen_str_mem_read(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_vl, void *bu
{
char *s=*(char **)_vl; /* Pointer to the user's hvl_t information */
- FUNC_ENTER_NOINIT(H5T_vlen_str_mem_read)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_str_mem_read)
/* check parameters */
assert(s);
@@ -594,7 +594,7 @@ H5T_vlen_str_mem_write(H5F_t UNUSED *f, hid_t dxpl_id, void *_vl, void *buf, voi
H5P_genplist_t *plist; /* Property list */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5T_vlen_str_mem_write)
+ FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_str_mem_write)
/* check parameters */
assert(buf);
@@ -651,7 +651,7 @@ H5T_vlen_str_mem_setnull(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_vl, void
{
char *t=NULL; /* Pointer to temporary buffer allocated */
- FUNC_ENTER_NOINIT(H5T_vlen_str_mem_write)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_str_mem_write)
/* Set pointer in user's buffer with memcpy, to avoid alignment issues */
HDmemcpy(_vl,&t,sizeof(char *));
@@ -680,7 +680,7 @@ H5T_vlen_disk_getlen(void *_vl)
uint8_t *vl=(uint8_t *)_vl; /* Pointer to the disk VL information */
hssize_t seq_len; /* Sequence length */
- FUNC_ENTER_NOINIT(H5T_vlen_disk_getlen)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_disk_getlen)
/* check parameters */
assert(vl);
@@ -711,7 +711,7 @@ H5T_vlen_disk_isnull(H5F_t *f, void *_vl)
uint8_t *vl=(uint8_t *)_vl; /* Pointer to the disk VL information */
haddr_t addr; /* Sequence's heap address */
- FUNC_ENTER_NOINIT(H5T_vlen_disk_isnull)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_disk_isnull)
/* check parameters */
assert(vl);
@@ -749,7 +749,7 @@ H5T_vlen_disk_read(H5F_t *f, hid_t dxpl_id, void *_vl, void *buf, size_t UNUSED
uint32_t seq_len;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5T_vlen_disk_read)
+ FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_disk_read)
/* check parameters */
assert(vl);
@@ -802,7 +802,7 @@ H5T_vlen_disk_write(H5F_t *f, hid_t dxpl_id, void *_vl, void *buf, void *_bg, hs
size_t len; /* Size of new sequence on disk (in bytes) */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5T_vlen_disk_write)
+ FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_disk_write)
/* check parameters */
assert(vl);
@@ -871,7 +871,7 @@ H5T_vlen_disk_setnull(H5F_t *f, hid_t dxpl_id, void *_vl, void *_bg)
H5HG_t hobjid; /* New VL sequence's heap ID */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5T_vlen_disk_setnull)
+ FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_disk_setnull)
/* check parameters */
assert(f);
@@ -940,7 +940,7 @@ H5T_vlen_reclaim_recurse(void *elem, const H5T_t *dt, H5MM_free_t free_func, voi
unsigned i; /* local index variable */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOINIT(H5T_vlen_reclaim_recurse)
+ FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_reclaim_recurse)
assert(elem);
assert(dt);
diff --git a/src/H5V.c b/src/H5V.c
index dec6dab..654a4a9 100644
--- a/src/H5V.c
+++ b/src/H5V.c
@@ -72,7 +72,7 @@ static void
H5V_stride_optimize1(unsigned *np/*in,out*/, hsize_t *elmt_size/*in,out*/,
const hsize_t *size, hssize_t *stride1)
{
- FUNC_ENTER_NOINIT(H5V_stride_optimize1);
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_stride_optimize1);
/*
* This has to be true because if we optimize the dimensionality down to
@@ -123,7 +123,7 @@ static void
H5V_stride_optimize2(unsigned *np/*in,out*/, hsize_t *elmt_size/*in,out*/,
const hsize_t *size, hssize_t *stride1, hssize_t *stride2)
{
- FUNC_ENTER_NOINIT(H5V_stride_optimize2)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_stride_optimize2)
/*
* This has to be true because if we optimize the dimensionality down to
@@ -392,8 +392,8 @@ H5V_hyper_eq(int n,
int i;
htri_t ret_value=TRUE; /* Return value */
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5V_hyper_eq)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_hyper_eq)
if (n <= 0) HGOTO_DONE(TRUE)
@@ -439,8 +439,8 @@ H5V_hyper_disjointp(unsigned n,
unsigned u;
htri_t ret_value=FALSE; /* Return value */
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5V_hyper_disjointp)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_hyper_disjointp)
if (!n || !size1 || !size2) HGOTO_DONE(TRUE)
@@ -896,7 +896,7 @@ H5V_stride_copy2(hsize_t nelmts, hsize_t elmt_size,
int j; /* Local index variable */
hbool_t carry;
- FUNC_ENTER_NOINIT(H5V_stride_copy2)
+ FUNC_ENTER_NOAPI_NOINIT(H5V_stride_copy2)
assert (elmt_size < SIZET_MAX);
assert(dst_n>0);
diff --git a/src/H5Vprivate.h b/src/H5Vprivate.h
index 607087c..998b12b 100644
--- a/src/H5Vprivate.h
+++ b/src/H5Vprivate.h
@@ -114,8 +114,8 @@ H5V_vector_reduce_product(unsigned n, const hsize_t *v)
{
hsize_t ret_value = 1;
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5V_vector_reduce_product)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_vector_reduce_product)
if (n && !v) HGOTO_DONE(0)
while (n--) ret_value *= *v++;
@@ -146,8 +146,8 @@ H5V_vector_zerop_u(int n, const hsize_t *v)
{
htri_t ret_value=TRUE; /* Return value */
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5V_vector_zerop_u)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_vector_zerop_u)
if (!v)
HGOTO_DONE(TRUE)
@@ -181,8 +181,8 @@ H5V_vector_zerop_s(int n, const hssize_t *v)
{
htri_t ret_value=TRUE; /* Return value */
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5V_vector_zerop_s)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_vector_zerop_s)
if (!v)
HGOTO_DONE(TRUE)
@@ -218,8 +218,8 @@ H5V_vector_cmp_u (int n, const hsize_t *v1, const hsize_t *v2)
{
int ret_value=0; /* Return value */
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5V_vector_cmp_u)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_vector_cmp_u)
if (v1 == v2) HGOTO_DONE(0)
while (n--) {
@@ -258,8 +258,8 @@ H5V_vector_cmp_s (unsigned n, const hssize_t *v1, const hssize_t *v2)
{
int ret_value=0; /* Return value */
- /* Use FUNC_ENTER_NOINIT here to avoid performance issues */
- FUNC_ENTER_NOINIT(H5V_vector_cmp_s)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_vector_cmp_s)
if (v1 == v2) HGOTO_DONE(0)
while (n--) {
diff --git a/src/H5Z.c b/src/H5Z.c
index ebe785e..a1edaa4 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -81,7 +81,7 @@ H5Z_init_interface (void)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5Z_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT(H5Z_init_interface)
#ifdef H5_HAVE_FILTER_DEFLATE
if (H5Z_register (H5Z_DEFLATE)<0)
@@ -452,7 +452,7 @@ H5Z_prelude_callback(hid_t dcpl_id, hid_t type_id, H5Z_prelude_type_t prelude_ty
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOINIT(H5Z_prelude_callback)
+ FUNC_ENTER_NOAPI_NOINIT(H5Z_prelude_callback)
assert (H5I_GENPROP_LST==H5I_get_type(dcpl_id));
assert (H5I_DATATYPE==H5I_get_type(type_id));
@@ -806,7 +806,7 @@ H5Z_find_idx(H5Z_filter_t id)
size_t i; /* Local index variable */
int ret_value=FAIL; /* Return value */
- FUNC_ENTER_NOINIT(H5Z_find_idx)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5Z_find_idx)
for (i=0; i<H5Z_table_used_g; i++)
if (H5Z_table_g[i].id == id)
diff --git a/src/H5Zfletcher32.c b/src/H5Zfletcher32.c
index 1bf14f3..61340a0 100644
--- a/src/H5Zfletcher32.c
+++ b/src/H5Zfletcher32.c
@@ -80,7 +80,7 @@ H5Z_filter_fletcher32_compute(void *_src, size_t len)
size_t count = len; /* Number of bytes left to checksum */
uint32_t s1 = 0, s2 = 0; /* Temporary partial checksums */
- FUNC_ENTER_NOINIT(H5Z_filter_fletcher32_compute)
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5Z_filter_fletcher32_compute)
/* Compute checksum */
while(count > 1) {
diff --git a/src/H5detect.c b/src/H5detect.c
index 90f30ba..670aed1 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -508,7 +508,7 @@ int\n\
H5TN_term_interface(void)\n\
{\n\
interface_initialize_g = 0;\n\
- FUNC_ENTER_NOINIT(H5TN_term_interface);\n\
+ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5TN_term_interface);\n\
\n\
FUNC_LEAVE_NOAPI(0);\n\
}\n");
diff --git a/src/H5private.h b/src/H5private.h
index e0030a6..863973e 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -1046,7 +1046,7 @@ H5_DLL double H5_trace(const double *calltime, const char *func, const char *typ
*
* Quincey Koziol, 28 May 2002
* Split FUNC_ENTER macro into FUNC_ENTER_API, FUNC_ENTER_NOAPI and
- * FUNC_ENTER_NOINIT.
+ * FUNC_ENTER_NOAPI_NOINIT.
*-------------------------------------------------------------------------
*/
@@ -1074,28 +1074,20 @@ typedef struct H5_api_struct {
/* Macro for first thread initialization */
#define H5_FIRST_THREAD_INIT \
- pthread_once(&H5TS_first_init_g, H5TS_first_thread_init)
+ pthread_once(&H5TS_first_init_g, H5TS_first_thread_init);
/* Macros for threadsafe HDF-5 Phase I locks */
-#define H5_LOCK_API_MUTEX \
- H5TS_mutex_lock(&H5_g.init_lock)
#define H5_API_LOCK \
- if (H5_IS_API(FUNC)) { H5_LOCK_API_MUTEX; }
-#define H5_UNLOCK_API_MUTEX \
- H5TS_mutex_unlock(&H5_g.init_lock)
+ H5TS_mutex_lock(&H5_g.init_lock);
#define H5_API_UNLOCK \
- if (H5_IS_API(FUNC)) { H5_UNLOCK_API_MUTEX; }
+ H5TS_mutex_unlock(&H5_g.init_lock);
/* Macros for thread cancellation-safe mechanism */
#define H5_API_UNSET_CANCEL \
- if (H5_IS_API(FUNC)) { \
- H5TS_cancel_count_inc(); \
- }
+ H5TS_cancel_count_inc();
#define H5_API_SET_CANCEL \
- if (H5_IS_API(FUNC)) { \
- H5TS_cancel_count_dec(); \
- }
+ H5TS_cancel_count_dec();
extern H5_api_t H5_g;
@@ -1105,9 +1097,7 @@ extern H5_api_t H5_g;
#define H5_FIRST_THREAD_INIT
/* disable locks (sequential version) */
-#define H5_LOCK_API_MUTEX
#define H5_API_LOCK
-#define H5_UNLOCK_API_MUTEX
#define H5_API_UNLOCK
/* disable cancelability (sequential version) */
@@ -1117,7 +1107,6 @@ extern H5_api_t H5_g;
/* extern global variables */
extern hbool_t H5_libinit_g; /* Has the library been initialized? */
-
/* Macros for accessing the global variables */
#define H5_INIT_GLOBAL H5_libinit_g
@@ -1128,10 +1117,10 @@ extern hbool_t H5_libinit_g; /* Has the library been initialized? */
/* Include required function stack header */
#include "H5FSprivate.h"
-#define H5_PUSH_FUNC H5FS_push(FUNC)
+#define H5_PUSH_FUNC(func_name) H5FS_push(#func_name)
#define H5_POP_FUNC H5FS_pop()
#else /* H5_HAVE_FUNCSTACK */
-#define H5_PUSH_FUNC /* void */
+#define H5_PUSH_FUNC(func_name) /* void */
#define H5_POP_FUNC /* void */
#endif /* H5_HAVE_FUNCSTACK */
@@ -1139,8 +1128,7 @@ extern hbool_t H5_libinit_g; /* Has the library been initialized? */
extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */
#endif
-#define FUNC_ENTER_COMMON(func_name,asrt) \
- CONSTR (FUNC, #func_name); \
+#define FUNC_ENTER_COMMON_NOFUNC(func_name,asrt) \
PABLO_SAVE (ID_ ## func_name) \
\
/* Check API status */ \
@@ -1149,15 +1137,24 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */
/* Start tracing */ \
PABLO_TRACE_ON (PABLO_MASK, pablo_func_id)
+#define FUNC_ENTER_COMMON(func_name,asrt) \
+ CONSTR (FUNC, #func_name); \
+ FUNC_ENTER_COMMON_NOFUNC(func_name,asrt); \
+
/* Threadsafety initialization code for API routines */
#define FUNC_ENTER_API_THREADSAFE \
/* Initialize the thread-safe code */ \
- H5_FIRST_THREAD_INIT; \
+ H5_FIRST_THREAD_INIT \
\
/* Grab the mutex for the library */ \
H5_API_UNSET_CANCEL \
H5_API_LOCK
+/* Threadsafety termination code for API routines */
+#define FUNC_LEAVE_API_THREADSAFE \
+ H5_API_UNLOCK \
+ H5_API_SET_CANCEL
+
/* Local variables for API routines */
#define FUNC_ENTER_API_VARS(func_name) \
MPE_LOG_VARS(func_name) \
@@ -1166,7 +1163,7 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */
/* Use this macro for all "normal" API functions */
#define FUNC_ENTER_API(func_name,err) {{ \
FUNC_ENTER_API_VARS(func_name) \
- FUNC_ENTER_COMMON(func_name,H5_IS_API(FUNC)); \
+ FUNC_ENTER_COMMON(func_name,H5_IS_API(#func_name)); \
FUNC_ENTER_API_THREADSAFE; \
FUNC_ENTER_API_COMMON(func_name,INTERFACE_INIT,err); \
/* Clear thread error stack entering public functions */ \
@@ -1179,7 +1176,7 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */
*/
#define FUNC_ENTER_API_NOCLEAR(func_name,err) {{ \
FUNC_ENTER_API_VARS(func_name) \
- FUNC_ENTER_COMMON(func_name,H5_IS_API(FUNC)); \
+ FUNC_ENTER_COMMON(func_name,H5_IS_API(#func_name)); \
FUNC_ENTER_API_THREADSAFE; \
FUNC_ENTER_API_COMMON(func_name,INTERFACE_INIT,err); \
{
@@ -1187,19 +1184,20 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */
/*
* Use this macro for API functions that shouldn't perform _any_ initialization
* of the library or an interface, just perform tracing, etc. Examples
- * are: H5close, H5check_version, H5Eget_major, H5Eget_minor.
+ * are: H5close, H5check_version, etc.
+ *
*/
#define FUNC_ENTER_API_NOINIT(func_name) {{ \
FUNC_ENTER_API_VARS(func_name) \
- FUNC_ENTER_COMMON(func_name,H5_IS_API(FUNC)); \
+ FUNC_ENTER_COMMON(func_name,H5_IS_API(#func_name)); \
FUNC_ENTER_API_THREADSAFE; \
- H5_PUSH_FUNC; \
+ H5_PUSH_FUNC(func_name); \
BEGIN_MPE_LOG(func_name); \
{
/* Use this macro for all "normal" non-API functions */
#define FUNC_ENTER_NOAPI(func_name,err) { \
- FUNC_ENTER_COMMON(func_name,!H5_IS_API(FUNC)); \
+ FUNC_ENTER_COMMON(func_name,!H5_IS_API(#func_name)); \
FUNC_ENTER_NOAPI_INIT(func_name,INTERFACE_INIT,err) \
{
@@ -1211,9 +1209,26 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */
* - functions which are called during library shutdown, since we don't
* want to re-initialize the library.
*/
-#define FUNC_ENTER_NOINIT(func_name) { \
- FUNC_ENTER_COMMON(func_name,!H5_IS_API(FUNC)); \
- H5_PUSH_FUNC; \
+#define FUNC_ENTER_NOAPI_NOINIT(func_name) { \
+ FUNC_ENTER_COMMON(func_name,!H5_IS_API(#func_name)); \
+ H5_PUSH_FUNC(func_name); \
+ {
+
+/*
+ * Use this macro for non-API functions which fall into these categories:
+ * - static functions, since they must be called from a function in the
+ * interface, the library and interface must already be
+ * initialized.
+ * - functions which are called during library shutdown, since we don't
+ * want to re-initialize the library.
+ *
+ * This macro is used for functions which fit the above categories _and_
+ * also don't use the 'FUNC' variable (i.e. don't push errors on the error stack)
+ *
+ */
+#define FUNC_ENTER_NOAPI_NOINIT_NOFUNC(func_name) { \
+ FUNC_ENTER_COMMON_NOFUNC(func_name,!H5_IS_API(#func_name)); \
+ H5_PUSH_FUNC(func_name); \
{
/*
@@ -1222,7 +1237,7 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */
* (so far, just the H5FS routines themselves)
*/
#define FUNC_ENTER_NOAPI_NOFS(func_name) { \
- FUNC_ENTER_COMMON(func_name,!H5_IS_API(FUNC)); \
+ FUNC_ENTER_COMMON(func_name,!H5_IS_API(#func_name)); \
{
#define FUNC_ENTER_API_COMMON(func_name,interface_init_func,err) \
@@ -1246,7 +1261,7 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */
} \
\
/* Push the name of this function on the function stack */ \
- H5_PUSH_FUNC; \
+ H5_PUSH_FUNC(func_name); \
\
BEGIN_MPE_LOG(func_name)
@@ -1263,7 +1278,7 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */
} \
\
/* Push the name of this function on the function stack */ \
- H5_PUSH_FUNC;
+ H5_PUSH_FUNC(func_name);
/*-------------------------------------------------------------------------
* Purpose: Register function exit for code profiling. This should be
@@ -1285,8 +1300,7 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */
PABLO_TRACE_OFF (PABLO_MASK, pablo_func_id); \
H5TRACE_RETURN(ret_value); \
H5_POP_FUNC; \
- H5_API_UNLOCK \
- H5_API_SET_CANCEL \
+ FUNC_LEAVE_API_THREADSAFE \
return (ret_value); \
} /*end scope from end of FUNC_ENTER*/ \
}} /*end scope from beginning of FUNC_ENTER*/