summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/H5.c16
-rw-r--r--src/H5A.c84
-rw-r--r--src/H5AC.c104
-rw-r--r--src/H5Abtree2.c22
-rw-r--r--src/H5Adense.c36
-rw-r--r--src/H5Adeprec.c12
-rw-r--r--src/H5Aint.c34
-rw-r--r--src/H5Atest.c4
-rw-r--r--src/H5B.c36
-rw-r--r--src/H5B2.c28
-rw-r--r--src/H5B2cache.c30
-rw-r--r--src/H5B2dbg.c6
-rw-r--r--src/H5B2hdr.c20
-rw-r--r--src/H5B2int.c50
-rw-r--r--src/H5B2stat.c4
-rw-r--r--src/H5B2test.c22
-rw-r--r--src/H5Bcache.c10
-rw-r--r--src/H5Bdbg.c4
-rw-r--r--src/H5C.c104
-rw-r--r--src/H5CS.c14
-rw-r--r--src/H5D.c34
-rw-r--r--src/H5Dbtree.c54
-rw-r--r--src/H5Dchunk.c98
-rw-r--r--src/H5Dcompact.c16
-rw-r--r--src/H5Dcontig.c36
-rw-r--r--src/H5Ddbg.c4
-rw-r--r--src/H5Ddeprec.c12
-rw-r--r--src/H5Defl.c20
-rw-r--r--src/H5Dfill.c12
-rw-r--r--src/H5Dint.c78
-rw-r--r--src/H5Dio.c18
-rw-r--r--src/H5Dlayout.c10
-rw-r--r--src/H5Dmpio.c40
-rw-r--r--src/H5Doh.c16
-rw-r--r--src/H5Dpkg.h2
-rw-r--r--src/H5Dscatgath.c16
-rw-r--r--src/H5Dselect.c6
-rw-r--r--src/H5Dtest.c6
-rw-r--r--src/H5E.c70
-rw-r--r--src/H5Edeprec.c18
-rw-r--r--src/H5Eint.c29
-rw-r--r--src/H5F.c120
-rw-r--r--src/H5FD.c111
-rw-r--r--src/H5FDcore.c51
-rw-r--r--src/H5FDdirect.c66
-rw-r--r--src/H5FDfamily.c66
-rw-r--r--src/H5FDint.c12
-rw-r--r--src/H5FDlog.c38
-rw-r--r--src/H5FDmpi.c23
-rw-r--r--src/H5FDmpio.c102
-rw-r--r--src/H5FDmpiposix.c93
-rw-r--r--src/H5FDsec2.c30
-rw-r--r--src/H5FDspace.c14
-rw-r--r--src/H5FL.c90
-rw-r--r--src/H5FO.c24
-rw-r--r--src/H5FS.c28
-rw-r--r--src/H5FScache.c24
-rw-r--r--src/H5FSdbg.c6
-rw-r--r--src/H5FSsection.c50
-rw-r--r--src/H5FSstat.c3
-rw-r--r--src/H5FStest.c6
-rw-r--r--src/H5Faccum.c12
-rw-r--r--src/H5Fcwfs.c8
-rw-r--r--src/H5Fdbg.c8
-rw-r--r--src/H5Fefc.c20
-rw-r--r--src/H5Ffake.c6
-rw-r--r--src/H5Fio.c4
-rw-r--r--src/H5Fmount.c29
-rw-r--r--src/H5Fmpi.c6
-rw-r--r--src/H5Fquery.c138
-rw-r--r--src/H5Fsfile.c8
-rw-r--r--src/H5Fsuper.c22
-rw-r--r--src/H5Fsuper_cache.c10
-rw-r--r--src/H5Ftest.c8
-rw-r--r--src/H5G.c1324
-rw-r--r--src/H5Gbtree2.c22
-rw-r--r--src/H5Gcache.c18
-rw-r--r--src/H5Gcompact.c88
-rw-r--r--src/H5Gdense.c144
-rw-r--r--src/H5Gdeprec.c64
-rw-r--r--src/H5Gent.c64
-rw-r--r--src/H5Gint.c1116
-rw-r--r--src/H5Glink.c205
-rw-r--r--src/H5Gloc.c52
-rw-r--r--src/H5Gname.c144
-rw-r--r--src/H5Gnode.c102
-rw-r--r--src/H5Gobj.c154
-rw-r--r--src/H5Goh.c18
-rw-r--r--src/H5Gpkg.h235
-rw-r--r--src/H5Gprivate.h92
-rw-r--r--src/H5Groot.c16
-rw-r--r--src/H5Gstab.c166
-rw-r--r--src/H5Gtest.c96
-rw-r--r--src/H5Gtraverse.c44
-rw-r--r--src/H5HF.c28
-rw-r--r--src/H5HFbtree2.c60
-rw-r--r--src/H5HFcache.c34
-rw-r--r--src/H5HFdbg.c14
-rw-r--r--src/H5HFdblock.c14
-rw-r--r--src/H5HFdtable.c12
-rw-r--r--src/H5HFhdr.c48
-rw-r--r--src/H5HFhuge.c24
-rw-r--r--src/H5HFiblock.c38
-rw-r--r--src/H5HFiter.c22
-rw-r--r--src/H5HFman.c12
-rw-r--r--src/H5HFsection.c120
-rw-r--r--src/H5HFspace.c16
-rw-r--r--src/H5HFstat.c4
-rw-r--r--src/H5HFtest.c24
-rw-r--r--src/H5HFtiny.c14
-rw-r--r--src/H5HG.c18
-rw-r--r--src/H5HGcache.c10
-rw-r--r--src/H5HGdbg.c2
-rw-r--r--src/H5HGquery.c12
-rw-r--r--src/H5HL.c26
-rw-r--r--src/H5HLcache.c24
-rw-r--r--src/H5HLdbg.c2
-rw-r--r--src/H5HLint.c16
-rw-r--r--src/H5HP.c26
-rw-r--r--src/H5I.c88
-rw-r--r--src/H5Itest.c2
-rw-r--r--src/H5L.c239
-rw-r--r--src/H5Lexternal.c16
-rw-r--r--src/H5Lpkg.h3
-rw-r--r--src/H5MF.c24
-rw-r--r--src/H5MFaggr.c16
-rw-r--r--src/H5MFdbg.c4
-rw-r--r--src/H5MFsection.c18
-rw-r--r--src/H5MM.c20
-rw-r--r--src/H5MP.c10
-rw-r--r--src/H5MPtest.c10
-rw-r--r--src/H5O.c118
-rw-r--r--src/H5Oainfo.c20
-rw-r--r--src/H5Oalloc.c28
-rw-r--r--src/H5Oattr.c28
-rw-r--r--src/H5Oattribute.c48
-rw-r--r--src/H5Obtreek.c10
-rw-r--r--src/H5Ocache.c28
-rw-r--r--src/H5Ochunk.c12
-rw-r--r--src/H5Ocont.c12
-rw-r--r--src/H5Ocopy.c16
-rw-r--r--src/H5Odbg.c8
-rw-r--r--src/H5Odrvinfo.c12
-rw-r--r--src/H5Odtype.c26
-rw-r--r--src/H5Oefl.c16
-rw-r--r--src/H5Ofill.c26
-rw-r--r--src/H5Oginfo.c12
-rw-r--r--src/H5Olayout.c18
-rw-r--r--src/H5Olinfo.c32
-rw-r--r--src/H5Olink.c27
-rw-r--r--src/H5Omessage.c90
-rw-r--r--src/H5Omtime.c36
-rw-r--r--src/H5Oname.c18
-rw-r--r--src/H5Opline.c18
-rw-r--r--src/H5Orefcount.c14
-rw-r--r--src/H5Osdspace.c16
-rw-r--r--src/H5Oshared.c22
-rw-r--r--src/H5Oshared.h16
-rw-r--r--src/H5Oshmesg.c10
-rw-r--r--src/H5Ostab.c31
-rw-r--r--src/H5Otest.c14
-rw-r--r--src/H5Ounknown.c2
-rw-r--r--src/H5P.c74
-rw-r--r--src/H5Pdapl.c10
-rw-r--r--src/H5Pdcpl.c58
-rw-r--r--src/H5Pdeprec.c10
-rw-r--r--src/H5Pdxpl.c54
-rw-r--r--src/H5Pfapl.c164
-rw-r--r--src/H5Pfcpl.c62
-rw-r--r--src/H5Pfmpl.c2
-rw-r--r--src/H5Pgcpl.c18
-rw-r--r--src/H5Pint.c106
-rw-r--r--src/H5Plapl.c34
-rw-r--r--src/H5Plcpl.c6
-rwxr-xr-xsrc/H5Pocpl.c48
-rwxr-xr-xsrc/H5Pocpypl.c6
-rw-r--r--src/H5Pstrcpl.c10
-rw-r--r--src/H5Ptest.c8
-rw-r--r--src/H5R.c30
-rw-r--r--src/H5RC.c4
-rw-r--r--src/H5RS.c24
-rw-r--r--src/H5Rdeprec.c4
-rw-r--r--src/H5S.c93
-rw-r--r--src/H5SL.c94
-rwxr-xr-xsrc/H5SM.c64
-rwxr-xr-xsrc/H5SMbtree2.c12
-rw-r--r--src/H5SMcache.c20
-rw-r--r--src/H5SMmessage.c10
-rw-r--r--src/H5SMtest.c2
-rw-r--r--src/H5ST.c34
-rw-r--r--src/H5Sall.c80
-rw-r--r--src/H5Sdbg.c2
-rw-r--r--src/H5Shyper.c174
-rw-r--r--src/H5Smpio.c14
-rw-r--r--src/H5Snone.c50
-rw-r--r--src/H5Spoint.c58
-rw-r--r--src/H5Sselect.c68
-rw-r--r--src/H5Stest.c4
-rw-r--r--src/H5T.c159
-rw-r--r--src/H5Tarray.c18
-rw-r--r--src/H5Tbit.c20
-rw-r--r--src/H5Tcommit.c34
-rw-r--r--src/H5Tcompound.c26
-rw-r--r--src/H5Tconv.c1145
-rw-r--r--src/H5Tcset.c6
-rw-r--r--src/H5Tdbg.c4
-rw-r--r--src/H5Tdeprec.c8
-rw-r--r--src/H5Tenum.c22
-rw-r--r--src/H5Tfields.c16
-rw-r--r--src/H5Tfixed.c8
-rw-r--r--src/H5Tfloat.c18
-rw-r--r--src/H5Tnative.c14
-rw-r--r--src/H5Toffset.c10
-rw-r--r--src/H5Toh.c10
-rw-r--r--src/H5Topaque.c6
-rw-r--r--src/H5Torder.c10
-rw-r--r--src/H5Tpad.c6
-rw-r--r--src/H5Tpkg.h2
-rw-r--r--src/H5Tprecis.c10
-rw-r--r--src/H5Tstrpad.c6
-rw-r--r--src/H5Tvisit.c2
-rw-r--r--src/H5Tvlen.c52
-rw-r--r--src/H5V.c47
-rw-r--r--src/H5Vprivate.h20
-rw-r--r--src/H5WB.c8
-rw-r--r--src/H5Z.c42
-rw-r--r--src/H5Zdeflate.c2
-rw-r--r--src/H5Zfletcher32.c2
-rw-r--r--src/H5Znbit.c18
-rw-r--r--src/H5Zscaleoffset.c14
-rw-r--r--src/H5Zshuffle.c4
-rw-r--r--src/H5Zszip.c6
-rw-r--r--src/H5Ztrans.c46
-rw-r--r--src/H5checksum.c14
-rw-r--r--src/H5dbg.c2
-rw-r--r--src/H5detect.c2
-rw-r--r--src/H5private.h239
-rw-r--r--src/H5system.c2
238 files changed, 5446 insertions, 6634 deletions
diff --git a/src/H5.c b/src/H5.c
index b6ad4e4..fef1365 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -104,7 +104,7 @@ H5_init_library(void)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5_init_library, FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Make sure the package information is updated.
*/
@@ -360,7 +360,7 @@ H5dont_atexit(void)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API_NOINIT_NOERR_NOFS(H5dont_atexit)
+ FUNC_ENTER_API_NOINIT_NOERR_NOFS
H5TRACE0("e","");
if(H5_dont_atexit_g)
@@ -399,7 +399,7 @@ H5garbage_collect(void)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_API(H5garbage_collect, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE0("e","");
/* Call the garbage collection routines in the library */
@@ -451,7 +451,7 @@ H5set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_lim,
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_API(H5set_free_list_limits, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "IsIsIsIsIsIs", reg_global_lim, reg_list_lim, arr_global_lim,
arr_list_lim, blk_global_lim, blk_list_lim);
@@ -594,7 +594,7 @@ H5get_libversion(unsigned *majnum, unsigned *minnum, unsigned *relnum)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_API(H5get_libversion, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "*Iu*Iu*Iu", majnum, minnum, relnum);
/* Set the version information */
@@ -649,7 +649,7 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
static const char *version_mismatch_warning = VERSION_MISMATCH_WARNING;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API_NOINIT_NOERR_NOFS(H5check_version)
+ FUNC_ENTER_API_NOINIT_NOERR_NOFS
H5TRACE3("e", "IuIuIu", majnum, minnum, relnum);
/* Don't check again, if we already have */
@@ -763,7 +763,7 @@ H5open(void)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API_NOCLEAR(H5open, FAIL)
+ FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE0("e","");
/* all work is done by FUNC_ENTER() */
done:
@@ -793,7 +793,7 @@ H5close(void)
* whole library just to release it all right away. It is safe to call
* this function for an uninitialized library.
*/
- FUNC_ENTER_API_NOINIT_NOERR_NOFS(H5close)
+ FUNC_ENTER_API_NOINIT_NOERR_NOFS
H5TRACE0("e","");
H5_term_library();
diff --git a/src/H5A.c b/src/H5A.c
index eb471dd..8945669 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -113,7 +113,7 @@ H5A_init(void)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5A_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
@@ -138,7 +138,7 @@ H5A_init_interface(void)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Create attribute ID type.
@@ -172,7 +172,7 @@ H5A_term_interface(void)
{
int n = 0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT
if(H5_interface_initialize_g) {
if((n = H5I_nmembers(H5I_ATTR))>0) {
@@ -225,7 +225,7 @@ H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id,
H5S_t *space; /* Dataspace to use for attribute */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Acreate2, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("i", "i*siiii", loc_id, attr_name, type_id, space_id, acpl_id, aapl_id);
/* check arguments */
@@ -296,7 +296,7 @@ H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
H5S_t *space; /* Dataspace to use for attribute */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Acreate_by_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE8("i", "i*s*siiiii", loc_id, obj_name, attr_name, type_id, space_id,
acpl_id, aapl_id, lapl_id);
@@ -369,7 +369,7 @@ H5A_create(const H5G_loc_t *loc, const char *name, const H5T_t *type,
htri_t tri_ret; /* htri_t return value */
hid_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_create)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(loc);
@@ -534,7 +534,7 @@ H5Aopen(hid_t loc_id, const char *attr_name, hid_t UNUSED aapl_id)
H5A_t *attr = NULL; /* Attribute opened */
hid_t ret_value;
- FUNC_ENTER_API(H5Aopen, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("i", "i*si", loc_id, attr_name, aapl_id);
/* check arguments */
@@ -596,7 +596,7 @@ H5Aopen_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
H5A_t *attr = NULL; /* Attribute opened */
hid_t ret_value;
- FUNC_ENTER_API(H5Aopen_by_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("i", "i*s*sii", loc_id, obj_name, attr_name, aapl_id, lapl_id);
/* check arguments */
@@ -664,7 +664,7 @@ H5Aopen_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
H5G_loc_t loc; /* Object location */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Aopen_by_idx, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE7("i", "i*sIiIohii", loc_id, obj_name, idx_type, order, n, aapl_id,
lapl_id);
@@ -726,7 +726,7 @@ H5A_open_common(const H5G_loc_t *loc, H5A_t *attr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_open_common)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(loc);
@@ -783,7 +783,7 @@ H5A_open_by_idx(const H5G_loc_t *loc, const char *obj_name, H5_index_t idx_type,
H5A_t *attr = NULL; /* Attribute from object header */
H5A_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_open_by_idx)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(loc);
@@ -847,7 +847,7 @@ H5A_open_by_name(const H5G_loc_t *loc, const char *obj_name, const char *attr_na
H5A_t *attr = NULL; /* Attribute from object header */
H5A_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5A_open_by_name, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(loc);
@@ -912,7 +912,7 @@ H5Awrite(hid_t attr_id, hid_t dtype_id, const void *buf)
H5T_t *mem_type; /* Memory datatype */
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Awrite, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ii*x", attr_id, dtype_id, buf);
/* check arguments */
@@ -963,7 +963,7 @@ H5A_write(H5A_t *attr, const H5T_t *mem_type, const void *buf, hid_t dxpl_id)
size_t buf_size; /* desired buffer size */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5A_write)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(attr);
HDassert(mem_type);
@@ -1069,7 +1069,7 @@ H5Aread(hid_t attr_id, hid_t dtype_id, void *buf)
H5T_t *mem_type; /* Memory datatype */
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Aread, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ii*x", attr_id, dtype_id, buf);
/* check arguments */
@@ -1119,7 +1119,7 @@ H5A_read(const H5A_t *attr, const H5T_t *mem_type, void *buf, hid_t dxpl_id)
size_t buf_size; /* desired buffer size */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5A_read)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(attr);
HDassert(mem_type);
@@ -1215,7 +1215,7 @@ H5Aget_space(hid_t attr_id)
H5S_t *ds = NULL; /* Copy of dataspace for attribute */
hid_t ret_value;
- FUNC_ENTER_API(H5Aget_space, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", attr_id);
/* check arguments */
@@ -1261,7 +1261,7 @@ H5Aget_type(hid_t attr_id)
H5T_t *dt = NULL; /* Copy of attribute's datatype */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Aget_type, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", attr_id);
/* check arguments */
@@ -1330,7 +1330,7 @@ H5Aget_create_plist(hid_t attr_id)
H5P_genplist_t *new_plist; /* ACPL to return */
hid_t ret_value;
- FUNC_ENTER_API(H5Aget_create_plist, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", attr_id);
HDassert(H5P_LST_ATTRIBUTE_CREATE_g != -1);
@@ -1385,7 +1385,7 @@ H5Aget_name(hid_t attr_id, size_t buf_size, char *buf)
H5A_t *my_attr; /* Attribute object for ID */
ssize_t ret_value;
- FUNC_ENTER_API(H5Aget_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("Zs", "iz*s", attr_id, buf_size, buf);
/* check arguments */
@@ -1425,7 +1425,7 @@ H5A_get_name(H5A_t *attr, size_t buf_size, char *buf)
size_t copy_len, nbytes;
ssize_t ret_value;
- FUNC_ENTER_NOAPI(H5A_get_name, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* get the real attribute length */
nbytes = HDstrlen(attr->shared->name);
@@ -1476,7 +1476,7 @@ H5Aget_name_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
H5A_t *attr = NULL; /* Attribute object for name */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Aget_name_by_idx, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE8("Zs", "i*sIiIohxzi", loc_id, obj_name, idx_type, order, n, name, size,
lapl_id);
@@ -1543,7 +1543,7 @@ H5Aget_storage_size(hid_t attr_id)
H5A_t *attr; /* Attribute object for ID */
hsize_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Aget_storage_size, 0)
+ FUNC_ENTER_API(0)
H5TRACE1("h", "i", attr_id);
/* Check args */
@@ -1577,7 +1577,7 @@ H5Aget_info(hid_t attr_id, H5A_info_t *ainfo)
H5A_t *attr; /* Attribute object for name */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Aget_info, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*x", attr_id, ainfo);
/* Check args */
@@ -1614,7 +1614,7 @@ H5Aget_info_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
H5A_t *attr = NULL; /* Attribute object for name */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Aget_info_by_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "i*s*s*xi", loc_id, obj_name, attr_name, ainfo, lapl_id);
/* Check args */
@@ -1673,7 +1673,7 @@ H5Aget_info_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
H5A_t *attr = NULL; /* Attribute object for name */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Aget_info_by_idx, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE7("e", "i*sIiIoh*xi", loc_id, obj_name, idx_type, order, n, ainfo,
lapl_id);
@@ -1731,7 +1731,7 @@ H5A_get_info(const H5A_t *attr, H5A_info_t *ainfo)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5A_get_info, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(attr);
@@ -1773,7 +1773,7 @@ H5Arename(hid_t loc_id, const char *old_name, const char *new_name)
H5G_loc_t loc; /* Object location */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Arename, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*s*s", loc_id, old_name, new_name);
/* check arguments */
@@ -1819,7 +1819,7 @@ H5Arename_by_name(hid_t loc_id, const char *obj_name, const char *old_attr_name,
hbool_t loc_found = FALSE; /* Entry at 'obj_name' found */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Arename_by_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "i*s*s*si", loc_id, obj_name, old_attr_name, new_attr_name,
lapl_id);
@@ -1916,7 +1916,7 @@ H5Aiterate2(hid_t loc_id, H5_index_t idx_type, H5_iter_order_t order,
hsize_t last_attr; /* Index of last attribute examined */
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Aiterate2, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "iIiIo*hx*x", loc_id, idx_type, order, idx, op, op_data);
/* check arguments */
@@ -2004,7 +2004,7 @@ H5Aiterate_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
hsize_t last_attr; /* Index of last attribute examined */
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Aiterate_by_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE8("e", "i*sIiIo*hx*xi", loc_id, obj_name, idx_type, order, idx, op,
op_data, lapl_id);
@@ -2085,7 +2085,7 @@ H5Adelete(hid_t loc_id, const char *name)
H5G_loc_t loc; /* Object location */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Adelete, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*s", loc_id, name);
/* check arguments */
@@ -2132,7 +2132,7 @@ H5Adelete_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
hbool_t loc_found = FALSE; /* Entry at 'obj_name' found */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Adelete_by_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*s*si", loc_id, obj_name, attr_name, lapl_id);
/* check arguments */
@@ -2208,7 +2208,7 @@ H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
hbool_t loc_found = FALSE; /* Entry at 'obj_name' found */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Adelete_by_idx, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "i*sIiIohi", loc_id, obj_name, idx_type, order, n, lapl_id);
/* check arguments */
@@ -2271,7 +2271,7 @@ H5Aclose(hid_t attr_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Aclose, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", attr_id);
/* check arguments */
@@ -2312,7 +2312,7 @@ H5A_copy(H5A_t *_new_attr, const H5A_t *old_attr)
hbool_t allocated_attr = FALSE; /* Whether the attribute was allocated */
H5A_t *ret_value = NULL; /* Return value */
- FUNC_ENTER_NOAPI(H5A_copy, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(old_attr);
@@ -2374,7 +2374,7 @@ H5A_free(H5A_t *attr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5A_free, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(attr);
@@ -2422,7 +2422,7 @@ H5A_close(H5A_t *attr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5A_close, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(attr);
HDassert(attr->shared);
@@ -2478,7 +2478,7 @@ H5A_oloc(H5A_t *attr)
{
H5O_loc_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5A_oloc, NULL)
+ FUNC_ENTER_NOAPI(NULL)
HDassert(attr);
@@ -2510,7 +2510,7 @@ H5A_nameof(H5A_t *attr)
{
H5G_name_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5A_nameof, NULL)
+ FUNC_ENTER_NOAPI(NULL)
HDassert(attr);
@@ -2542,7 +2542,7 @@ H5Aexists(hid_t obj_id, const char *attr_name)
H5G_loc_t loc; /* Object location */
htri_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Aexists, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("t", "i*s", obj_id, attr_name);
/* check arguments */
@@ -2586,7 +2586,7 @@ H5Aexists_by_name(hid_t loc_id, const char *obj_name, const char *attr_name,
hbool_t loc_found = FALSE; /* Entry at 'obj_name' found */
htri_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Aexists_by_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("t", "i*s*si", loc_id, obj_name, attr_name, lapl_id);
/* check arguments */
diff --git a/src/H5AC.c b/src/H5AC.c
index a2e6604..8dce384 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -232,7 +232,7 @@ H5AC_init(void)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
@@ -263,7 +263,7 @@ H5AC_init_interface(void)
H5FD_mpio_xfer_t xfer_mode; /* I/O transfer mode property value */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5AC_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(H5P_CLS_DATASET_XFER_g!=(-1));
@@ -342,7 +342,7 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
#else /* H5_HAVE_PARALLEL */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
assert(H5P_LST_DATASET_XFER_g!=(-1));
@@ -376,7 +376,7 @@ H5AC_term_interface(void)
{
int n = 0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT
if (H5_interface_initialize_g) {
#ifdef H5_HAVE_PARALLEL
@@ -465,7 +465,7 @@ H5AC_create(const H5F_t *f,
#endif /* H5_HAVE_PARALLEL */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_create, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(NULL == f->shared->cache);
@@ -651,7 +651,7 @@ H5AC_dest(H5F_t *f, hid_t dxpl_id)
#endif /* H5_HAVE_PARALLEL */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_dest, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@@ -730,7 +730,7 @@ H5AC_expunge_entry(H5F_t *f,
#endif /* H5AC__TRACE_FILE_ENABLED */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_expunge_entry, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@@ -815,7 +815,7 @@ H5AC_flush(H5F_t *f, hid_t dxpl_id)
#endif /* H5AC__TRACE_FILE_ENABLED */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_flush, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@@ -887,7 +887,7 @@ H5AC_get_entry_status(const H5F_t *f,
unsigned status = 0;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_get_entry_status, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if((f == NULL) || (!H5F_addr_defined(addr)) || (status_ptr == NULL))
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "Bad param(s) on entry.")
@@ -938,7 +938,7 @@ H5AC_insert_entry(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t add
#endif /* H5AC__TRACE_FILE_ENABLED */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_insert_entry, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@@ -1037,7 +1037,7 @@ H5AC_mark_entry_dirty(void *thing)
#endif /* H5AC__TRACE_FILE_ENABLED */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_mark_entry_dirty, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(thing);
@@ -1108,7 +1108,7 @@ H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, haddr_t ne
#endif /* H5_HAVE_PARALLEL */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_move_entry, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared->cache);
@@ -1186,7 +1186,7 @@ H5AC_pin_protected_entry(void *thing)
#endif /* H5AC__TRACE_FILE_ENABLED */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_pin_protected_entry, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(thing);
@@ -1255,7 +1255,7 @@ H5AC_protect(H5F_t *f,
#endif /* H5AC__TRACE_FILE_ENABLED */
void * ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_protect, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(f);
@@ -1370,7 +1370,7 @@ H5AC_resize_entry(void *thing, size_t new_size)
#endif /* H5AC__TRACE_FILE_ENABLED */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_resize_entry, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(thing);
@@ -1437,7 +1437,7 @@ H5AC_unpin_entry(void *thing)
#endif /* H5AC__TRACE_FILE_ENABLED */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_unpin_entry, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(thing);
@@ -1519,7 +1519,7 @@ H5AC_unprotect(H5F_t *f, hid_t dxpl_id, const H5AC_class_t *type, haddr_t addr,
#endif /* H5AC__TRACE_FILE_ENABLED */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_unprotect, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@@ -1625,7 +1625,7 @@ H5AC_set_sync_point_done_callback(H5C_t * cache_ptr,
{
H5AC_aux_t * aux_ptr;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_set_sync_point_done_callback)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(cache_ptr && (cache_ptr->magic == H5C__H5C_T_MAGIC));
@@ -1662,7 +1662,7 @@ H5AC_set_write_done_callback(H5C_t * cache_ptr,
{
H5AC_aux_t * aux_ptr;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5AC_set_write_done_callback)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(cache_ptr && (cache_ptr->magic == H5C__H5C_T_MAGIC));
@@ -1695,7 +1695,7 @@ H5AC_stats(const H5F_t *f)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_stats, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@@ -1727,7 +1727,7 @@ H5AC_dump_cache(const H5F_t *f)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_dump_cache, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@@ -1764,7 +1764,7 @@ H5AC_get_cache_auto_resize_config(const H5AC_t * cache_ptr,
hbool_t evictions_enabled;
H5C_auto_size_ctl_t internal_config;
- FUNC_ENTER_NOAPI(H5AC_get_cache_auto_resize_config, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if ( ( cache_ptr == NULL )
||
@@ -1886,7 +1886,7 @@ H5AC_get_cache_size(H5AC_t * cache_ptr,
herr_t result;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_get_cache_size, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
result = H5C_get_cache_size((H5C_t *)cache_ptr,
max_size_ptr,
@@ -1924,7 +1924,7 @@ H5AC_get_cache_hit_rate(H5AC_t * cache_ptr, double * hit_rate_ptr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_get_cache_hit_rate, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if(H5C_get_cache_hit_rate((H5C_t *)cache_ptr, hit_rate_ptr) < 0)
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "H5C_get_cache_hit_rate() failed.")
@@ -1952,7 +1952,7 @@ H5AC_reset_cache_hit_rate_stats(H5AC_t * cache_ptr)
herr_t result;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_reset_cache_hit_rate_stats, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
result = H5C_reset_cache_hit_rate_stats((H5C_t *)cache_ptr);
@@ -1993,7 +1993,7 @@ H5AC_set_cache_auto_resize_config(H5AC_t *cache_ptr,
FILE * trace_file_ptr = NULL;
#endif /* H5AC__TRACE_FILE_ENABLED */
- FUNC_ENTER_NOAPI(H5AC_set_cache_auto_resize_config, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr );
@@ -2170,7 +2170,7 @@ H5AC_validate_config(H5AC_cache_config_t * config_ptr)
H5C_auto_size_ctl_t internal_config;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_validate_config, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if(config_ptr == NULL)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "NULL config_ptr on entry.")
@@ -2264,7 +2264,7 @@ H5AC_close_trace_file(H5AC_t * cache_ptr)
herr_t ret_value = SUCCEED; /* Return value */
FILE * trace_file_ptr = NULL;
- FUNC_ENTER_NOAPI(H5AC_close_trace_file, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if ( cache_ptr == NULL ) {
@@ -2326,7 +2326,7 @@ H5AC_open_trace_file(H5AC_t * cache_ptr,
H5AC_aux_t * aux_ptr = NULL;
#endif /* H5_HAVE_PARALLEL */
- FUNC_ENTER_NOAPI(H5AC_open_trace_file, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(cache_ptr);
@@ -2439,7 +2439,7 @@ H5AC_add_candidate(H5AC_t * cache_ptr,
H5AC_slist_entry_t * slist_entry_ptr = NULL;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_add_candidate, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -2521,7 +2521,7 @@ H5AC_broadcast_candidate_list(H5AC_t * cache_ptr,
int num_entries = 0;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_broadcast_candidate_list, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -2632,7 +2632,7 @@ H5AC_broadcast_clean_list(H5AC_t * cache_ptr)
int mpi_result;
int num_entries = 0;
- FUNC_ENTER_NOAPI(H5AC_broadcast_clean_list, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -2823,7 +2823,7 @@ H5AC_check_if_write_permitted(const H5F_t UNUSED * f,
#endif /* H5_HAVE_PARALLEL */
- FUNC_ENTER_NOAPI(H5AC_check_if_write_permitted, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
#ifdef H5_HAVE_PARALLEL
HDassert( f != NULL );
@@ -2885,7 +2885,7 @@ H5AC_construct_candidate_list(H5AC_t * cache_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_construct_candidate_list, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -2976,7 +2976,7 @@ H5AC_copy_candidate_list_to_buffer(H5AC_t * cache_ptr,
int i = 0;
int num_entries = 0;
- FUNC_ENTER_NOAPI(H5AC_copy_candidate_list_to_buffer, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -3098,7 +3098,7 @@ H5AC_ext_config_2_int_config(H5AC_cache_config_t * ext_conf_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_ext_config_2_int_config, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if ( ( ext_conf_ptr == NULL ) ||
( ext_conf_ptr->version != H5AC__CURR_CACHE_CONFIG_VERSION ) ||
@@ -3177,7 +3177,7 @@ H5AC_log_deleted_entry(H5AC_t * cache_ptr,
H5AC_slist_entry_t * slist_entry_ptr = NULL;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_log_deleted_entry, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -3269,7 +3269,7 @@ H5AC_log_dirtied_entry(const H5AC_info_t * entry_ptr,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_log_dirtied_entry, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( entry_ptr );
HDassert( entry_ptr->addr == addr );
@@ -3392,7 +3392,7 @@ H5AC_log_flushed_entry(H5C_t * cache_ptr,
H5AC_slist_entry_t * slist_entry_ptr = NULL;
- FUNC_ENTER_NOAPI(H5AC_log_flushed_entry, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -3519,7 +3519,7 @@ H5AC_log_inserted_entry(H5F_t * f,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_log_inserted_entry, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(cache_ptr != NULL);
HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
@@ -3631,7 +3631,7 @@ H5AC_log_moved_entry(const H5F_t *f,
H5AC_slist_entry_t * slist_entry_ptr = NULL;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_log_moved_entry, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( f );
HDassert( f->shared );
@@ -3881,7 +3881,7 @@ H5AC_propagate_and_apply_candidate_list(H5F_t * f,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_propagate_and_apply_candidate_list, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -4045,7 +4045,7 @@ H5AC_propagate_flushed_and_still_clean_entries_list(H5F_t * f,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_propagate_flushed_and_still_clean_entries_list, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(cache_ptr != NULL);
HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
@@ -4105,7 +4105,7 @@ H5AC_receive_and_apply_clean_list(H5F_t * f,
int num_entries = 0;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_receive_and_apply_clean_list, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( f != NULL );
HDassert( f->shared->cache == cache_ptr );
@@ -4216,7 +4216,7 @@ H5AC_receive_candidate_list(H5AC_t * cache_ptr,
int num_entries;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_receive_candidate_list, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -4362,7 +4362,7 @@ H5AC_rsp__dist_md_write__flush(H5F_t *f,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_rsp__dist_md_write__flush, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( f != NULL );
HDassert( f->shared->cache == cache_ptr );
@@ -4513,7 +4513,7 @@ H5AC_rsp__dist_md_write__flush_to_min_clean(H5F_t *f,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_rsp__dist_md_write__flush_to_min_clean, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( f != NULL );
HDassert( f->shared->cache == cache_ptr );
@@ -4596,7 +4596,7 @@ H5AC_rsp__p0_only__flush(H5F_t *f,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_rsp__p0_only__flush, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( f != NULL );
HDassert( f->shared->cache == cache_ptr );
@@ -4698,7 +4698,7 @@ H5AC_rsp__p0_only__flush_to_min_clean(H5F_t *f,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_rsp__p0_only__flush_to_min_clean, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( f != NULL );
HDassert( f->shared->cache == cache_ptr );
@@ -4810,7 +4810,7 @@ H5AC_run_sync_point(H5F_t *f,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_run_sync_point, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( f != NULL );
@@ -4947,7 +4947,7 @@ H5AC_tidy_cache_0_lists(H5AC_t * cache_ptr,
H5AC_aux_t * aux_ptr;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5AC_tidy_cache_0_lists, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -5040,7 +5040,7 @@ H5AC_flush_entries(H5F_t *f)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5AC_flush_entries)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(f);
HDassert(f->shared->cache);
diff --git a/src/H5Abtree2.c b/src/H5Abtree2.c
index 31dcb66..5a15c20 100644
--- a/src/H5Abtree2.c
+++ b/src/H5Abtree2.c
@@ -171,7 +171,7 @@ H5A_dense_fh_name_cmp(const void *obj, size_t UNUSED obj_len, void *_udata)
hbool_t took_ownership = FALSE; /* Whether the "found" operator took ownership of the attribute */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_dense_fh_name_cmp)
+ FUNC_ENTER_NOAPI_NOINIT
/* Decode attribute information */
if(NULL == (attr = (H5A_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_ATTR_ID, (const unsigned char *)obj)))
@@ -222,7 +222,7 @@ H5A_dense_btree2_name_store(void *_nrecord, const void *_udata)
const H5A_bt2_ud_ins_t *udata = (const H5A_bt2_ud_ins_t *)_udata;
H5A_dense_bt2_name_rec_t *nrecord = (H5A_dense_bt2_name_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_name_store)
+ FUNC_ENTER_NOAPI_NOINIT
/* Copy user information info native record */
nrecord->id = udata->id;
@@ -255,7 +255,7 @@ H5A_dense_btree2_name_compare(const void *_bt2_udata, const void *_bt2_rec)
const H5A_dense_bt2_name_rec_t *bt2_rec = (const H5A_dense_bt2_name_rec_t *)_bt2_rec;
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_name_compare)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(bt2_udata);
@@ -323,7 +323,7 @@ H5A_dense_btree2_name_encode(uint8_t *raw, const void *_nrecord, void UNUSED *ct
{
const H5A_dense_bt2_name_rec_t *nrecord = (const H5A_dense_bt2_name_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_name_encode)
+ FUNC_ENTER_NOAPI_NOINIT
/* Encode the record's fields */
HDmemcpy(raw, nrecord->id.id, (size_t)H5O_FHEAP_ID_LEN);
@@ -354,7 +354,7 @@ H5A_dense_btree2_name_decode(const uint8_t *raw, void *_nrecord, void UNUSED *ct
{
H5A_dense_bt2_name_rec_t *nrecord = (H5A_dense_bt2_name_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_name_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* Decode the record's fields */
HDmemcpy(nrecord->id.id, raw, (size_t)H5O_FHEAP_ID_LEN);
@@ -386,7 +386,7 @@ H5A_dense_btree2_name_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED dx
{
const H5A_dense_bt2_name_rec_t *nrecord = (const H5A_dense_bt2_name_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_name_debug)
+ FUNC_ENTER_NOAPI_NOINIT
HDfprintf(stream, "%*s%-*s {%016Hx, %02x, %u, %08lx}\n", indent, "", fwidth,
"Record:",
@@ -415,7 +415,7 @@ H5A_dense_btree2_corder_store(void *_nrecord, const void *_udata)
const H5A_bt2_ud_ins_t *udata = (const H5A_bt2_ud_ins_t *)_udata;
H5A_dense_bt2_corder_rec_t *nrecord = (H5A_dense_bt2_corder_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_corder_store)
+ FUNC_ENTER_NOAPI_NOINIT
/* Copy user information info native record */
nrecord->id = udata->id;
@@ -447,7 +447,7 @@ H5A_dense_btree2_corder_compare(const void *_bt2_udata, const void *_bt2_rec)
const H5A_dense_bt2_corder_rec_t *bt2_rec = (const H5A_dense_bt2_corder_rec_t *)_bt2_rec;
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_corder_compare)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(bt2_udata);
@@ -483,7 +483,7 @@ H5A_dense_btree2_corder_encode(uint8_t *raw, const void *_nrecord, void UNUSED *
{
const H5A_dense_bt2_corder_rec_t *nrecord = (const H5A_dense_bt2_corder_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_corder_encode)
+ FUNC_ENTER_NOAPI_NOINIT
/* Encode the record's fields */
HDmemcpy(raw, nrecord->id.id, (size_t)H5O_FHEAP_ID_LEN);
@@ -513,7 +513,7 @@ H5A_dense_btree2_corder_decode(const uint8_t *raw, void *_nrecord, void UNUSED *
{
H5A_dense_bt2_corder_rec_t *nrecord = (H5A_dense_bt2_corder_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_corder_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* Decode the record's fields */
HDmemcpy(nrecord->id.id, raw, (size_t)H5O_FHEAP_ID_LEN);
@@ -544,7 +544,7 @@ H5A_dense_btree2_corder_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED
{
const H5A_dense_bt2_corder_rec_t *nrecord = (const H5A_dense_bt2_corder_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_btree2_corder_debug)
+ FUNC_ENTER_NOAPI_NOINIT
HDfprintf(stream, "%*s%-*s {%016Hx, %02x, %u}\n", indent, "", fwidth,
"Record:",
diff --git a/src/H5Adense.c b/src/H5Adense.c
index d1421ae..4c10255 100644
--- a/src/H5Adense.c
+++ b/src/H5Adense.c
@@ -192,7 +192,7 @@ H5A_dense_create(H5F_t *f, hid_t dxpl_id, H5O_ainfo_t *ainfo)
H5B2_t *bt2_corder = NULL; /* v2 B-tree handle for creation order */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5A_dense_create, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -309,7 +309,7 @@ H5A_dense_fnd_cb(const H5A_t *attr, hbool_t *took_ownership, void *_user_attr)
{
H5A_t const **user_attr = (H5A_t const **)_user_attr; /* User data from v2 B-tree attribute lookup */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_fnd_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -349,7 +349,7 @@ H5A_dense_open(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *na
htri_t attr_exists; /* Attribute exists in v2 B-tree */
H5A_t *ret_value = NULL; /* Return value */
- FUNC_ENTER_NOAPI(H5A_dense_open, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/*
* Check arguments.
@@ -444,7 +444,7 @@ H5A_dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr)
htri_t attr_sharable; /* Flag indicating attributes are sharable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5A_dense_insert, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -597,7 +597,7 @@ H5A_dense_write_bt2_cb2(void *_record, void *_op_data, hbool_t *changed)
H5A_dense_bt2_corder_rec_t *record = (H5A_dense_bt2_corder_rec_t *)_record; /* Record from B-tree */
H5O_fheap_id_t *new_heap_id = (H5O_fheap_id_t *)_op_data; /* "op data" from v2 B-tree modify */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_dense_write_bt2_cb2)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -638,7 +638,7 @@ H5A_dense_write_bt2_cb(void *_record, void *_op_data, hbool_t *changed)
uint8_t attr_buf[H5A_ATTR_BUF_SIZE]; /* Buffer for serializing attribute */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_dense_write_bt2_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -754,7 +754,7 @@ H5A_dense_write(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, H5A_t *attr)
htri_t attr_sharable; /* Flag indicating attributes are sharable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5A_dense_write, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -850,7 +850,7 @@ H5A_dense_copy_fh_cb(const void *obj, size_t UNUSED obj_len, void *_udata)
H5A_fh_ud_cp_t *udata = (H5A_fh_ud_cp_t *)_udata; /* User data for fractal heap 'op' callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_dense_copy_fh_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Decode attribute information & keep a copy */
/* (we make a copy instead of calling the user/library callback directly in
@@ -901,7 +901,7 @@ H5A_dense_rename(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *
htri_t attr_exists; /* Attribute exists in v2 B-tree */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5A_dense_rename, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -1049,7 +1049,7 @@ H5A_dense_iterate_bt2_cb(const void *_record, void *_bt2_udata)
H5A_bt2_ud_it_t *bt2_udata = (H5A_bt2_ud_it_t *)_bt2_udata; /* User data for callback */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_dense_iterate_bt2_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check for skipping attributes */
if(bt2_udata->skip > 0)
@@ -1151,7 +1151,7 @@ H5A_dense_iterate(H5F_t *f, hid_t dxpl_id, hid_t loc_id, const H5O_ainfo_t *ainf
haddr_t bt2_addr; /* Address of v2 B-tree to use for lookup */
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5A_dense_iterate, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -1286,7 +1286,7 @@ H5A_dense_remove_bt2_cb(const void *_record, void *_udata)
H5B2_t *bt2_corder = NULL; /* v2 B-tree handle for creation order index */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_dense_remove_bt2_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check for removing the link from the creation order index */
if(H5F_addr_defined(udata->corder_bt2_addr)) {
@@ -1352,7 +1352,7 @@ H5A_dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *
htri_t attr_sharable; /* Flag indicating attributes are sharable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5A_dense_remove, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -1444,7 +1444,7 @@ H5A_dense_remove_by_idx_bt2_cb(const void *_record, void *_bt2_udata)
hbool_t use_sh_loc; /* Whether to use the attribute's shared location or the separate one */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_dense_remove_by_idx_bt2_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Set up the user data for fractal heap 'op' callback */
fh_udata.f = bt2_udata->f;
@@ -1571,7 +1571,7 @@ H5A_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
haddr_t bt2_addr; /* Address of v2 B-tree to use for operation */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5A_dense_remove_by_idx, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -1701,7 +1701,7 @@ H5A_dense_exists(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo, const char *
htri_t attr_sharable; /* Flag indicating attributes are sharable */
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI(H5A_dense_exists, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/*
* Check arguments.
@@ -1788,7 +1788,7 @@ H5A_dense_delete_bt2_cb(const void *_record, void *_bt2_udata)
H5A_t *attr = NULL; /* Attribute being removed */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_dense_delete_bt2_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check for shared attribute */
if(record->flags & H5O_MSG_FLAG_SHARED) {
@@ -1852,7 +1852,7 @@ H5A_dense_delete(H5F_t *f, hid_t dxpl_id, H5O_ainfo_t *ainfo)
H5HF_t *fheap = NULL; /* Fractal heap handle */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5A_dense_delete, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
diff --git a/src/H5Adeprec.c b/src/H5Adeprec.c
index b289ae0..22faaa2 100644
--- a/src/H5Adeprec.c
+++ b/src/H5Adeprec.c
@@ -100,7 +100,7 @@ DESCRIPTION
static herr_t
H5A_init_deprec_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_init_deprec_interface)
+ FUNC_ENTER_NOAPI_NOINIT
FUNC_LEAVE_NOAPI(H5A_init())
} /* H5A_init_deprec_interface() */
@@ -143,7 +143,7 @@ H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
H5S_t *space; /* Dataspace to use for attribute */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Acreate1, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("i", "i*siii", loc_id, name, type_id, space_id, plist_id);
/* check arguments */
@@ -198,7 +198,7 @@ H5Aopen_name(hid_t loc_id, const char *name)
H5A_t *attr = NULL; /* Attribute opened */
hid_t ret_value;
- FUNC_ENTER_API(H5Aopen_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("i", "i*s", loc_id, name);
/* check arguments */
@@ -256,7 +256,7 @@ H5Aopen_idx(hid_t loc_id, unsigned idx)
H5A_t *attr = NULL; /* Attribute opened */
hid_t ret_value;
- FUNC_ENTER_API(H5Aopen_idx, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("i", "iIu", loc_id, idx);
/* check arguments */
@@ -308,7 +308,7 @@ H5Aget_num_attrs(hid_t loc_id)
void *obj;
int ret_value;
- FUNC_ENTER_API(H5Aget_num_attrs, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Is", "i", loc_id);
/* check arguments */
@@ -405,7 +405,7 @@ H5Aiterate1(hid_t loc_id, unsigned *attr_num, H5A_operator1_t op, void *op_data)
hsize_t last_attr; /* Index of last attribute examined */
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Aiterate1, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*Iux*x", loc_id, attr_num, op, op_data);
/* check arguments */
diff --git a/src/H5Aint.c b/src/H5Aint.c
index ec9bf04..09efb24 100644
--- a/src/H5Aint.c
+++ b/src/H5Aint.c
@@ -147,7 +147,7 @@ H5A_compact_build_table_cb(H5O_t UNUSED *oh, H5O_mesg_t *mesg/*in,out*/,
H5A_compact_bt_ud_t *udata = (H5A_compact_bt_ud_t *)_udata; /* Operator user data */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_compact_build_table_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(mesg);
@@ -208,7 +208,7 @@ H5A_compact_build_table(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_index_t idx_type,
H5O_mesg_operator_t op; /* Wrapper for operator */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_compact_build_table)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -269,7 +269,7 @@ H5A_dense_build_table_cb(const H5A_t *attr, void *_udata)
H5A_dense_bt_ud_t *udata = (H5A_dense_bt_ud_t *)_udata; /* 'User data' passed in */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_dense_build_table_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(attr);
@@ -318,7 +318,7 @@ H5A_dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_ainfo_t *ainfo,
hsize_t nrec; /* # of records in v2 B-tree */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_dense_build_table)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -399,7 +399,7 @@ done:
static int
H5A_attr_cmp_name_inc(const void *attr1, const void *attr2)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_attr_cmp_name_inc)
+ FUNC_ENTER_NOAPI_NOINIT
FUNC_LEAVE_NOAPI(HDstrcmp((*(const H5A_t * const *)attr1)->shared->name,
(*(const H5A_t * const *)attr2)->shared->name))
@@ -427,7 +427,7 @@ H5A_attr_cmp_name_inc(const void *attr1, const void *attr2)
static int
H5A_attr_cmp_name_dec(const void *attr1, const void *attr2)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_attr_cmp_name_dec)
+ FUNC_ENTER_NOAPI_NOINIT
FUNC_LEAVE_NOAPI(HDstrcmp((*(const H5A_t * const *)attr2)->shared->name,
(*(const H5A_t * const *)attr1)->shared->name))
@@ -456,7 +456,7 @@ H5A_attr_cmp_corder_inc(const void *attr1, const void *attr2)
{
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_attr_cmp_corder_inc)
+ FUNC_ENTER_NOAPI_NOINIT
if((*(const H5A_t * const *)attr1)->shared->crt_idx < (*(const H5A_t * const *)attr2)->shared->crt_idx)
ret_value = -1;
@@ -491,7 +491,7 @@ H5A_attr_cmp_corder_dec(const void *attr1, const void *attr2)
{
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_attr_cmp_corder_dec)
+ FUNC_ENTER_NOAPI_NOINIT
if((*(const H5A_t * const *)attr1)->shared->crt_idx < (*(const H5A_t * const *)attr2)->shared->crt_idx)
ret_value = 1;
@@ -521,7 +521,7 @@ static herr_t
H5A_attr_sort_table(H5A_attr_table_t *atable, H5_index_t idx_type,
H5_iter_order_t order)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5A_attr_sort_table)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(atable);
@@ -571,7 +571,7 @@ H5A_attr_iterate_table(const H5A_attr_table_t *atable, hsize_t skip,
size_t u; /* Local index variable */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI(H5A_attr_iterate_table, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(atable);
@@ -650,7 +650,7 @@ H5A_attr_release_table(H5A_attr_table_t *atable)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_attr_release_table)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(atable);
@@ -695,7 +695,7 @@ H5A_get_ainfo(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_ainfo_t *ainfo)
H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5A_get_ainfo, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
@@ -760,7 +760,7 @@ H5A_set_version(const H5F_t *f, H5A_t *attr)
hbool_t type_shared, space_shared; /* Flags to indicate that shared messages are used for this attribute */
hbool_t use_latest_format; /* Flag indicating the newest file format should be used */
- FUNC_ENTER_NOAPI_NOFUNC(H5A_set_version)
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
@@ -824,7 +824,7 @@ H5A_attr_copy_file(const H5A_t *attr_src, H5F_t *file_dst, hbool_t *recompute_si
H5A_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_attr_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(attr_src);
@@ -1069,7 +1069,7 @@ H5A_attr_post_copy_file(const H5O_loc_t *src_oloc, const H5A_t *attr_src,
H5F_t *file_src, *file_dst;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_attr_post_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(src_oloc);
@@ -1165,7 +1165,7 @@ H5A_dense_post_copy_file_cb(const H5A_t *attr_src, void *_udata)
H5A_t *attr_dst = NULL;
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_dense_post_copy_file_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(attr_src);
@@ -1221,7 +1221,7 @@ H5A_dense_post_copy_file_all(const H5O_loc_t *src_oloc, const H5O_ainfo_t *ainfo
hbool_t recompute_size = FALSE; /* recompute the size */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_dense_post_copy_file_all)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(ainfo_src);
diff --git a/src/H5Atest.c b/src/H5Atest.c
index 845c6c8..19b5547 100644
--- a/src/H5Atest.c
+++ b/src/H5Atest.c
@@ -97,7 +97,7 @@ H5A_is_shared_test(hid_t attr_id)
H5A_t *attr; /* Attribute object for ID */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_is_shared_test)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
@@ -130,7 +130,7 @@ H5A_get_shared_rc_test(hid_t attr_id, hsize_t *ref_count)
H5A_t *attr; /* Attribute object for ID */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5A_get_shared_rc_test)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(NULL == (attr = (H5A_t *)H5I_object_verify(attr_id, H5I_ATTR)))
diff --git a/src/H5B.c b/src/H5B.c
index 9bc7a31..b997c3e 100644
--- a/src/H5B.c
+++ b/src/H5B.c
@@ -222,7 +222,7 @@ H5B_create(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, void *udata,
H5B_shared_t *shared=NULL; /* Pointer to shared B-tree info */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5B_create, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -311,7 +311,7 @@ H5B_find(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void *u
int cmp = 1; /* Key comparison value */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5B_find, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -407,7 +407,7 @@ H5B_split(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud, unsigned idx,
double split_ratios[3]; /* B-tree split ratios */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B_split)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -582,7 +582,7 @@ H5B_insert(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
H5B_ins_t my_ins = H5B_INS_ERROR;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5B_insert, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(f);
@@ -721,7 +721,7 @@ H5B_insert_child(H5B_t *bt, unsigned *bt_flags, unsigned idx,
H5B_shared_t *shared; /* Pointer to shared B-tree info */
uint8_t *base; /* Base offset for move */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B_insert_child)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(bt);
HDassert(bt_flags);
@@ -822,7 +822,7 @@ H5B_insert_helper(H5F_t *f, hid_t dxpl_id, H5B_ins_ud_t *bt_ud,
H5B_ins_t my_ins = H5B_INS_ERROR;
H5B_ins_t ret_value = H5B_INS_ERROR; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B_insert_helper)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments
@@ -1142,7 +1142,7 @@ H5B_iterate_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t add
haddr_t *child = NULL; /* Array of child pointers */
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B_iterate_helper)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1282,7 +1282,7 @@ H5B_iterate(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
{
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOERR(H5B_iterate, -)
+ FUNC_ENTER_NOAPI_NOERR
/*
* Check arguments.
@@ -1340,7 +1340,7 @@ H5B_remove_helper(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type
int cmp = 1; /* Key comparison value */
H5B_ins_t ret_value = H5B_INS_ERROR;
- FUNC_ENTER_NOAPI(H5B_remove_helper, H5B_INS_ERROR)
+ FUNC_ENTER_NOAPI(H5B_INS_ERROR)
HDassert(f);
HDassert(H5F_addr_defined(addr));
@@ -1662,7 +1662,7 @@ H5B_remove(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void
hbool_t rt_key_changed = FALSE; /*right key changed?*/
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5B_remove, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
@@ -1706,7 +1706,7 @@ H5B_delete(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr, void
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5B_delete, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
@@ -1779,7 +1779,7 @@ H5B_shared_new(const H5F_t *f, const H5B_class_t *type, size_t sizeof_rkey)
size_t u; /* Local index variable */
H5B_shared_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5B_shared_new, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/*
* Check arguments.
@@ -1850,7 +1850,7 @@ H5B_shared_free(void *_shared)
{
H5B_shared_t *shared = (H5B_shared_t *)_shared;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B_shared_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Free the raw B-tree node buffer */
shared->page = H5FL_BLK_FREE(page, shared->page);
@@ -1887,7 +1887,7 @@ H5B_copy(const H5B_t *old_bt)
H5B_shared_t *shared; /* Pointer to shared B-tree info */
H5B_t *ret_value;
- FUNC_ENTER_NOAPI(H5B_copy, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/*
* Check arguments.
@@ -1960,7 +1960,7 @@ H5B_get_info_helper(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t ad
haddr_t left_child; /* Address of left-most child in node */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B_get_info_helper)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -2059,7 +2059,7 @@ H5B_get_info(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr,
H5B_info_ud_t info_udata; /* User-data for B-tree size iteration */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5B_get_info, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -2113,7 +2113,7 @@ H5B_valid(H5F_t *f, hid_t dxpl_id, const H5B_class_t *type, haddr_t addr)
H5B_cache_ud_t cache_udata; /* User-data for metadata cache callback */
htri_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5B_valid, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -2165,7 +2165,7 @@ done:
herr_t
H5B_node_dest(H5B_t *bt)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B_node_dest)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(bt);
diff --git a/src/H5B2.c b/src/H5B2.c
index 8076e48..6f81ced 100644
--- a/src/H5B2.c
+++ b/src/H5B2.c
@@ -134,7 +134,7 @@ H5B2_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam, void *ctx_udat
haddr_t hdr_addr; /* B-tree header address */
H5B2_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5B2_create, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/*
* Check arguments.
@@ -207,7 +207,7 @@ H5B2_open(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata)
H5B2_hdr_cache_ud_t cache_udata; /* User-data for callback */
H5B2_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_open)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(f);
@@ -272,7 +272,7 @@ H5B2_insert(H5B2_t *bt2, hid_t dxpl_id, void *udata)
H5B2_hdr_t *hdr; /* Pointer to the B-tree header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5B2_insert, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);
@@ -332,7 +332,7 @@ done:
herr_t
H5B2_get_addr(const H5B2_t *bt2, haddr_t *addr_p)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5B2_get_addr)
+ FUNC_ENTER_NOAPI_NOERR
/*
* Check arguments.
@@ -370,7 +370,7 @@ H5B2_iterate(H5B2_t *bt2, hid_t dxpl_id, H5B2_operator_t op, void *op_data)
H5B2_hdr_t *hdr; /* Pointer to the B-tree header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOERR(H5B2_iterate, -)
+ FUNC_ENTER_NOAPI_NOERR
/* Check arguments. */
HDassert(bt2);
@@ -427,7 +427,7 @@ H5B2_find(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_found_t op,
unsigned idx; /* Location of record which matches key */
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI(H5B2_find, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);
@@ -562,7 +562,7 @@ H5B2_index(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order, hsize_t idx,
unsigned depth; /* Current depth of the tree */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5B2_index, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);
@@ -716,7 +716,7 @@ H5B2_remove(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_remove_t op,
H5B2_hdr_t *hdr; /* Pointer to the B-tree header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5B2_remove, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);
@@ -790,7 +790,7 @@ H5B2_remove_by_idx(H5B2_t *bt2, hid_t dxpl_id, H5_iter_order_t order,
H5B2_hdr_t *hdr; /* Pointer to the B-tree header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5B2_remove_by_idx, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);
@@ -868,7 +868,7 @@ done:
herr_t
H5B2_get_nrec(const H5B2_t *bt2, hsize_t *nrec)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_get_nrec)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(bt2);
@@ -913,7 +913,7 @@ H5B2_neighbor(H5B2_t *bt2, hid_t dxpl_id, H5B2_compare_t range, void *udata,
H5B2_hdr_t *hdr; /* Pointer to the B-tree header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5B2_neighbor, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);
@@ -975,7 +975,7 @@ H5B2_modify(H5B2_t *bt2, hid_t dxpl_id, void *udata, H5B2_modify_t op,
unsigned idx; /* Location of record which matches key */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5B2_modify, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);
@@ -1127,7 +1127,7 @@ H5B2_close(H5B2_t *bt2, hid_t dxpl_id)
hbool_t pending_delete = FALSE; /* Whether the v2 B-tree is pending deletion */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_close)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(bt2);
@@ -1237,7 +1237,7 @@ H5B2_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *ctx_udata,
H5B2_hdr_cache_ud_t cache_udata; /* User-data for callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5B2_delete, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(f);
diff --git a/src/H5B2cache.c b/src/H5B2cache.c
index bdb9868..30f62b2 100644
--- a/src/H5B2cache.c
+++ b/src/H5B2cache.c
@@ -162,7 +162,7 @@ H5B2_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
const uint8_t *p; /* Pointer into raw data buffer */
H5B2_hdr_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_hdr_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -277,7 +277,7 @@ H5B2_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
uint8_t hdr_buf[H5B2_HDR_BUF_SIZE]; /* Buffer for header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_hdr_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -378,7 +378,7 @@ H5B2_cache_hdr_dest(H5F_t *f, H5B2_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_hdr_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(hdr);
@@ -422,7 +422,7 @@ H5B2_cache_hdr_clear(H5F_t *f, H5B2_hdr_t *hdr, hbool_t destroy)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_hdr_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -459,7 +459,7 @@ done:
static herr_t
H5B2_cache_hdr_size(const H5F_t UNUSED *f, const H5B2_hdr_t *hdr, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_cache_hdr_size)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -499,7 +499,7 @@ H5B2_cache_internal_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
unsigned u; /* Local index variable */
H5B2_internal_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_internal_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -622,7 +622,7 @@ H5B2_cache_internal_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_internal_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -719,7 +719,7 @@ H5B2_cache_internal_dest(H5F_t *f, H5B2_internal_t *internal)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_internal_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -764,7 +764,7 @@ H5B2_cache_internal_clear(H5F_t *f, H5B2_internal_t *internal, hbool_t destroy)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_internal_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -801,7 +801,7 @@ done:
static herr_t
H5B2_cache_internal_size(const H5F_t UNUSED *f, const H5B2_internal_t *internal, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_cache_internal_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(internal);
@@ -841,7 +841,7 @@ H5B2_cache_leaf_load(H5F_t UNUSED *f, hid_t dxpl_id, haddr_t addr, void *_udata)
unsigned u; /* Local index variable */
H5B2_leaf_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_leaf_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -944,7 +944,7 @@ H5B2_cache_leaf_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_leaf_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -1027,7 +1027,7 @@ H5B2_cache_leaf_dest(H5F_t *f, H5B2_leaf_t *leaf)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_leaf_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -1072,7 +1072,7 @@ H5B2_cache_leaf_clear(H5F_t *f, H5B2_leaf_t *leaf, hbool_t destroy)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5B2_cache_leaf_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1109,7 +1109,7 @@ done:
static herr_t
H5B2_cache_leaf_size(const H5F_t UNUSED *f, const H5B2_leaf_t *leaf, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_cache_leaf_size)
+ FUNC_ENTER_NOAPI_NOERR
/* check arguments */
HDassert(leaf);
diff --git a/src/H5B2dbg.c b/src/H5B2dbg.c
index 5a0b341..3e5d55a 100644
--- a/src/H5B2dbg.c
+++ b/src/H5B2dbg.c
@@ -97,7 +97,7 @@ H5B2_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
H5B2_hdr_cache_ud_t cache_udata; /* User-data for callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5B2_hdr_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -213,7 +213,7 @@ H5B2_int_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
H5B2_hdr_cache_ud_t cache_udata; /* User-data for callback */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5B2_int_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -345,7 +345,7 @@ H5B2_leaf_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
char temp_str[128]; /* Temporary string, for formatting */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5B2_leaf_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
diff --git a/src/H5B2hdr.c b/src/H5B2hdr.c
index e8d8b96..c90b296 100644
--- a/src/H5B2hdr.c
+++ b/src/H5B2hdr.c
@@ -115,7 +115,7 @@ H5B2_hdr_init(H5B2_hdr_t *hdr, const H5B2_create_t *cparam, void *ctx_udata,
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_hdr_init)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -241,7 +241,7 @@ H5B2_hdr_alloc(H5F_t *f)
H5B2_hdr_t *hdr = NULL; /* v2 B-tree header */
H5B2_hdr_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_hdr_alloc)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -288,7 +288,7 @@ H5B2_hdr_create(H5F_t *f, hid_t dxpl_id, const H5B2_create_t *cparam,
H5B2_hdr_t *hdr = NULL; /* The new v2 B-tree header information */
haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_hdr_create)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -342,7 +342,7 @@ H5B2_hdr_incr(H5B2_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_hdr_incr)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(hdr);
@@ -378,7 +378,7 @@ H5B2_hdr_decr(H5B2_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_hdr_decr)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@@ -413,7 +413,7 @@ done:
herr_t
H5B2_hdr_fuse_incr(H5B2_hdr_t *hdr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_hdr_fuse_incr)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@@ -441,7 +441,7 @@ H5B2_hdr_fuse_incr(H5B2_hdr_t *hdr)
size_t
H5B2_hdr_fuse_decr(H5B2_hdr_t *hdr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_hdr_fuse_decr)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@@ -472,7 +472,7 @@ H5B2_hdr_dirty(H5B2_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_hdr_dirty)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@@ -504,7 +504,7 @@ H5B2_hdr_free(H5B2_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_hdr_free)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@@ -569,7 +569,7 @@ H5B2_hdr_delete(H5B2_hdr_t *hdr, hid_t dxpl_id)
unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting v2 B-tree header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5B2_hdr_delete, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(hdr);
diff --git a/src/H5B2int.c b/src/H5B2int.c
index 58832b2..b31d439 100644
--- a/src/H5B2int.c
+++ b/src/H5B2int.c
@@ -140,7 +140,7 @@ H5B2_locate_record(const H5B2_class_t *type, unsigned nrec, size_t *rec_off,
unsigned my_idx = 0; /* Final index value */
int cmp = -1; /* Key comparison value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_locate_record)
+ FUNC_ENTER_NOAPI_NOINIT
hi = nrec;
while(lo < hi && cmp) {
@@ -187,7 +187,7 @@ H5B2_split1(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth, H5B2_node_ptr_t *cur
unsigned left_child_flags = H5AC__NO_FLAGS_SET, right_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_split1)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -368,7 +368,7 @@ H5B2_split_root(H5B2_hdr_t *hdr, hid_t dxpl_id)
unsigned u_max_nrec_size; /* Temporary variable for range checking */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_split_root)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -450,7 +450,7 @@ H5B2_redistribute2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
unsigned left_child_flags = H5AC__NO_FLAGS_SET, right_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_redistribute2)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -684,7 +684,7 @@ H5B2_redistribute3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
unsigned middle_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_redistribute3)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -1065,7 +1065,7 @@ H5B2_merge2(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
unsigned left_child_flags = H5AC__NO_FLAGS_SET, right_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_merge2)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -1225,7 +1225,7 @@ H5B2_merge3(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
unsigned middle_child_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting child nodes */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_merge3)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -1443,7 +1443,7 @@ H5B2_swap_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
uint8_t *child_native; /* Pointer to child's native records */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_swap_leaf)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -1530,7 +1530,7 @@ H5B2_insert_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
unsigned idx; /* Location of record which matches key */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_insert_leaf)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -1606,7 +1606,7 @@ H5B2_insert_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
unsigned idx; /* Location of record which matches key */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_insert_internal)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -1736,7 +1736,7 @@ H5B2_create_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *node_ptr)
H5B2_leaf_t *leaf = NULL; /* Pointer to new leaf node created */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_create_leaf)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -1805,7 +1805,7 @@ H5B2_protect_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, haddr_t addr, unsigned nrec,
H5B2_leaf_cache_ud_t udata; /* User-data for callback */
H5B2_leaf_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_protect_leaf)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -1846,7 +1846,7 @@ H5B2_create_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *node_ptr,
H5B2_internal_t *internal = NULL; /* Pointer to new internal node created */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_create_internal)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -1924,7 +1924,7 @@ H5B2_protect_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, haddr_t addr,
H5B2_internal_cache_ud_t udata; /* User data to pass through to cache 'deserialize' callback */
H5B2_internal_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_protect_internal)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -1975,7 +1975,7 @@ H5B2_iterate_node(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
unsigned u; /* Local index */
herr_t ret_value = H5_ITER_CONT; /* Iterator return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_iterate_node)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -2082,7 +2082,7 @@ H5B2_remove_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_ptr,
unsigned idx; /* Location of record which matches key */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_remove_leaf)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -2167,7 +2167,7 @@ H5B2_remove_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, hbool_t *depth_decreased,
hbool_t collapsed_root = FALSE; /* Whether the root was collapsed */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_remove_internal)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -2363,7 +2363,7 @@ H5B2_remove_leaf_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
unsigned leaf_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting leaf node */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_remove_leaf_by_idx)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -2447,7 +2447,7 @@ H5B2_remove_internal_by_idx(H5B2_hdr_t *hdr, hid_t dxpl_id,
hbool_t collapsed_root = FALSE; /* Whether the root was collapsed */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_remove_internal_by_idx)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -2710,7 +2710,7 @@ H5B2_neighbor_leaf(H5B2_hdr_t *hdr, hid_t dxpl_id, H5B2_node_ptr_t *curr_node_pt
int cmp = 0; /* Comparison value of records */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_neighbor_leaf)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -2796,7 +2796,7 @@ H5B2_neighbor_internal(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
int cmp = 0; /* Comparison value of records */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_neighbor_internal)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -2868,7 +2868,7 @@ H5B2_delete_node(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
uint8_t *native; /* Pointers to node's native records */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_delete_node)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -2946,7 +2946,7 @@ H5B2_node_size(H5B2_hdr_t *hdr, hid_t dxpl_id, unsigned depth,
H5B2_internal_t *internal = NULL; /* Pointer to internal node */
herr_t ret_value = SUCCEED; /* Iterator return value */
- FUNC_ENTER_NOAPI(H5B2_node_size, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(hdr);
@@ -2999,7 +2999,7 @@ H5B2_internal_free(H5B2_internal_t *internal)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_internal_free)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -3044,7 +3044,7 @@ H5B2_leaf_free(H5B2_leaf_t *leaf)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_leaf_free)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
diff --git a/src/H5B2stat.c b/src/H5B2stat.c
index afd1e33..a8f1fbd 100644
--- a/src/H5B2stat.c
+++ b/src/H5B2stat.c
@@ -86,7 +86,7 @@
herr_t
H5B2_stat_info(H5B2_t *bt2, H5B2_stat_t *info)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_stat_info)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(info);
@@ -118,7 +118,7 @@ H5B2_size(H5B2_t *bt2, hid_t dxpl_id, hsize_t *btree_size)
H5B2_hdr_t *hdr; /* Pointer to the B-tree header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5B2_size, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);
diff --git a/src/H5B2test.c b/src/H5B2test.c
index 68215c2..af1228f 100644
--- a/src/H5B2test.c
+++ b/src/H5B2test.c
@@ -126,7 +126,7 @@ H5B2_test_crt_context(void *_f)
H5B2_test_ctx_t *ctx; /* Callback context structure */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_test_crt_context)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -164,7 +164,7 @@ H5B2_test_dst_context(void *_ctx)
{
H5B2_test_ctx_t *ctx = (H5B2_test_ctx_t *)_ctx; /* Callback context structure */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_dst_context)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@@ -192,7 +192,7 @@ H5B2_test_dst_context(void *_ctx)
static herr_t
H5B2_test_store(void *nrecord, const void *udata)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_store)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
*(hsize_t *)nrecord = *(const hsize_t *)udata;
@@ -217,7 +217,7 @@ H5B2_test_store(void *nrecord, const void *udata)
static herr_t
H5B2_test_compare(const void *rec1, const void *rec2)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_compare)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI((herr_t)(*(const hssize_t *)rec1 - *(const hssize_t *)rec2))
} /* H5B2_test_compare() */
@@ -241,7 +241,7 @@ H5B2_test_encode(uint8_t *raw, const void *nrecord, void *_ctx)
{
H5B2_test_ctx_t *ctx = (H5B2_test_ctx_t *)_ctx; /* Callback context structure */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@@ -270,7 +270,7 @@ H5B2_test_decode(const uint8_t *raw, void *nrecord, void *_ctx)
{
H5B2_test_ctx_t *ctx = (H5B2_test_ctx_t *)_ctx; /* Callback context structure */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_decode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@@ -299,7 +299,7 @@ H5B2_test_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED dxpl_id,
int indent, int fwidth, const void *record,
const void UNUSED *_udata)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_test_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert (record);
@@ -329,7 +329,7 @@ H5B2_test_crt_dbg_context(H5F_t *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr)
H5B2_test_ctx_t *ctx; /* Callback context structure */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B2_test_crt_dbg_context)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -365,7 +365,7 @@ done:
herr_t
H5B2_get_root_addr_test(H5B2_t *bt2, haddr_t *root_addr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B2_get_root_addr_test)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(bt2);
@@ -402,7 +402,7 @@ H5B2_get_node_info_test(H5B2_t *bt2, hid_t dxpl_id, void *udata,
unsigned idx; /* Location of record which matches key */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5B2_get_node_info_test, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);
@@ -516,7 +516,7 @@ H5B2_get_node_depth_test(H5B2_t *bt2, hid_t dxpl_id, void *udata)
H5B2_node_info_test_t ninfo; /* Node information */
int ret_value; /* Return information */
- FUNC_ENTER_NOAPI(H5B2_get_node_depth_test, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(bt2);
diff --git a/src/H5Bcache.c b/src/H5Bcache.c
index 11b98d3..c679be0 100644
--- a/src/H5Bcache.c
+++ b/src/H5Bcache.c
@@ -107,7 +107,7 @@ H5B_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
unsigned u; /* Local index variable */
H5B_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -206,7 +206,7 @@ H5B_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B_t *bt, uns
H5B_shared_t *shared; /* Pointer to shared B-tree info */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -296,7 +296,7 @@ H5B_dest(H5F_t *f, H5B_t *bt)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5B_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -349,7 +349,7 @@ H5B_clear(H5F_t *f, H5B_t *bt, hbool_t destroy)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5B_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -387,7 +387,7 @@ H5B_compute_size(const H5F_t UNUSED *f, const H5B_t *bt, size_t *size_ptr)
{
H5B_shared_t *shared; /* Pointer to shared B-tree info */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5B_compute_size)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
diff --git a/src/H5Bdbg.c b/src/H5Bdbg.c
index 23ea9c8..3fb7dd8 100644
--- a/src/H5Bdbg.c
+++ b/src/H5Bdbg.c
@@ -65,7 +65,7 @@ H5B_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int f
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5B_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -189,7 +189,7 @@ H5B_assert(H5F_t *f, hid_t dxpl_id, haddr_t addr, const H5B_class_t *type, void
struct child_t *next;
} *head = NULL, *tail = NULL, *prev = NULL, *cur = NULL, *tmp = NULL;
- FUNC_ENTER_NOAPI_NOINIT(H5B_assert)
+ FUNC_ENTER_NOAPI_NOINIT
if(0 == ncalls++) {
if(H5DEBUG(B))
diff --git a/src/H5C.c b/src/H5C.c
index c6d4cf1..8062d7f 100644
--- a/src/H5C.c
+++ b/src/H5C.c
@@ -219,7 +219,7 @@ H5C_epoch_marker_load(H5F_t UNUSED * f,
{
void * ret_value = NULL; /* Return value */
- FUNC_ENTER_NOAPI(H5C_epoch_marker_load, NULL)
+ FUNC_ENTER_NOAPI_NOINIT
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, NULL, "called unreachable fcn.")
@@ -238,7 +238,7 @@ H5C_epoch_marker_flush(H5F_t UNUSED *f,
{
herr_t ret_value = FAIL; /* Return value */
- FUNC_ENTER_NOAPI(H5C_epoch_marker_flush, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
@@ -253,7 +253,7 @@ H5C_epoch_marker_dest(H5F_t UNUSED * f,
{
herr_t ret_value = FAIL; /* Return value */
- FUNC_ENTER_NOAPI(H5C_epoch_marker_dest, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
@@ -269,7 +269,7 @@ H5C_epoch_marker_clear(H5F_t UNUSED * f,
{
herr_t ret_value = FAIL; /* Return value */
- FUNC_ENTER_NOAPI(H5C_epoch_marker_clear, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
@@ -284,7 +284,7 @@ H5C_epoch_marker_notify(H5C_notify_action_t UNUSED action,
{
herr_t ret_value = FAIL; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5C_epoch_marker_notify)
+ FUNC_ENTER_NOAPI_NOINIT
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
@@ -299,7 +299,7 @@ H5C_epoch_marker_size(const H5F_t UNUSED * f,
{
herr_t ret_value = FAIL; /* Return value */
- FUNC_ENTER_NOAPI(H5C_epoch_marker_size, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
HGOTO_ERROR(H5E_CACHE, H5E_SYSTEM, FAIL, "called unreachable fcn.")
@@ -435,7 +435,7 @@ H5C_apply_candidate_list(H5F_t * f,
#endif /* H5C_APPLY_CANDIDATE_LIST__DEBUG */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_apply_candidate_list, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -751,7 +751,7 @@ H5C_construct_candidate_list__clean_cache(H5C_t * cache_ptr)
size_t space_needed;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_construct_candidate_list__clean_cache, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -862,7 +862,7 @@ H5C_construct_candidate_list__min_clean(H5C_t * cache_ptr)
size_t space_needed = 0;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_construct_candidate_list__min_clean, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -965,7 +965,7 @@ H5C_create(size_t max_cache_size,
H5C_t * cache_ptr = NULL;
H5C_t * ret_value = NULL; /* Return value */
- FUNC_ENTER_NOAPI(H5C_create, NULL)
+ FUNC_ENTER_NOAPI(NULL)
HDassert( max_cache_size >= H5C__MIN_MAX_CACHE_SIZE );
HDassert( max_cache_size <= H5C__MAX_MAX_CACHE_SIZE );
@@ -1390,7 +1390,7 @@ H5C_dest(H5F_t * f,
H5C_t * cache_ptr = f->shared->cache;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_dest, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(cache_ptr);
@@ -1444,7 +1444,7 @@ H5C_expunge_entry(H5F_t * f,
H5C_cache_entry_t * entry_ptr = NULL;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_expunge_entry, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( f );
HDassert( f->shared );
@@ -1576,7 +1576,7 @@ H5C_flush_cache(H5F_t *f, hid_t primary_dxpl_id, hid_t secondary_dxpl_id, unsign
size_t initial_slist_size;
#endif /* H5C_DO_SANITY_CHECKS */
- FUNC_ENTER_NOAPI(H5C_flush_cache, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -1934,7 +1934,7 @@ H5C_flush_to_min_clean(H5F_t * f,
#endif /* JRM */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5C_flush_to_min_clean, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( f );
HDassert( f->shared );
@@ -2105,7 +2105,7 @@ H5C_get_cache_auto_resize_config(const H5C_t * cache_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_get_cache_auto_resize_config, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
@@ -2154,7 +2154,7 @@ H5C_get_cache_size(H5C_t * cache_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_get_cache_size, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
@@ -2211,7 +2211,7 @@ H5C_get_cache_hit_rate(H5C_t * cache_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_get_cache_hit_rate, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
@@ -2278,7 +2278,7 @@ H5C_get_entry_status(const H5F_t *f,
H5C_cache_entry_t * entry_ptr = NULL;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_get_entry_status, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( f );
HDassert( f->shared );
@@ -2358,7 +2358,7 @@ H5C_get_evictions_enabled(const H5C_t *cache_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_get_evictions_enabled, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
@@ -2399,7 +2399,7 @@ done:
herr_t
H5C_get_trace_file_ptr(const H5C_t *cache_ptr, FILE **trace_file_ptr_ptr)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5C_get_trace_file_ptr)
+ FUNC_ENTER_NOAPI_NOERR
HDassert(cache_ptr);
HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
@@ -2431,7 +2431,7 @@ herr_t
H5C_get_trace_file_ptr_from_entry(const H5C_cache_entry_t *entry_ptr,
FILE **trace_file_ptr_ptr)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5C_get_trace_file_ptr_from_entry)
+ FUNC_ENTER_NOAPI_NOERR
/* Sanity checks */
HDassert(entry_ptr);
@@ -2490,7 +2490,7 @@ H5C_insert_entry(H5F_t * f,
H5C_cache_entry_t * entry_ptr;
H5C_cache_entry_t * test_entry_ptr;
- FUNC_ENTER_NOAPI(H5C_insert_entry, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( f );
HDassert( f->shared );
@@ -2796,7 +2796,7 @@ H5C_mark_entries_as_clean(H5F_t * f,
H5C_cache_entry_t * entry_ptr = NULL;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_mark_entries_as_clean, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( f );
HDassert( f->shared );
@@ -3066,7 +3066,7 @@ H5C_mark_entry_dirty(void *thing)
H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)thing;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_mark_entry_dirty, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
HDassert(entry_ptr);
@@ -3145,7 +3145,7 @@ H5C_move_entry(H5C_t * cache_ptr,
#endif /* H5C_DO_SANITY_CHECKS */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_move_entry, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( cache_ptr );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -3309,7 +3309,7 @@ H5C_resize_entry(void *thing, size_t new_size)
H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)thing;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_resize_entry, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
HDassert(entry_ptr);
@@ -3412,7 +3412,7 @@ H5C_pin_protected_entry(void *thing)
H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)thing; /* Pointer to entry to pin */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_pin_protected_entry, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
HDassert(entry_ptr);
@@ -3513,7 +3513,7 @@ H5C_protect(H5F_t * f,
H5C_cache_entry_t * entry_ptr;
void * ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5C_protect, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert( f );
@@ -3881,7 +3881,7 @@ H5C_reset_cache_hit_rate_stats(H5C_t * cache_ptr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_reset_cache_hit_rate_stats, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
@@ -3926,7 +3926,7 @@ H5C_set_cache_auto_resize_config(H5C_t *cache_ptr,
size_t new_min_clean_size;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_set_cache_auto_resize_config, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
@@ -4200,7 +4200,7 @@ H5C_set_evictions_enabled(H5C_t *cache_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_set_evictions_enabled, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if ( ( cache_ptr == NULL ) || ( cache_ptr->magic != H5C__H5C_T_MAGIC ) ) {
@@ -4254,7 +4254,7 @@ H5C_set_prefix(H5C_t * cache_ptr, char * prefix)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_set_prefix, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if ( ( cache_ptr == NULL ) ||
( cache_ptr->magic != H5C__H5C_T_MAGIC ) ||
@@ -4297,7 +4297,7 @@ H5C_set_trace_file_ptr(H5C_t * cache_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_set_trace_file_ptr, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* This would normally be an assert, but we need to use an HGOTO_ERROR
* call to shut up the compiler.
@@ -4384,7 +4384,7 @@ H5C_stats(H5C_t * cache_ptr,
double average_entries_scanned_per_calls_to_msic = 0.0;
#endif /* H5C_COLLECT_CACHE_STATS */
- FUNC_ENTER_NOAPI(H5C_stats, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* This would normally be an assert, but we need to use an HGOTO_ERROR
* call to shut up the compiler.
@@ -4911,7 +4911,7 @@ H5C_dump_cache(H5C_t * cache_ptr,
H5SL_t * slist_ptr = NULL;
H5SL_node_t * node_ptr = NULL;
- FUNC_ENTER_NOAPI(H5C_dump_cache, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(cache_ptr != NULL);
HDassert(cache_ptr->magic == H5C__H5C_T_MAGIC);
@@ -5045,7 +5045,7 @@ H5C_unpin_entry(void *_entry_ptr)
H5C_cache_entry_t * entry_ptr = (H5C_cache_entry_t *)_entry_ptr; /* Pointer to entry to unpin */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_unpin_entry, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(entry_ptr);
@@ -5136,7 +5136,7 @@ H5C_unprotect(H5F_t * f,
H5C_cache_entry_t * test_entry_ptr;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_unprotect, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
deleted = ( (flags & H5C__DELETED_FLAG) != 0 );
dirtied = ( (flags & H5C__DIRTIED_FLAG) != 0 );
@@ -5465,7 +5465,7 @@ H5C_validate_resize_config(H5C_auto_size_ctl_t * config_ptr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5C_validate_resize_config, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if ( config_ptr == NULL ) {
@@ -5743,7 +5743,7 @@ H5C__auto_adjust_cache_size(H5F_t * f,
enum H5C_resize_status status = in_spec; /* will change if needed */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5C__auto_adjust_cache_size)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert( f );
HDassert( cache_ptr );
@@ -6093,7 +6093,7 @@ H5C__autoadjust__ageout(H5F_t * f,
size_t test_size;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert( f );
HDassert( cache_ptr );
@@ -6206,7 +6206,7 @@ H5C__autoadjust__ageout__cycle_epoch_marker(H5C_t * cache_ptr)
herr_t ret_value = SUCCEED; /* Return value */
int i;
- FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__cycle_epoch_marker)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert( cache_ptr );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -6344,7 +6344,7 @@ H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * f,
H5C_cache_entry_t * prev_ptr;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__evict_aged_out_entries)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert( f );
HDassert( cache_ptr );
@@ -6551,7 +6551,7 @@ H5C__autoadjust__ageout__insert_new_marker(H5C_t * cache_ptr)
herr_t ret_value = SUCCEED; /* Return value */
int i;
- FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__insert_new_marker)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert( cache_ptr );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -6629,7 +6629,7 @@ H5C__autoadjust__ageout__remove_all_markers(H5C_t * cache_ptr)
int i;
int ring_buf_index;
- FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__remove_all_markers)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert( cache_ptr );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -6710,7 +6710,7 @@ H5C__autoadjust__ageout__remove_excess_markers(H5C_t * cache_ptr)
int i;
int ring_buf_index;
- FUNC_ENTER_NOAPI_NOINIT(H5C__autoadjust__ageout__remove_excess_markers)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert( cache_ptr );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -6806,7 +6806,7 @@ H5C__flash_increase_cache_size(H5C_t * cache_ptr,
double hit_rate;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5C__flash_increase_cache_size)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert( cache_ptr );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -7003,7 +7003,7 @@ H5C_flush_invalidate_cache(H5F_t * f,
#endif /* H5C_DO_SANITY_CHECKS */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5C_flush_invalidate_cache, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert( f );
HDassert( cache_ptr );
@@ -7530,7 +7530,7 @@ H5C_flush_single_entry(H5F_t * f,
H5C_cache_entry_t * entry_ptr = NULL;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5C_flush_single_entry)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert( f );
HDassert( cache_ptr );
@@ -7942,7 +7942,7 @@ H5C_load_entry(H5F_t * f,
H5C_cache_entry_t * entry; /* Alias for thing loaded, as cache entry */
void * ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5C_load_entry)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(f);
HDassert(f->shared);
@@ -8104,7 +8104,7 @@ H5C_make_space_in_cache(H5F_t * f,
H5C_cache_entry_t * next_ptr;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5C_make_space_in_cache)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert( f );
HDassert( cache_ptr );
@@ -8401,7 +8401,7 @@ H5C_validate_lru_list(H5C_t * cache_ptr)
size_t size = 0;
H5C_cache_entry_t * entry_ptr = NULL;
- FUNC_ENTER_NOAPI_NOINIT(H5C_validate_lru_list)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert( cache_ptr );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
@@ -8522,7 +8522,7 @@ H5C_verify_not_in_index(H5C_t * cache_ptr,
int32_t depth;
H5C_cache_entry_t * scan_ptr = NULL;
- FUNC_ENTER_NOAPI_NOINIT(H5C_verify_not_in_index)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert( cache_ptr != NULL );
HDassert( cache_ptr->magic == H5C__H5C_T_MAGIC );
diff --git a/src/H5CS.c b/src/H5CS.c
index c033e7e..c2ca49b 100644
--- a/src/H5CS.c
+++ b/src/H5CS.c
@@ -79,7 +79,7 @@ H5CS_get_stack(void)
{
H5CS_t *fstack;
- FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_get_stack);
+ FUNC_ENTER_NOAPI_NOERR_NOFS
fstack = H5TS_get_thread_local_value(H5TS_funcstk_key_g);
if (!fstack) {
@@ -123,7 +123,7 @@ H5CS_print_stack(const H5CS_t *fstack, FILE *stream)
int i; /* Local index ariable */
/* Don't push this function on the function stack... :-) */
- FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_print_stack);
+ FUNC_ENTER_NOAPI_NOERR_NOFS
/* Sanity check */
HDassert(fstack);
@@ -170,7 +170,7 @@ H5CS_print(FILE *stream)
H5CS_t *fstack = H5CS_get_my_stack (); /* Get the correct function stack */
/* Don't push this function on the function stack... :-) */
- FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_print);
+ FUNC_ENTER_NOAPI_NOERR_NOFS
/* Sanity check */
assert(fstack);
@@ -202,7 +202,7 @@ H5CS_push(const char *func_name)
H5CS_t *fstack = H5CS_get_my_stack ();
/* Don't push this function on the function stack... :-) */
- FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_push);
+ FUNC_ENTER_NOAPI_NOERR_NOFS
/* Sanity check */
assert (fstack);
@@ -239,7 +239,7 @@ H5CS_pop(void)
H5CS_t *fstack = H5CS_get_my_stack ();
/* Don't push this function on the function stack... :-) */
- FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_pop);
+ FUNC_ENTER_NOAPI_NOERR_NOFS
/* Sanity check */
assert (fstack);
@@ -273,7 +273,7 @@ H5CS_copy_stack(H5CS_t *new_stack)
unsigned u; /* Local index variable */
/* Don't push this function on the function stack... :-) */
- FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_copy_stack);
+ FUNC_ENTER_NOAPI_NOERR_NOFS
/* Sanity check */
HDassert (old_stack);
@@ -307,7 +307,7 @@ H5CS_close_stack(H5CS_t *stack)
unsigned u; /* Local index variable */
/* Don't push this function on the function stack... :-) */
- FUNC_ENTER_NOAPI_NOFUNC_NOFS(H5CS_close_stack);
+ FUNC_ENTER_NOAPI_NOERR_NOFS
/* Sanity check */
HDassert (stack);
diff --git a/src/H5D.c b/src/H5D.c
index cefdbe5..d4b984d 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -88,7 +88,7 @@ DESCRIPTION
static herr_t
H5D_init_pub_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_init_pub_interface)
+ FUNC_ENTER_NOAPI_NOINIT
FUNC_LEAVE_NOAPI(H5D_init())
} /* H5D_init_pub_interface() */
@@ -132,7 +132,7 @@ H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
const H5S_t *space; /* Dataspace for dataset */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Dcreate2, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE7("i", "i*siiiii", loc_id, name, type_id, space_id, lcpl_id, dcpl_id,
dapl_id);
@@ -166,7 +166,7 @@ H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset access property list")
/* Create the new dataset & get its ID */
- if(NULL == (dset = H5D_create_named(&loc, name, type_id, space, lcpl_id, dcpl_id, dapl_id, H5AC_dxpl_id)))
+ if(NULL == (dset = H5D__create_named(&loc, name, type_id, space, lcpl_id, dcpl_id, dapl_id, H5AC_dxpl_id)))
HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset")
if((ret_value = H5I_register(H5I_DATASET, dset, TRUE)) < 0)
HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "unable to register dataset")
@@ -224,7 +224,7 @@ H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t dcpl_id,
const H5S_t *space; /* Dataspace for dataset */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Dcreate_anon, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("i", "iiiii", loc_id, type_id, space_id, dcpl_id, dapl_id);
/* Check arguments */
@@ -308,7 +308,7 @@ H5Dopen2(hid_t loc_id, const char *name, hid_t dapl_id)
hid_t dxpl_id = H5AC_dxpl_id; /* dxpl to use to open datset */
hid_t ret_value;
- FUNC_ENTER_API(H5Dopen2, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("i", "i*si", loc_id, name, dapl_id);
/* Check args */
@@ -383,7 +383,7 @@ H5Dclose(hid_t dset_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Dclose, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", dset_id);
/* Check args */
@@ -429,7 +429,7 @@ H5Dget_space(hid_t dset_id)
H5S_t *space = NULL;
hid_t ret_value;
- FUNC_ENTER_API(H5Dget_space, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", dset_id);
/* Check args */
@@ -476,7 +476,7 @@ H5Dget_space_status(hid_t dset_id, H5D_space_status_t *allocation)
H5D_t *dset = NULL;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_API(H5Dget_space_status, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*Ds", dset_id, allocation);
/* Check arguments */
@@ -516,7 +516,7 @@ H5Dget_type(hid_t dset_id)
H5T_t *dt = NULL; /* Datatype to return */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Dget_type, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", dset_id);
/* Check args */
@@ -579,7 +579,7 @@ H5Dget_create_plist(hid_t dset_id)
hid_t new_dcpl_id = FAIL;
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Dget_create_plist, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", dset_id);
/* Check args */
@@ -716,7 +716,7 @@ H5Dget_access_plist(hid_t dset_id)
hid_t new_dapl_id = FAIL;
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Dget_access_plist, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", dset_id);
/* Check args */
@@ -778,7 +778,7 @@ H5Dget_storage_size(hid_t dset_id)
H5D_t *dset; /* Dataset to query */
hsize_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Dget_storage_size, 0)
+ FUNC_ENTER_API(0)
H5TRACE1("h", "i", dset_id);
/* Check args */
@@ -813,7 +813,7 @@ H5Dget_offset(hid_t dset_id)
H5D_t *dset; /* Dataset to query */
haddr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Dget_offset, HADDR_UNDEF)
+ FUNC_ENTER_API(HADDR_UNDEF)
H5TRACE1("a", "i", dset_id);
/* Check args */
@@ -894,7 +894,7 @@ H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t op,
H5S_t *space; /* Dataspace for iteration */
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Diterate, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "*xiix*x", buf, type_id, space_id, op, operator_data);
/* Check args */
@@ -937,7 +937,7 @@ H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf)
H5S_t *space; /* Dataspace for iteration */
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Dvlen_reclaim, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "iii*x", type_id, space_id, plist_id, buf);
/* Check args */
@@ -998,7 +998,7 @@ H5Dvlen_get_buf_size(hid_t dataset_id, hid_t type_id, hid_t space_id,
H5P_genplist_t *plist; /* Property list */
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Dvlen_get_buf_size, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "iii*h", dataset_id, type_id, space_id, size);
/* Check args */
@@ -1088,7 +1088,7 @@ H5Dset_extent(hid_t dset_id, const hsize_t size[])
H5D_t *dset; /* Dataset for this operation */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Dset_extent, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*h", dset_id, size);
/* Check args */
diff --git a/src/H5Dbtree.c b/src/H5Dbtree.c
index 581e99c..cf48bb5 100644
--- a/src/H5Dbtree.c
+++ b/src/H5Dbtree.c
@@ -224,7 +224,7 @@ H5D_btree_get_shared(const H5F_t UNUSED *f, const void *_udata)
{
const H5D_chunk_common_ud_t *udata = (const H5D_chunk_common_ud_t *) _udata;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_get_shared)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(udata);
HDassert(udata->storage);
@@ -265,7 +265,7 @@ H5D_btree_new_node(H5F_t *f, hid_t dxpl_id, H5B_ins_t op,
unsigned u;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_btree_new_node)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -337,7 +337,7 @@ H5D_btree_cmp2(void *_lt_key, void *_udata, void *_rt_key)
H5D_chunk_common_ud_t *udata = (H5D_chunk_common_ud_t *) _udata;
int ret_value;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_cmp2)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(lt_key);
HDassert(rt_key);
@@ -386,7 +386,7 @@ H5D_btree_cmp3(void *_lt_key, void *_udata, void *_rt_key)
H5D_chunk_common_ud_t *udata = (H5D_chunk_common_ud_t *) _udata;
int ret_value = 0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_cmp3)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(lt_key);
HDassert(rt_key);
@@ -453,7 +453,7 @@ H5D_btree_found(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t addr, const void
unsigned u;
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_found)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(f);
@@ -521,7 +521,7 @@ H5D_btree_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key,
unsigned u;
H5B_ins_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5D_btree_insert)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -638,7 +638,7 @@ H5D_btree_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key /*in,out *
H5D_btree_key_t *lt_key = (H5D_btree_key_t *)_lt_key;
H5B_ins_t ret_value=H5B_INS_REMOVE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_btree_remove)
+ FUNC_ENTER_NOAPI_NOINIT
/* Remove raw data chunk from file */
H5_CHECK_OVERFLOW(lt_key->nbytes, uint32_t, hsize_t);
@@ -673,7 +673,7 @@ H5D_btree_decode_key(const H5B_shared_t *shared, const uint8_t *raw, void *_key)
size_t ndims;
unsigned u;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_decode_key)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(shared);
@@ -711,7 +711,7 @@ H5D_btree_encode_key(const H5B_shared_t *shared, uint8_t *raw, const void *_key)
size_t ndims;
unsigned u;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_encode_key)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(shared);
@@ -751,7 +751,7 @@ H5D_btree_debug_key(FILE *stream, int indent, int fwidth, const void *_key,
const H5D_btree_dbg_t *udata = (const H5D_btree_dbg_t *)_udata;
unsigned u;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_debug_key)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(key);
@@ -785,7 +785,7 @@ H5D_btree_shared_create(const H5F_t *f, H5O_storage_chunk_t *store, unsigned ndi
size_t sizeof_rkey; /* Size of raw (disk) key */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_btree_shared_create)
+ FUNC_ENTER_NOAPI_NOINIT
/* Set the raw key size */
sizeof_rkey = 4 + /*storage size */
@@ -826,7 +826,7 @@ H5D_btree_idx_init(const H5D_chk_idx_info_t *idx_info, const H5S_t UNUSED *space
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_init)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(idx_info);
@@ -871,7 +871,7 @@ H5D_btree_idx_create(const H5D_chk_idx_info_t *idx_info)
H5D_chunk_common_ud_t udata; /* User data for B-tree callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_create)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(idx_info);
@@ -911,7 +911,7 @@ H5D_btree_idx_is_space_alloc(const H5O_storage_chunk_t *storage)
{
hbool_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_idx_is_space_alloc)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(storage);
@@ -941,7 +941,7 @@ H5D_btree_idx_insert(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_insert)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(idx_info);
HDassert(idx_info->f);
@@ -982,7 +982,7 @@ H5D_btree_idx_get_addr(const H5D_chk_idx_info_t *idx_info, H5D_chunk_ud_t *udata
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_get_addr)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(idx_info);
HDassert(idx_info->f);
@@ -1028,7 +1028,7 @@ H5D_btree_idx_iterate_cb(H5F_t UNUSED *f, hid_t UNUSED dxpl_id,
H5D_chunk_rec_t chunk_rec; /* Generic chunk record for callback */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOERR(H5D_btree_idx_iterate_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check for memcpy() */
HDcompile_assert(offsetof(H5D_chunk_rec_t, nbytes) == offsetof(H5D_btree_key_t, nbytes));
@@ -1070,7 +1070,7 @@ H5D_btree_idx_iterate(const H5D_chk_idx_info_t *idx_info,
H5D_btree_it_ud_t udata; /* User data for B-tree iterator callback */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOERR(H5D_btree_idx_iterate)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(idx_info);
HDassert(idx_info->f);
@@ -1113,7 +1113,7 @@ H5D_btree_idx_remove(const H5D_chk_idx_info_t *idx_info, H5D_chunk_common_ud_t *
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_remove)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(idx_info);
HDassert(idx_info->f);
@@ -1153,7 +1153,7 @@ H5D_btree_idx_delete(const H5D_chk_idx_info_t *idx_info)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_delete)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(idx_info);
@@ -1213,7 +1213,7 @@ H5D_btree_idx_copy_setup(const H5D_chk_idx_info_t *idx_info_src,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_copy_setup)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(idx_info_src);
HDassert(idx_info_src->f);
@@ -1262,7 +1262,7 @@ H5D_btree_idx_copy_shutdown(H5O_storage_chunk_t *storage_src,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_copy_shutdown)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(storage_src);
HDassert(storage_dst);
@@ -1299,7 +1299,7 @@ H5D_btree_idx_size(const H5D_chk_idx_info_t *idx_info, hsize_t *index_size)
hbool_t shared_init = FALSE; /* Whether shared B-tree info is initialized */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_btree_idx_size, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(idx_info);
@@ -1353,7 +1353,7 @@ done:
static herr_t
H5D_btree_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_addr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_idx_reset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(storage);
@@ -1381,7 +1381,7 @@ H5D_btree_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_addr)
static herr_t
H5D_btree_idx_dump(const H5O_storage_chunk_t *storage, FILE *stream)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_btree_idx_dump)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(storage);
HDassert(stream);
@@ -1409,7 +1409,7 @@ H5D_btree_idx_dest(const H5D_chk_idx_info_t *idx_info)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_btree_idx_dest)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(idx_info);
HDassert(idx_info->f);
@@ -1449,7 +1449,7 @@ H5D_btree_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent
hbool_t shared_init = FALSE; /* Whether B-tree shared info is initialized */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_btree_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Reset "fake" storage info */
HDmemset(&storage, 0, sizeof(storage));
diff --git a/src/H5Dchunk.c b/src/H5Dchunk.c
index b9d8482..4d70337 100644
--- a/src/H5Dchunk.c
+++ b/src/H5Dchunk.c
@@ -295,7 +295,7 @@ H5D_chunk_set_info_real(H5O_layout_chunk_t *layout, unsigned ndims, const hsize_
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_chunk_set_info_real, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(layout);
@@ -340,7 +340,7 @@ H5D_chunk_set_info(const H5D_t *dset)
unsigned ndims; /* Rank of dataspace */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_chunk_set_info, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
HDassert(dset);
@@ -386,7 +386,7 @@ H5D_chunk_construct(H5F_t UNUSED *f, H5D_t *dset)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_construct)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(f);
@@ -475,7 +475,7 @@ H5D_chunk_init(H5F_t *f, hid_t dxpl_id, const H5D_t *dset, hid_t dapl_id)
H5P_genplist_t *dapl; /* Data access property list object pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_chunk_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@@ -549,7 +549,7 @@ H5D_chunk_is_space_alloc(const H5O_storage_t *storage)
{
hbool_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5D_chunk_is_space_alloc)
+ FUNC_ENTER_NOAPI_NOERR
/* Sanity checks */
HDassert(storage);
@@ -594,7 +594,7 @@ H5D_chunk_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info
hbool_t sel_hyper_flag;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_io_init)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get layout for dataset */
fm->layout = &(dataset->shared->layout);
@@ -862,7 +862,7 @@ H5D_chunk_alloc(size_t size, const H5O_pline_t *pline)
{
void *ret_value = NULL; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_alloc)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(size);
HDassert(pline);
@@ -893,7 +893,7 @@ H5D_chunk_alloc(size_t size, const H5O_pline_t *pline)
static void *
H5D_chunk_xfree(void *chk, const H5O_pline_t *pline)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_xfree)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(pline);
@@ -927,7 +927,7 @@ H5D_chunk_realloc(void *chk, size_t size, const H5O_pline_t *pline)
{
void *ret_value = NULL; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_realloc)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(size);
HDassert(pline);
@@ -963,7 +963,7 @@ H5D_free_chunk_info(void *item, void UNUSED *key, void UNUSED *opdata)
{
H5D_chunk_info_t *chunk_info = (H5D_chunk_info_t *)item;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_free_chunk_info)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(chunk_info);
@@ -1009,7 +1009,7 @@ H5D_create_chunk_map_single(H5D_chunk_map_t *fm, const H5D_io_info_t
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_create_chunk_map_single)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(fm->f_ndims > 0);
@@ -1095,7 +1095,7 @@ H5D_create_chunk_file_map_hyper(H5D_chunk_map_t *fm, const H5D_io_info_t
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_create_chunk_file_map_hyper)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
assert(fm->f_ndims>0);
@@ -1272,7 +1272,7 @@ H5D_create_chunk_mem_map_hyper(const H5D_chunk_map_t *fm)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_create_chunk_mem_map_hyper)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
assert(fm->f_ndims>0);
@@ -1378,7 +1378,7 @@ H5D_chunk_file_cb(void UNUSED *elem, hid_t UNUSED type_id, unsigned ndims, const
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_file_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Calculate the index of this chunk */
if(H5V_chunk_index(ndims, coords, fm->layout->u.chunk.dim, fm->layout->u.chunk.down_chunks, &chunk_index) < 0)
@@ -1490,7 +1490,7 @@ H5D_chunk_mem_cb(void UNUSED *elem, hid_t UNUSED type_id, unsigned ndims, const
hsize_t chunk_index; /* Chunk index */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_mem_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Calculate the index of this chunk */
if(H5V_chunk_index(ndims, coords, fm->layout->u.chunk.dim, fm->layout->u.chunk.down_chunks, &chunk_index) < 0)
@@ -1565,7 +1565,7 @@ H5D_chunk_cacheable(const H5D_io_info_t *io_info, haddr_t caddr, hbool_t write_o
const H5D_t *dataset = io_info->dset;
htri_t ret_value = FAIL;
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_cacheable)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(io_info);
HDassert(dataset);
@@ -1648,7 +1648,7 @@ H5D_chunk_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
hbool_t skip_missing_chunks = FALSE; /* Whether to skip missing chunks */
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_read)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(io_info);
@@ -1797,7 +1797,7 @@ H5D_chunk_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
uint32_t dst_accessed_bytes = 0; /* Total accessed size in a chunk */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_write)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(io_info);
@@ -1944,7 +1944,7 @@ H5D_chunk_flush(H5D_t *dset, hid_t dxpl_id)
unsigned nerrors = 0; /* Count of any errors encountered when flushing chunks */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(dset);
@@ -1988,7 +1988,7 @@ H5D_chunk_io_term(const H5D_chunk_map_t *fm)
{
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_io_term)
+ FUNC_ENTER_NOAPI_NOINIT
/* Single element I/O vs. multiple element I/O cleanup */
if(fm->use_single) {
@@ -2039,7 +2039,7 @@ H5D_chunk_idx_reset(H5O_storage_chunk_t *storage, hbool_t reset_addr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_chunk_idx_reset, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
HDassert(storage);
@@ -2069,7 +2069,7 @@ done:
herr_t
H5D_chunk_cinfo_cache_reset(H5D_chunk_cached_t *last)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_cinfo_cache_reset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(last);
@@ -2098,7 +2098,7 @@ H5D_chunk_cinfo_cache_update(H5D_chunk_cached_t *last, const H5D_chunk_ud_t *uda
{
unsigned u; /* Local index variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_cinfo_cache_update)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(last);
@@ -2138,7 +2138,7 @@ H5D_chunk_cinfo_cache_found(const H5D_chunk_cached_t *last, H5D_chunk_ud_t *udat
{
hbool_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_cinfo_cache_found)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(last);
@@ -2191,7 +2191,7 @@ H5D_chunk_create(H5D_t *dset /*in,out*/, hid_t dxpl_id)
H5D_chk_idx_info_t idx_info; /* Chunked index info */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_chunk_create, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(dset);
@@ -2244,7 +2244,7 @@ H5D_chunk_lookup(const H5D_t *dset, hid_t dxpl_id, const hsize_t *chunk_offset,
unsigned u; /* Counter */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_lookup)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(dset);
HDassert(dset->shared->layout.u.chunk.ndims > 0);
@@ -2331,7 +2331,7 @@ H5D_chunk_flush_entry(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t *
hbool_t point_of_no_return = FALSE;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_flush_entry)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(dset);
HDassert(dset->shared);
@@ -2485,7 +2485,7 @@ H5D_chunk_cache_evict(const H5D_t *dset, hid_t dxpl_id, const H5D_dxpl_cache_t *
H5D_rdcc_t *rdcc = &(dset->shared->cache.chunk);
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_cache_evict)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(dset);
HDassert(dxpl_cache);
@@ -2555,7 +2555,7 @@ H5D_chunk_cache_prune(const H5D_t *dset, hid_t dxpl_id,
int nerrors = 0; /* Accumulated error count during preemptions */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_cache_prune)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Preemption is accomplished by having multiple pointers (currently two)
@@ -2681,7 +2681,7 @@ H5D_chunk_lock(const H5D_io_info_t *io_info, H5D_chunk_ud_t *udata,
unsigned u; /*counters */
void *ret_value; /*return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_lock)
+ FUNC_ENTER_NOAPI(NULL)
HDassert(io_info);
HDassert(io_info->dxpl_cache);
@@ -2945,7 +2945,7 @@ H5D_chunk_unlock(const H5D_io_info_t *io_info, const H5D_chunk_ud_t *udata,
const H5D_rdcc_t *rdcc = &(io_info->dset->shared->cache.chunk);
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_unlock)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(io_info);
HDassert(udata);
@@ -3021,7 +3021,7 @@ H5D_chunk_allocated_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
{
hsize_t *nbytes = (hsize_t *)_udata;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_allocated_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
*(hsize_t *)nbytes += chunk_rec->nbytes;
@@ -3054,7 +3054,7 @@ H5D_chunk_allocated(H5D_t *dset, hid_t dxpl_id, hsize_t *nbytes)
hsize_t chunk_bytes = 0; /* Number of bytes allocated for chunks */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_chunk_allocated, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(dset);
HDassert(dset->shared);
@@ -3138,7 +3138,7 @@ H5D_chunk_allocate(H5D_t *dset, hid_t dxpl_id, hbool_t full_overwrite,
hid_t data_dxpl_id; /* DXPL ID to use for raw data I/O operations */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_chunk_allocate, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(dset && H5D_CHUNKED == layout->type);
@@ -3484,7 +3484,7 @@ H5D_chunk_prune_fill(H5D_chunk_it_ud1_t *udata)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_prune_fill)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get the chunk's size */
HDassert(layout->u.chunk.size > 0);
@@ -3709,7 +3709,7 @@ H5D_chunk_prune_by_extent(H5D_t *dset, hid_t dxpl_id, const hsize_t *old_dim)
int i; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_chunk_prune_by_extent, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(dset && H5D_CHUNKED == layout->type);
@@ -4008,7 +4008,7 @@ H5D_chunk_addrmap_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
hsize_t chunk_index;
int ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_addrmap_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Compute the index for this chunk */
if(H5V_chunk_index(rank, chunk_rec->offset, udata->common.layout->dim, udata->common.layout->down_chunks, &chunk_index) < 0)
@@ -4043,7 +4043,7 @@ H5D_chunk_addrmap(const H5D_io_info_t *io_info, haddr_t chunk_addr[])
H5D_chunk_it_ud2_t udata; /* User data for iteration callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_chunk_addrmap, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(dset);
HDassert(dset->shared);
@@ -4097,7 +4097,7 @@ H5D_chunk_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_storage_t *storage)
htri_t exists; /* Flag if header message of interest exists */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_chunk_delete, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@@ -4175,7 +4175,7 @@ H5D_chunk_update_cache(H5D_t *dset, hid_t dxpl_id)
unsigned rank; /*current # of dimensions */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_chunk_update_cache, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(dset && H5D_CHUNKED == dset->shared->layout.type);
@@ -4271,7 +4271,7 @@ H5D_chunk_copy_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
int ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_copy_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get 'size_t' local value for number of bytes in chunk */
H5_ASSIGN_OVERFLOW(nbytes, chunk_rec->nbytes, uint32_t, size_t);
@@ -4451,7 +4451,7 @@ H5D_chunk_copy(H5F_t *f_src, H5O_storage_chunk_t *storage_src,
hbool_t copy_setup_done = FALSE; /* Indicate that 'copy setup' is done */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_chunk_copy, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f_src);
@@ -4689,7 +4689,7 @@ H5D_chunk_bh_info(H5F_t *f, hid_t dxpl_id, H5O_layout_t *layout,
H5D_chk_idx_info_t idx_info; /* Chunked index info */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_chunk_bh_info, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
@@ -4734,7 +4734,7 @@ H5D_chunk_dump_index_cb(const H5D_chunk_rec_t *chunk_rec, void *_udata)
{
H5D_chunk_it_ud4_t *udata = (H5D_chunk_it_ud4_t *)_udata; /* User data from caller */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_chunk_dump_index_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(udata->stream) {
unsigned u; /* Local index variable */
@@ -4778,7 +4778,7 @@ H5D_chunk_dump_index(H5D_t *dset, hid_t dxpl_id, FILE *stream)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_chunk_dump_index, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(dset);
@@ -4838,7 +4838,7 @@ H5D_chunk_dest(H5F_t *f, hid_t dxpl_id, H5D_t *dset)
int nerrors = 0; /* Accumulated count of errors */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_chunk_dest, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(dset);
@@ -4902,7 +4902,7 @@ H5D_chunk_stats(const H5D_t *dset, hbool_t headers)
char ascii[32];
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_chunk_stats, FAIL)
+ FUNC_ENTER_NOAPI_NOERR(FAIL)
if (!H5DEBUG(AC))
HGOTO_DONE(SUCCEED)
@@ -4970,7 +4970,7 @@ H5D_nonexistent_readvv_cb(hsize_t UNUSED dst_off, hsize_t src_off, size_t len,
hbool_t fb_info_init = FALSE; /* Whether the fill value buffer has been initialized */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_nonexistent_readvv_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Initialize the fill value buffer */
if(H5D_fill_init(&fb_info, (udata->rbuf + src_off), NULL, NULL, NULL, NULL,
@@ -5020,7 +5020,7 @@ H5D_nonexistent_readvv(const H5D_io_info_t *io_info,
H5D_chunk_readvv_ud_t udata; /* User data for H5V_opvv() operator */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_nonexistent_readvv)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(io_info);
diff --git a/src/H5Dcompact.c b/src/H5Dcompact.c
index b98f2cb..33a0dd6 100644
--- a/src/H5Dcompact.c
+++ b/src/H5Dcompact.c
@@ -123,7 +123,7 @@ H5D_compact_fill(H5D_t *dset, hid_t dxpl_id)
hbool_t fb_info_init = FALSE; /* Whether the fill value buffer has been initialized */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_compact_fill, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(TRUE == H5P_isa_class(dxpl_id, H5P_DATASET_XFER));
@@ -180,7 +180,7 @@ H5D_compact_construct(H5F_t *f, H5D_t *dset)
int i; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_compact_construct)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(f);
@@ -231,7 +231,7 @@ done:
static hbool_t
H5D_compact_is_space_alloc(const H5O_storage_t UNUSED *storage)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_compact_is_space_alloc)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity checks */
HDassert(storage);
@@ -258,7 +258,7 @@ H5D_compact_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t UNUSED *
hsize_t UNUSED nelmts, const H5S_t UNUSED *file_space, const H5S_t UNUSED *mem_space,
H5D_chunk_map_t UNUSED *cm)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_compact_io_init)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
io_info->store->compact.buf = io_info->dset->shared->layout.storage.u.compact.buf;
io_info->store->compact.dirty = &io_info->dset->shared->layout.storage.u.compact.dirty;
@@ -292,7 +292,7 @@ H5D_compact_readvv(const H5D_io_info_t *io_info,
{
ssize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_compact_readvv)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(io_info);
@@ -333,7 +333,7 @@ H5D_compact_writevv(const H5D_io_info_t *io_info,
{
ssize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_compact_writevv)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(io_info);
@@ -366,7 +366,7 @@ H5D_compact_flush(H5D_t *dset, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_compact_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(dset);
@@ -409,7 +409,7 @@ H5D_compact_copy(H5F_t *f_src, H5O_storage_compact_t *storage_src, H5F_t *f_dst,
hid_t buf_sid = -1; /* ID for buffer dataspace */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_compact_copy, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f_src);
diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c
index 9a6e08f..cafa4a4 100644
--- a/src/H5Dcontig.c
+++ b/src/H5Dcontig.c
@@ -164,7 +164,7 @@ H5D_contig_alloc(H5F_t *f, hid_t dxpl_id, H5O_storage_contig_t *storage /*out */
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_contig_alloc, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -213,7 +213,7 @@ H5D_contig_fill(H5D_t *dset, hid_t dxpl_id)
hid_t my_dxpl_id; /* DXPL ID to use for this operation */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_contig_fill, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(TRUE == H5P_isa_class(dxpl_id, H5P_DATASET_XFER));
@@ -360,7 +360,7 @@ H5D_contig_delete(H5F_t *f, hid_t dxpl_id, const H5O_storage_t *storage)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_contig_delete, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -390,7 +390,7 @@ done:
haddr_t
H5D_contig_get_addr(const H5D_t *dset)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5D_contig_get_addr)
+ FUNC_ENTER_NOAPI_NOERR
/* check args */
HDassert(dset);
@@ -426,7 +426,7 @@ H5D_contig_construct(H5F_t *f, H5D_t *dset)
int i; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_contig_construct)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(f);
@@ -489,7 +489,7 @@ H5D_contig_is_space_alloc(const H5O_storage_t *storage)
{
hbool_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_contig_is_space_alloc)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity checks */
HDassert(storage);
@@ -518,7 +518,7 @@ H5D_contig_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t UNUSED *t
hsize_t UNUSED nelmts, const H5S_t UNUSED *file_space, const H5S_t UNUSED *mem_space,
H5D_chunk_map_t UNUSED *cm)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_contig_io_init)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
io_info->store->contig.dset_addr = io_info->dset->shared->layout.storage.u.contig.addr;
io_info->store->contig.dset_size = io_info->dset->shared->layout.storage.u.contig.size;
@@ -546,7 +546,7 @@ H5D_contig_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
{
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_contig_read)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(io_info);
@@ -583,7 +583,7 @@ H5D_contig_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
{
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_contig_write)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(io_info);
@@ -626,7 +626,7 @@ H5D_contig_write_one(H5D_io_info_t *io_info, hsize_t offset, size_t size)
size_t mem_curr_seq = 0; /* "Current sequence" in memory */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_contig_write_one)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(io_info);
@@ -668,7 +668,7 @@ H5D_contig_readvv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len,
hsize_t max_data; /* Actual maximum size of data to cache */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_contig_readvv_sieve_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Stash local copies of these value */
if(dset_contig->sieve_buf != NULL) {
@@ -824,7 +824,7 @@ H5D_contig_readvv_cb(hsize_t dst_off, hsize_t src_off, size_t len, void *_udata)
H5D_contig_readvv_ud_t *udata = (H5D_contig_readvv_ud_t *)_udata; /* User data for H5V_opvv() operator */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_contig_readvv_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Write data */
if(H5F_block_read(udata->file, H5FD_MEM_DRAW, (udata->dset_addr + dst_off),
@@ -861,7 +861,7 @@ H5D_contig_readvv(const H5D_io_info_t *io_info,
{
ssize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_contig_readvv)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(io_info);
@@ -939,7 +939,7 @@ H5D_contig_writevv_sieve_cb(hsize_t dst_off, hsize_t src_off, size_t len,
hsize_t max_data; /* Actual maximum size of data to cache */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_contig_writevv_sieve_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Stash local copies of these values */
if(dset_contig->sieve_buf != NULL) {
@@ -1145,7 +1145,7 @@ H5D_contig_writevv_cb(hsize_t dst_off, hsize_t src_off, size_t len, void *_udata
H5D_contig_writevv_ud_t *udata = (H5D_contig_writevv_ud_t *)_udata; /* User data for H5V_opvv() operator */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_contig_writevv_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Write data */
if(H5F_block_write(udata->file, H5FD_MEM_DRAW, (udata->dset_addr + dst_off), len, udata->dxpl_id, (udata->wbuf + src_off)) < 0)
@@ -1181,7 +1181,7 @@ H5D_contig_writevv(const H5D_io_info_t *io_info,
{
ssize_t ret_value; /* Return value (Size of sequence in bytes) */
- FUNC_ENTER_NOAPI_NOINIT(H5D_contig_writevv)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(io_info);
@@ -1247,7 +1247,7 @@ H5D_contig_flush(H5D_t *dset, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_contig_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(dset);
@@ -1306,7 +1306,7 @@ H5D_contig_copy(H5F_t *f_src, const H5O_storage_contig_t *storage_src,
hbool_t fix_ref = FALSE; /* Flag to indicate that ref values should be fixed */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_contig_copy, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f_src);
diff --git a/src/H5Ddbg.c b/src/H5Ddbg.c
index fa4c54c..9b27c9c 100644
--- a/src/H5Ddbg.c
+++ b/src/H5Ddbg.c
@@ -77,7 +77,7 @@ DESCRIPTION
static herr_t
H5D_init_dbg_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_init_dbg_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5D_init())
} /* H5D_init_dbg_interface() */
@@ -104,7 +104,7 @@ H5Ddebug(hid_t dset_id)
H5D_t *dset; /* Dataset to debug */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Ddebug, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", dset_id);
/* Check args */
diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c
index b31f23b..7e65149 100644
--- a/src/H5Ddeprec.c
+++ b/src/H5Ddeprec.c
@@ -101,7 +101,7 @@ DESCRIPTION
static herr_t
H5D_init_deprec_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_init_deprec_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5D_init())
} /* H5D_init_deprec_interface() */
@@ -146,7 +146,7 @@ H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
const H5S_t *space; /* Dataspace for dataset */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Dcreate1, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("i", "i*siii", loc_id, name, type_id, space_id, dcpl_id);
/* Check arguments */
@@ -165,7 +165,7 @@ H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not dataset create property list ID")
/* Build and open the new dataset */
- if(NULL == (dset = H5D_create_named(&loc, name, type_id, space, H5P_LINK_CREATE_DEFAULT, dcpl_id, H5P_DATASET_ACCESS_DEFAULT, H5AC_dxpl_id)))
+ if(NULL == (dset = H5D__create_named(&loc, name, type_id, space, H5P_LINK_CREATE_DEFAULT, dcpl_id, H5P_DATASET_ACCESS_DEFAULT, H5AC_dxpl_id)))
HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to create dataset")
/* Register the new dataset to get an ID for it */
@@ -212,7 +212,7 @@ H5Dopen1(hid_t loc_id, const char *name)
hid_t dxpl_id = H5AC_dxpl_id; /* dxpl to use to open datset */
hid_t ret_value;
- FUNC_ENTER_API(H5Dopen1, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("i", "i*s", loc_id, name);
/* Check args */
@@ -283,7 +283,7 @@ H5Dextend(hid_t dset_id, const hsize_t size[])
H5D_t *dset;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Dextend, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*h", dset_id, size);
/* Check args */
@@ -323,7 +323,7 @@ H5D_extend(H5D_t *dataset, const hsize_t *size, hid_t dxpl_id)
H5O_fill_t *fill; /* Dataset's fill value */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_extend)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(dataset);
diff --git a/src/H5Defl.c b/src/H5Defl.c
index bcb47a2..51e8813 100644
--- a/src/H5Defl.c
+++ b/src/H5Defl.c
@@ -136,7 +136,7 @@ H5D_efl_construct(H5F_t *f, H5D_t *dset)
int i; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_efl_construct)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(f);
@@ -200,7 +200,7 @@ done:
hbool_t
H5D_efl_is_space_alloc(const H5O_storage_t UNUSED *storage)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_efl_is_space_alloc)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity checks */
HDassert(storage);
@@ -227,7 +227,7 @@ H5D_efl_io_init(const H5D_io_info_t *io_info, const H5D_type_info_t UNUSED *type
hsize_t UNUSED nelmts, const H5S_t UNUSED *file_space, const H5S_t UNUSED *mem_space,
H5D_chunk_map_t UNUSED *cm)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_efl_io_init)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDmemcpy(&io_info->store->efl, &(io_info->dset->shared->dcpl_cache.efl), sizeof(H5O_efl_t));
@@ -267,7 +267,7 @@ H5D_efl_read(const H5O_efl_t *efl, haddr_t addr, size_t size, uint8_t *buf)
size_t u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_efl_read)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(efl && efl->nused>0);
@@ -353,7 +353,7 @@ H5D_efl_write(const H5O_efl_t *efl, haddr_t addr, size_t size, const uint8_t *bu
size_t u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_efl_write)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(efl && efl->nused > 0);
@@ -428,7 +428,7 @@ H5D_efl_readvv_cb(hsize_t dst_off, hsize_t src_off, size_t len, void *_udata)
H5D_efl_readvv_ud_t *udata = (H5D_efl_readvv_ud_t *)_udata; /* User data for H5V_opvv() operator */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_efl_readvv_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Read data */
if(H5D_efl_read(udata->efl, dst_off, len, (udata->rbuf + src_off)) < 0)
@@ -462,7 +462,7 @@ H5D_efl_readvv(const H5D_io_info_t *io_info,
H5D_efl_readvv_ud_t udata; /* User data for H5V_opvv() operator */
ssize_t ret_value; /* Return value (Total size of sequence in bytes) */
- FUNC_ENTER_NOAPI_NOINIT(H5D_efl_readvv)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(io_info);
@@ -508,7 +508,7 @@ H5D_efl_writevv_cb(hsize_t dst_off, hsize_t src_off, size_t len, void *_udata)
H5D_efl_writevv_ud_t *udata = (H5D_efl_writevv_ud_t *)_udata; /* User data for H5V_opvv() operator */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_efl_writevv_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Write data */
if(H5D_efl_write(udata->efl, dst_off, len, (udata->wbuf + src_off)) < 0)
@@ -542,7 +542,7 @@ H5D_efl_writevv(const H5D_io_info_t *io_info,
H5D_efl_writevv_ud_t udata; /* User data for H5V_opvv() operator */
ssize_t ret_value; /* Return value (Total size of sequence in bytes) */
- FUNC_ENTER_NOAPI_NOINIT(H5D_efl_writevv)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(io_info);
@@ -587,7 +587,7 @@ H5D_efl_bh_info(H5F_t *f, hid_t dxpl_id, H5O_efl_t *efl, hsize_t *heap_size)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_efl_bh_info, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
diff --git a/src/H5Dfill.c b/src/H5Dfill.c
index a80dd83..c0a9766 100644
--- a/src/H5Dfill.c
+++ b/src/H5Dfill.c
@@ -117,7 +117,7 @@ H5Dfill(const void *fill, hid_t fill_type_id, void *buf, hid_t buf_type_id, hid_
H5T_t *buf_type; /* Buffer datatype */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Dfill, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "*xi*xii", fill, fill_type_id, buf, buf_type_id, space_id);
/* Check args */
@@ -181,7 +181,7 @@ H5D_fill(const void *fill, const H5T_t *fill_type, void *buf,
size_t dst_type_size; /* Size of destination type*/
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_fill)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(fill_type);
@@ -370,7 +370,7 @@ H5D_fill_init(H5D_fill_buf_info_t *fb_info, void *caller_fill_buf,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_fill_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(fb_info);
@@ -566,7 +566,7 @@ H5D_fill_refill_vl(H5D_fill_buf_info_t *fb_info, size_t nelmts, hid_t dxpl_id)
herr_t ret_value = SUCCEED; /* Return value */
void * buf = NULL; /* Temporary fill buffer */
- FUNC_ENTER_NOAPI(H5D_fill_refill_vl, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(fb_info);
@@ -644,7 +644,7 @@ done:
herr_t
H5D_fill_release(H5D_fill_buf_info_t *fb_info)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5D_fill_release)
+ FUNC_ENTER_NOAPI_NOERR
/* Check args */
HDassert(fb_info);
@@ -682,7 +682,7 @@ H5D_fill_release(H5D_fill_buf_info_t *fb_info)
herr_t
H5D_fill_term(H5D_fill_buf_info_t *fb_info)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5D_fill_term)
+ FUNC_ENTER_NOAPI_NOERR
/* Check args */
HDassert(fb_info);
diff --git a/src/H5Dint.c b/src/H5Dint.c
index 24bd06c..54f60b5 100644
--- a/src/H5Dint.c
+++ b/src/H5Dint.c
@@ -128,7 +128,7 @@ H5D_init(void)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
@@ -157,7 +157,7 @@ H5D_init_interface(void)
H5P_genplist_t *def_dcpl; /* Default Dataset Creation Property list */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT
/* Initialize the atom group for the dataset IDs */
if(H5I_register_type(H5I_DATASET, (size_t)H5I_DATASETID_HASHSIZE, H5D_RESERVED_ATOMS, (H5I_free_t)H5D_close)<H5I_FILE)
@@ -216,7 +216,7 @@ H5D_term_interface(void)
{
int n=0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(H5_interface_initialize_g) {
if((n=H5I_nmembers(H5I_DATASET))>0) {
@@ -278,7 +278,7 @@ H5D_get_dxpl_cache_real(hid_t dxpl_id, H5D_dxpl_cache_t *cache)
H5P_genplist_t *dx_plist; /* Data transfer property list */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_get_dxpl_cache_real)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(cache);
@@ -363,7 +363,7 @@ H5D_get_dxpl_cache(hid_t dxpl_id, H5D_dxpl_cache_t **cache)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_get_dxpl_cache,FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
assert(cache);
@@ -381,7 +381,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5D_create_named
+ * Function: H5D__create_named
*
* Purpose: Internal routine to create a new dataset.
*
@@ -395,7 +395,7 @@ done:
*-------------------------------------------------------------------------
*/
H5D_t *
-H5D_create_named(const H5G_loc_t *loc, const char *name, hid_t type_id,
+H5D__create_named(const H5G_loc_t *loc, const char *name, hid_t type_id,
const H5S_t *space, hid_t lcpl_id, hid_t dcpl_id, hid_t dapl_id,
hid_t dxpl_id)
{
@@ -403,7 +403,7 @@ H5D_create_named(const H5G_loc_t *loc, const char *name, hid_t type_id,
H5D_obj_create_t dcrt_info; /* Information for dataset creation */
H5D_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_create_named)
+ FUNC_ENTER_PACKAGE
/* Check arguments */
HDassert(loc);
@@ -436,7 +436,7 @@ H5D_create_named(const H5G_loc_t *loc, const char *name, hid_t type_id,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5D_create_named() */
+} /* end H5D__create_named() */
/*-------------------------------------------------------------------------
@@ -464,7 +464,7 @@ H5D_get_space_status(H5D_t *dset, H5D_space_status_t *allocation, hid_t dxpl_id)
hsize_t full_size; /* The number of bytes in the dataset when fully populated */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5D_get_space_status)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(dset);
@@ -529,7 +529,7 @@ H5D_new(hid_t dcpl_id, hbool_t creating, hbool_t vl_type)
H5P_genplist_t *plist; /* Property list created */
H5D_shared_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_new)
+ FUNC_ENTER_NOAPI_NOINIT
/* Allocate new shared dataset structure */
if(NULL == (new_dset = H5FL_MALLOC(H5D_shared_t)))
@@ -591,7 +591,7 @@ H5D_init_type(H5F_t *file, const H5D_t *dset, hid_t type_id, const H5T_t *type)
hbool_t use_latest_format; /* Flag indicating the newest file format should be used */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_init_type)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checking */
HDassert(file);
@@ -663,7 +663,7 @@ H5D_init_space(H5F_t *file, const H5D_t *dset, const H5S_t *space)
hbool_t use_latest_format; /* Flag indicating the newest file format should be used */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_init_space)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checking */
HDassert(file);
@@ -719,7 +719,7 @@ H5D_update_oh_info(H5F_t *file, hid_t dxpl_id, H5D_t *dset, hid_t dapl_id)
hbool_t layout_init = FALSE; /* Flag to indicate that chunk information was initialized */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_update_oh_info)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checking */
HDassert(file);
@@ -914,7 +914,7 @@ H5D_create(H5F_t *file, hid_t type_id, const H5S_t *space, hid_t dcpl_id,
H5G_loc_t dset_loc; /* Dataset location */
H5D_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5D_create, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(file);
@@ -1106,7 +1106,7 @@ H5D_open(const H5G_loc_t *loc, hid_t dapl_id, hid_t dxpl_id)
H5D_t *dataset = NULL;
H5D_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5D_open, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(loc);
@@ -1205,7 +1205,7 @@ H5D_open_oid(H5D_t *dataset, hid_t dapl_id, hid_t dxpl_id)
htri_t msg_exists; /* Whether a particular type of message exists */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_open_oid)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(dataset);
@@ -1354,7 +1354,7 @@ H5D_close(H5D_t *dataset)
unsigned free_failed = FALSE;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_close, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(dataset && dataset->oloc.file && dataset->shared);
@@ -1499,8 +1499,8 @@ done:
H5O_loc_t *
H5D_oloc(H5D_t *dataset)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_oloc)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(dataset ? &(dataset->oloc) : (H5O_loc_t *)NULL)
} /* end H5D_oloc() */
@@ -1522,8 +1522,8 @@ H5D_oloc(H5D_t *dataset)
H5G_name_t *
H5D_nameof(H5D_t *dataset)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_nameof)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(dataset ? &(dataset->path) : (H5G_name_t *)NULL)
} /* end H5D_nameof() */
@@ -1546,8 +1546,8 @@ H5D_nameof(H5D_t *dataset)
H5T_t *
H5D_typeof(const H5D_t *dset)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_typeof)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(dset);
HDassert(dset->shared);
@@ -1579,7 +1579,7 @@ H5D_alloc_storage(H5D_t *dset/*in,out*/, hid_t dxpl_id, H5D_time_alloc_t time_al
hbool_t addr_set = FALSE; /* Flag to indicate that the dataset's storage address was set */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_alloc_storage)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(dset);
@@ -1733,7 +1733,7 @@ H5D_init_storage(H5D_t *dset, hbool_t full_overwrite, hsize_t old_dim[],
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_init_storage)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(dset);
@@ -1806,7 +1806,7 @@ H5D_get_storage_size(H5D_t *dset, hid_t dxpl_id)
{
hsize_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5D_get_storage_size)
+ FUNC_ENTER_NOAPI_NOINIT
switch(dset->shared->layout.type) {
case H5D_CHUNKED:
@@ -1861,7 +1861,7 @@ H5D_get_offset(const H5D_t *dset)
{
haddr_t ret_value = HADDR_UNDEF;
- FUNC_ENTER_NOAPI_NOINIT(H5D_get_offset)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(dset);
@@ -1909,7 +1909,7 @@ H5D_iterate(void *buf, hid_t type_id, const H5S_t *space, H5D_operator_t op,
{
herr_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_iterate)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(buf);
@@ -1946,7 +1946,7 @@ H5D_vlen_reclaim(hid_t type_id, H5S_t *space, hid_t plist_id, void *buf)
H5T_vlen_alloc_info_t *vl_alloc_info = &_vl_alloc_info; /* VL allocation info */
herr_t ret_value;
- FUNC_ENTER_NOAPI(H5D_vlen_reclaim, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(H5I_DATATYPE == H5I_get_type(type_id));
@@ -1987,7 +1987,7 @@ H5D_vlen_get_buf_size_alloc(size_t size, void *info)
H5D_vlen_bufsize_t *vlen_bufsize = (H5D_vlen_bufsize_t *)info;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_vlen_get_buf_size_alloc)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Get a temporary pointer to space for the VL data */
if((vlen_bufsize->vl_tbuf = H5FL_BLK_REALLOC(vlen_vl_buf, vlen_bufsize->vl_tbuf, size)) != NULL)
@@ -2033,7 +2033,7 @@ H5D_vlen_get_buf_size(void UNUSED *elem, hid_t type_id, unsigned UNUSED ndim, co
H5T_t *dt; /* Datatype for operation */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_vlen_get_buf_size)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(op_data);
HDassert(H5I_DATATYPE == H5I_get_type(type_id));
@@ -2077,7 +2077,7 @@ H5D_check_filters(H5D_t *dataset)
H5O_fill_t *fill; /* Dataset's fill value */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_check_filters)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(dataset);
@@ -2135,7 +2135,7 @@ H5D_set_extent(H5D_t *dset, const hsize_t *size, hid_t dxpl_id)
htri_t changed; /* Whether the dataspace changed size */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_set_extent)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(dset);
@@ -2238,7 +2238,7 @@ H5D_flush_sieve_buf(H5D_t *dataset, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_flush_sieve_buf)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(dataset);
@@ -2280,7 +2280,7 @@ H5D_flush_real(H5D_t *dataset, hid_t dxpl_id)
H5O_t *oh = NULL; /* Pointer to dataset's object header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_flush_real)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(dataset);
@@ -2350,7 +2350,7 @@ H5D_mark(H5D_t *dataset, hid_t dxpl_id, unsigned flags)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_mark)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(dataset);
@@ -2387,7 +2387,7 @@ H5D_flush_cb(void *_dataset, hid_t UNUSED id, void *_udata)
H5D_flush_ud_t *udata = (H5D_flush_ud_t *)_udata; /* User data for callback */
int ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_flush_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(dataset);
@@ -2423,7 +2423,7 @@ H5D_flush(const H5F_t *f, hid_t dxpl_id)
H5D_flush_ud_t udata; /* User data for callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_flush, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
diff --git a/src/H5Dio.c b/src/H5Dio.c
index f8684b9..9fece3a 100644
--- a/src/H5Dio.c
+++ b/src/H5Dio.c
@@ -127,7 +127,7 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
char fake_char;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Dread, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "iiiiix", dset_id, mem_type_id, mem_space_id, file_space_id,
plist_id, buf);
@@ -219,7 +219,7 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
char fake_char;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Dwrite, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "iiiii*x", dset_id, mem_type_id, mem_space_id, file_space_id,
dxpl_id, buf);
@@ -315,7 +315,7 @@ H5D_read(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_read)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(dataset && dataset->oloc.file);
@@ -515,7 +515,7 @@ H5D_write(H5D_t *dataset, hid_t mem_type_id, const H5S_t *mem_space,
H5D_dxpl_cache_t *dxpl_cache = &_dxpl_cache; /* Data transfer property cache */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_write)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(dataset && dataset->oloc.file);
@@ -727,7 +727,7 @@ static herr_t
H5D_ioinfo_init(H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache, hid_t dxpl_id,
const H5D_type_info_t *type_info, H5D_storage_t *store, H5D_io_info_t *io_info)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_ioinfo_init)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(dset);
@@ -797,7 +797,7 @@ H5D_typeinfo_init(const H5D_t *dset, const H5D_dxpl_cache_t *dxpl_cache,
const H5T_t *dst_type; /* Destination datatype */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_typeinfo_init)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(type_info);
@@ -954,7 +954,7 @@ H5D_ioinfo_adjust(H5D_io_info_t *io_info, const H5D_t *dset, hid_t dxpl_id,
H5D_mpio_actual_io_mode_t actual_io_mode; /* performed io mode */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_ioinfo_adjust)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(dset);
@@ -1042,7 +1042,7 @@ H5D_ioinfo_term(H5D_io_info_t *io_info)
{
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_ioinfo_term)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check if we used the MPI VFD for the I/O */
if(io_info->using_mpi_vfd) {
@@ -1095,7 +1095,7 @@ done:
static herr_t
H5D_typeinfo_term(const H5D_type_info_t *type_info)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_typeinfo_term)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check for releasing datatype conversion & background buffers */
if(type_info->tconv_buf_allocated) {
diff --git a/src/H5Dlayout.c b/src/H5Dlayout.c
index 6aa5b44..fa25305 100644
--- a/src/H5Dlayout.c
+++ b/src/H5Dlayout.c
@@ -78,7 +78,7 @@ H5D_layout_set_io_ops(const H5D_t *dataset)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_layout_set_io_ops, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(dataset);
@@ -135,7 +135,7 @@ H5D_layout_meta_size(const H5F_t *f, const H5O_layout_t *layout, hbool_t include
{
size_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5D_layout_meta_size)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -202,7 +202,7 @@ H5D_layout_oh_create(H5F_t *file, hid_t dxpl_id, H5O_t *oh, H5D_t *dset,
hbool_t layout_init = FALSE; /* Flag to indicate that chunk information was initialized */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_layout_oh_create)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checking */
HDassert(file);
@@ -325,7 +325,7 @@ H5D_layout_oh_read(H5D_t *dataset, hid_t dxpl_id, hid_t dapl_id, H5P_genplist_t
htri_t msg_exists; /* Whether a particular type of message exists */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_layout_oh_read)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checking */
HDassert(dataset);
@@ -456,7 +456,7 @@ H5D_layout_oh_write(H5D_t *dataset, hid_t dxpl_id, H5O_t *oh, unsigned update_fl
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_layout_oh_write)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checking */
HDassert(dataset);
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c
index 8c78af2..e657f8f 100644
--- a/src/H5Dmpio.c
+++ b/src/H5Dmpio.c
@@ -164,7 +164,7 @@ H5D_mpio_opt_possible(const H5D_io_info_t *io_info, const H5S_t *file_space,
int mpi_code; /* MPI error code */
htri_t ret_value = TRUE;
- FUNC_ENTER_NOAPI(H5D_mpio_opt_possible, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(io_info);
@@ -264,7 +264,7 @@ H5D_mpio_select_read(const H5D_io_info_t *io_info, const H5D_type_info_t UNUSED
const H5D_contig_storage_t *store_contig = &(io_info->store->contig); /* Contiguous storage info for this I/O operation */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5D_mpio_select_read, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
H5_CHECK_OVERFLOW(mpi_buf_count, hsize_t, size_t);
if(H5F_block_read(io_info->dset->oloc.file, H5FD_MEM_DRAW, store_contig->dset_addr, (size_t)mpi_buf_count, io_info->dxpl_id, io_info->u.rbuf) < 0)
@@ -293,7 +293,7 @@ H5D_mpio_select_write(const H5D_io_info_t *io_info, const H5D_type_info_t UNUSED
const H5D_contig_storage_t *store_contig = &(io_info->store->contig); /* Contiguous storage info for this I/O operation */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5D_mpio_select_write, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*OKAY: CAST DISCARDS CONST QUALIFIER*/
H5_CHECK_OVERFLOW(mpi_buf_count, hsize_t, size_t);
@@ -323,7 +323,7 @@ H5D_ioinfo_xfer_mode(H5D_io_info_t *io_info, H5P_genplist_t *dx_plist,
{
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_ioinfo_xfer_mode)
+ FUNC_ENTER_NOAPI_NOINIT
/* Change the xfer_mode */
io_info->dxpl_cache->xfer_mode = xfer_mode;
@@ -368,7 +368,7 @@ H5D_ioinfo_coll_opt_mode(H5D_io_info_t *io_info, H5P_genplist_t *dx_plist,
{
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_ioinfo_coll_opt_mode)
+ FUNC_ENTER_NOAPI_NOINIT
/* Change the optimal xfer_mode */
io_info->dxpl_cache->coll_opt_mode = coll_opt_mode;
@@ -401,7 +401,7 @@ H5D_mpio_get_min_chunk(const H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
int mpi_code; /* MPI return code */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5D_mpio_get_min_chunk)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get the number of chunks to perform I/O on */
num_chunkf = H5SL_count(fm->sel_chunks);
@@ -437,7 +437,7 @@ H5D_mpio_get_sum_chunk(const H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
int mpi_code; /* MPI return code */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5D_mpio_get_sum_chunk)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get the number of chunks to perform I/O on */
num_chunkf = 0;
@@ -475,7 +475,7 @@ H5D_contig_collective_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_i
H5P_genplist_t *dx_plist; /* Pointer to DXPL */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_contig_collective_read, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(IS_H5FD_MPIO(io_info->dset->oloc.file));
@@ -522,7 +522,7 @@ H5D_contig_collective_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_
H5P_genplist_t *dx_plist; /* Pointer to DXPL */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_contig_collective_write, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(IS_H5FD_MPIO(io_info->dset->oloc.file));
@@ -592,7 +592,7 @@ H5D_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info
#endif
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5D_chunk_collective_io)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(io_info);
@@ -733,7 +733,7 @@ H5D_chunk_collective_read(H5D_io_info_t *io_info, const H5D_type_info_t *type_in
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_chunk_collective_read, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Call generic selection operation */
if(H5D_chunk_collective_io(io_info, type_info, fm) < 0)
@@ -764,7 +764,7 @@ H5D_chunk_collective_write(H5D_io_info_t *io_info, const H5D_type_info_t *type_i
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_chunk_collective_write, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Call generic selection operation */
if(H5D_chunk_collective_io(io_info, type_info, fm) < 0)
@@ -815,7 +815,7 @@ H5D_link_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type
int mpi_code; /* MPI return code */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5D_link_chunk_collective_io)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get the sum # of chunks, if not already available */
if(sum_chunk < 0) {
@@ -1088,7 +1088,7 @@ H5D_multi_chunk_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *typ
H5D_mpio_actual_io_mode_t actual_io_mode = H5D_MPIO_NO_COLLECTIVE; /* Local variable for tracking the I/O mode used. */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5D_multi_chunk_collective_io)
+ FUNC_ENTER_NOAPI_NOINIT
#ifdef H5Dmpio_DEBUG
mpi_rank = H5F_mpi_get_rank(io_info->dset->oloc.file);
@@ -1295,7 +1295,7 @@ H5D_multi_chunk_collective_io_no_opt(H5D_io_info_t *io_info,
H5D_mpio_actual_io_mode_t actual_io_mode = H5D_MPIO_NO_COLLECTIVE; /*Local variable for tracking the I/O modes used. */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5D_multi_chunk_collective_io_no_opt)
+ FUNC_ENTER_NOAPI_NOINIT
#ifdef H5D_DEBUG
if(H5DEBUG(D)) {
@@ -1482,7 +1482,7 @@ H5D_inter_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info
int mpi_code; /* MPI return code */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_inter_collective_io)
+ FUNC_ENTER_NOAPI_NOINIT
if((file_space != NULL) && (mem_space != NULL)) {
int mpi_file_count; /* Number of file "objects" to transfer */
@@ -1546,7 +1546,7 @@ H5D_final_collective_io(H5D_io_info_t *io_info, const H5D_type_info_t *type_info
hbool_t plist_is_setup = FALSE; /* Whether the dxpl has been customized */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5D_final_collective_io)
+ FUNC_ENTER_NOAPI_NOINIT
/* Pass buf type, file type to the file driver. */
if(H5FD_mpi_setup_collective(io_info->dxpl_id, *mpi_buf_type, *mpi_file_type) < 0)
@@ -1617,7 +1617,7 @@ H5D_sort_chunk(H5D_io_info_t *io_info, const H5D_chunk_map_t *fm,
int i; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_sort_chunk)
+ FUNC_ENTER_NOAPI_NOINIT
/* Retrieve # of MPI processes */
if((mpi_size = H5F_mpi_get_size(io_info->dset->oloc.file)) < 0)
@@ -1780,7 +1780,7 @@ H5D_obtain_mpio_mode(H5D_io_info_t* io_info, H5D_chunk_map_t *fm,
#endif
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5D_obtain_mpio_mode)
+ FUNC_ENTER_NOAPI_NOINIT
/* Assign the rank 0 to the root */
root = 0;
@@ -1923,7 +1923,7 @@ H5D_cmp_chunk_addr(const void *chunk_addr_info1, const void *chunk_addr_info2)
{
haddr_t addr1, addr2;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_cmp_chunk_addr)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
addr1 = ((const H5D_chunk_addr_info_t *)chunk_addr_info1)->chunk_addr;
addr2 = ((const H5D_chunk_addr_info_t *)chunk_addr_info2)->chunk_addr;
diff --git a/src/H5Doh.c b/src/H5Doh.c
index 6a8a5cd..6496729 100644
--- a/src/H5Doh.c
+++ b/src/H5Doh.c
@@ -108,7 +108,7 @@ H5O_dset_get_copy_file_udata(void)
{
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_dset_get_copy_file_udata)
+ FUNC_ENTER_NOAPI_NOINIT
/* Allocate space for the 'copy file' user data for copying datasets */
if(NULL == (ret_value = H5FL_CALLOC(H5D_copy_file_ud_t)))
@@ -141,7 +141,7 @@ H5O_dset_free_copy_file_udata(void *_udata)
{
H5D_copy_file_ud_t *udata = (H5D_copy_file_ud_t *)_udata;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_dset_free_copy_file_udata)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(udata);
@@ -182,13 +182,13 @@ H5O_dset_free_copy_file_udata(void *_udata)
*
*-------------------------------------------------------------------------
*/
-htri_t
+static htri_t
H5O_dset_isa(H5O_t *oh)
{
htri_t exists; /* Flag if header message of interest exists */
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI(H5O_dset_isa, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(oh);
@@ -230,7 +230,7 @@ H5O_dset_open(const H5G_loc_t *obj_loc, hid_t lapl_id, hid_t dxpl_id, hbool_t ap
hid_t dapl_id; /* dapl to use to open this dataset */
hid_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_dset_open)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(obj_loc);
@@ -283,7 +283,7 @@ H5O_dset_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id)
H5D_t *dset = NULL; /* New dataset created */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_dset_create)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(f);
@@ -331,7 +331,7 @@ H5O_dset_get_oloc(hid_t obj_id)
H5D_t *dset; /* Dataset opened */
H5O_loc_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_dset_get_oloc)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get the dataset */
if(NULL == (dset = (H5D_t *)H5I_object(obj_id)))
@@ -376,7 +376,7 @@ H5O_dset_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info)
htri_t exists; /* Flag if header message of interest exists */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_dset_bh_info)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
diff --git a/src/H5Dpkg.h b/src/H5Dpkg.h
index 84e05cf..16de07f 100644
--- a/src/H5Dpkg.h
+++ b/src/H5Dpkg.h
@@ -529,7 +529,7 @@ H5_DLLVAR const H5D_chunk_ops_t H5D_COPS_BTREE[1];
H5_DLL H5D_t *H5D_create(H5F_t *file, hid_t type_id, const H5S_t *space,
hid_t dcpl_id, hid_t dapl_id, hid_t dxpl_id);
-H5_DLL H5D_t *H5D_create_named(const H5G_loc_t *loc, const char *name,
+H5_DLL H5D_t *H5D__create_named(const H5G_loc_t *loc, const char *name,
hid_t type_id, const H5S_t *space, hid_t lcpl_id, hid_t dcpl_id,
hid_t dapl_id, hid_t dxpl_id);
H5_DLL herr_t H5D_get_space_status(H5D_t *dset, H5D_space_status_t *allocation,
diff --git a/src/H5Dscatgath.c b/src/H5Dscatgath.c
index ed73f3c..7758619 100644
--- a/src/H5Dscatgath.c
+++ b/src/H5Dscatgath.c
@@ -108,7 +108,7 @@ H5D_scatter_file(const H5D_io_info_t *_io_info,
size_t nelem; /* Number of elements used in sequences */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_scatter_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(_io_info);
@@ -207,7 +207,7 @@ H5D_gather_file(const H5D_io_info_t *_io_info,
size_t nelem; /* Number of elements used in sequences */
size_t ret_value = nelmts; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_gather_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(_io_info);
@@ -301,7 +301,7 @@ H5D_scatter_mem (const void *_tscat_buf, const H5S_t *space,
size_t nelem; /* Number of elements used in sequences */
herr_t ret_value = SUCCEED; /* Number of elements scattered */
- FUNC_ENTER_NOAPI(H5D_scatter_mem, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(tscat_buf);
@@ -388,7 +388,7 @@ H5D_gather_mem(const void *_buf, const H5S_t *space,
size_t nelem; /* Number of elements used in sequences */
size_t ret_value = nelmts; /* Number of elements gathered */
- FUNC_ENTER_NOAPI_NOINIT(H5D_gather_mem)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(buf);
@@ -469,7 +469,7 @@ H5D_scatgath_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info
size_t smine_nelmts; /*elements per strip */
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_scatgath_read)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(io_info);
@@ -601,7 +601,7 @@ H5D_scatgath_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_inf
size_t smine_nelmts; /*elements per strip */
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_scatgath_write)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(io_info);
@@ -750,7 +750,7 @@ H5D_compound_opt_read(size_t nelmts, const H5S_t *space,
size_t src_stride, dst_stride, copy_size;
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOAPI_NOINIT(H5D_compound_opt_read)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(nelmts > 0);
@@ -875,7 +875,7 @@ H5D_compound_opt_write(size_t nelmts, const H5D_type_info_t *type_info)
size_t src_stride, dst_stride; /* Strides through source & destination datatypes */
size_t i; /* Local index variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5D_compound_opt_write)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(nelmts > 0);
diff --git a/src/H5Dselect.c b/src/H5Dselect.c
index 6dade5c..d75b7ed 100644
--- a/src/H5Dselect.c
+++ b/src/H5Dselect.c
@@ -102,7 +102,7 @@ H5D_select_io(const H5D_io_info_t *io_info, size_t elmt_size,
ssize_t tmp_file_len; /* Temporary number of bytes in file sequence */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_select_io, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(io_info);
@@ -266,7 +266,7 @@ H5D_select_read(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_select_read, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Call generic selection operation */
H5_CHECK_OVERFLOW(nelmts, hsize_t, size_t);
@@ -297,7 +297,7 @@ H5D_select_write(const H5D_io_info_t *io_info, const H5D_type_info_t *type_info,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5D_select_write, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Call generic selection operation */
H5_CHECK_OVERFLOW(nelmts, hsize_t, size_t);
diff --git a/src/H5Dtest.c b/src/H5Dtest.c
index 0a69ff7..c060db3 100644
--- a/src/H5Dtest.c
+++ b/src/H5Dtest.c
@@ -87,7 +87,7 @@ H5D_layout_version_test(hid_t did, unsigned *version)
H5D_t *dset; /* Pointer to dataset to query */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOAPI(H5D_layout_version_test, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
if(NULL == (dset = (H5D_t *)H5I_object_verify(did, H5I_DATASET)))
@@ -126,7 +126,7 @@ H5D_layout_contig_size_test(hid_t did, hsize_t *size)
H5D_t *dset; /* Pointer to dataset to query */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOAPI(H5D_layout_contig_size_test, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
if(NULL == (dset = (H5D_t *)H5I_object_verify(did, H5I_DATASET)))
@@ -167,7 +167,7 @@ H5D_current_cache_size_test(hid_t did, size_t *nbytes_used, int *nused)
H5D_t *dset; /* Pointer to dataset to query */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOAPI(H5D_current_cache_size_test, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
if(NULL == (dset = (H5D_t *)H5I_object_verify(did, H5I_DATASET)))
diff --git a/src/H5E.c b/src/H5E.c
index 35a8bab..4c4433e 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -144,7 +144,7 @@ H5E_init(void)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5E_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
@@ -168,7 +168,7 @@ done:
static herr_t
H5E_set_default_auto(H5E_t *stk)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_set_default_auto)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifndef H5_NO_DEPRECATED_SYMBOLS
#ifdef H5_USE_16_API_DEFAULT
@@ -210,7 +210,7 @@ H5E_init_interface(void)
char lib_vers[128]; /* Buffer to constructu library version within */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5E_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT
/* Initialize the atom group for the error class IDs */
if(H5I_register_type(H5I_ERROR_CLASS, (size_t)H5I_ERRCLS_HASHSIZE, H5E_RESERVED_ATOMS,
@@ -268,7 +268,7 @@ H5E_term_interface(void)
{
int n = 0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(H5_interface_initialize_g) {
int ncls, nmsg, nstk;
@@ -341,7 +341,7 @@ H5E_get_stack(void)
{
H5E_t *estack;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_get_stack)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
estack = (H5E_t *)H5TS_get_thread_local_value(H5TS_errstk_key_g);
@@ -382,7 +382,7 @@ H5E_get_stack(void)
static herr_t
H5E_free_class(H5E_cls_t *cls)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_free_class)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(cls);
@@ -415,7 +415,7 @@ H5Eregister_class(const char *cls_name, const char *lib_name, const char *versio
H5E_cls_t *cls; /* Pointer to error class */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Eregister_class, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("i", "*s*s*s", cls_name, lib_name, version);
/* Check arguments */
@@ -453,7 +453,7 @@ H5E_register_class(const char *cls_name, const char *lib_name, const char *versi
H5E_cls_t *cls = NULL; /* Pointer to error class */
H5E_cls_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5E_register_class)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(cls_name);
@@ -501,7 +501,7 @@ H5Eunregister_class(hid_t class_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Eunregister_class, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", class_id);
/* Check arguments */
@@ -537,7 +537,7 @@ H5E_unregister_class(H5E_cls_t *cls)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5E_unregister_class)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(cls);
@@ -574,7 +574,7 @@ H5Eget_class_name(hid_t class_id, char *name, size_t size)
H5E_cls_t *cls; /* Pointer to error class */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Eget_class_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("Zs", "i*sz", class_id, name, size);
/* Get the error class */
@@ -608,7 +608,7 @@ H5E_get_class_name(const H5E_cls_t *cls, char *name, size_t size)
{
ssize_t len; /* Length of error class's name */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_get_class_name)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(cls);
@@ -648,7 +648,7 @@ H5E_close_msg_cb(void *obj_ptr, hid_t obj_id, void *key)
H5E_cls_t *cls = (H5E_cls_t*)key;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5E_close_msg_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(err_msg);
@@ -683,7 +683,7 @@ H5Eclose_msg(hid_t err_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Eclose_msg, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", err_id);
/* Check arguments */
@@ -714,7 +714,7 @@ done:
static herr_t
H5E_close_msg(H5E_msg_t *err)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_close_msg)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(err);
@@ -747,7 +747,7 @@ H5Ecreate_msg(hid_t class_id, H5E_type_t msg_type, const char *msg_str)
H5E_msg_t *msg; /* Pointer to new error message */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Ecreate_msg, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("i", "iEt*s", class_id, msg_type, msg_str);
/* Check arguments */
@@ -790,7 +790,7 @@ H5E_create_msg(H5E_cls_t *cls, H5E_type_t msg_type, const char *msg_str)
H5E_msg_t *msg = NULL; /* Pointer to new error message */
H5E_msg_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5E_create_msg)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(cls);
@@ -838,7 +838,7 @@ H5Eget_msg(hid_t msg_id, H5E_type_t *type, char *msg_str, size_t size)
H5E_msg_t *msg; /* Pointer to error message */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Eget_msg, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("Zs", "i*Et*sz", msg_id, type, msg_str, size);
/* Get the message object */
@@ -872,7 +872,7 @@ H5Ecreate_stack(void)
H5E_t *stk; /* Error stack */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Ecreate_stack, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE0("i","");
/* Allocate a new error stack */
@@ -911,7 +911,7 @@ H5Eget_current_stack(void)
hid_t ret_value; /* Return value */
/* Don't clear the error stack! :-) */
- FUNC_ENTER_API_NOCLEAR(H5Eget_current_stack, FAIL)
+ FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE0("i","");
/* Get the current stack */
@@ -947,7 +947,7 @@ H5E_get_current_stack(void)
unsigned u; /* Local index variable */
H5E_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5E_get_current_stack)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get a pointer to the current error stack */
if(NULL == (current_stack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
@@ -1028,7 +1028,7 @@ H5Eset_current_stack(hid_t err_stack)
H5E_t *estack;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Eset_current_stack, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", err_stack);
if(err_stack != H5E_DEFAULT) {
@@ -1071,7 +1071,7 @@ H5E_set_current_stack(H5E_t *estack)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5E_set_current_stack)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(estack);
@@ -1133,7 +1133,7 @@ H5Eclose_stack(hid_t stack_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Eclose_stack, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", stack_id);
if(H5E_DEFAULT != stack_id) {
@@ -1169,7 +1169,7 @@ done:
static herr_t
H5E_close_stack(H5E_t *estack)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_close_stack)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(estack);
@@ -1203,7 +1203,7 @@ H5Eget_num(hid_t error_stack_id)
ssize_t ret_value; /* Return value */
/* Don't clear the error stack! :-) */
- FUNC_ENTER_API_NOCLEAR(H5Eget_num, FAIL)
+ FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE1("Zs", "i", error_stack_id);
/* Need to check for errors */
@@ -1244,7 +1244,7 @@ done:
static ssize_t
H5E_get_num(const H5E_t *estack)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_get_num)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(estack);
@@ -1271,7 +1271,7 @@ H5Epop(hid_t err_stack, size_t count)
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
- FUNC_ENTER_API_NOCLEAR(H5Epop, FAIL)
+ FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE2("e", "iz", err_stack, count);
/* Need to check for errors */
@@ -1337,7 +1337,7 @@ H5Epush2(hid_t err_stack, const char *file, const char *func, unsigned line,
herr_t ret_value=SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
- FUNC_ENTER_API_NOCLEAR(H5Epush2, FAIL)
+ FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE8("e", "i*s*sIuiii*s", err_stack, file, func, line, cls_id, maj_id,
min_id, fmt);
@@ -1429,7 +1429,7 @@ H5Eclear2(hid_t err_stack)
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
- FUNC_ENTER_API_NOCLEAR(H5Eclear2, FAIL)
+ FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE1("e", "i", err_stack);
/* Need to check for errors */
@@ -1474,7 +1474,7 @@ H5Eprint2(hid_t err_stack, FILE *stream)
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
- FUNC_ENTER_API_NOCLEAR(H5Eprint2, FAIL)
+ FUNC_ENTER_API_NOCLEAR(FAIL)
/*NO TRACE*/
/* Need to check for errors */
@@ -1520,7 +1520,7 @@ H5Ewalk2(hid_t err_stack, H5E_direction_t direction, H5E_walk2_t stack_func, voi
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
- FUNC_ENTER_API_NOCLEAR(H5Ewalk2, FAIL)
+ FUNC_ENTER_API_NOCLEAR(FAIL)
/*NO TRACE*/
/* Need to check for errors */
@@ -1574,7 +1574,7 @@ H5Eget_auto2(hid_t estack_id, H5E_auto2_t *func, void **client_data)
H5E_auto_op_t op; /* Error stack function */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Eget_auto2, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*x**x", estack_id, func, client_data);
if(estack_id == H5E_DEFAULT) {
@@ -1636,7 +1636,7 @@ H5Eset_auto2(hid_t estack_id, H5E_auto2_t func, void *client_data)
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
- FUNC_ENTER_API_NOCLEAR(H5Eset_auto2, FAIL)
+ FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE3("e", "ix*x", estack_id, func, client_data);
if(estack_id == H5E_DEFAULT) {
@@ -1693,7 +1693,7 @@ H5Eauto_is_v2(hid_t estack_id, unsigned *is_stack)
H5E_t *estack; /* Error stack to operate on */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Eauto_is_v2, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*Iu", estack_id, is_stack);
if(estack_id == H5E_DEFAULT) {
diff --git a/src/H5Edeprec.c b/src/H5Edeprec.c
index 0a028d9..0d3083b 100644
--- a/src/H5Edeprec.c
+++ b/src/H5Edeprec.c
@@ -99,7 +99,7 @@ DESCRIPTION
static herr_t
H5E_init_deprec_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_init_deprec_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5E_init())
} /* H5E_init_deprec_interface() */
@@ -127,7 +127,7 @@ H5Eget_major(H5E_major_t maj)
char *msg_str = NULL;
char *ret_value; /* Return value */
- FUNC_ENTER_API_NOCLEAR(H5Eget_major, NULL)
+ FUNC_ENTER_API_NOCLEAR(NULL)
/* Get the message object */
if(NULL == (msg = (H5E_msg_t *)H5I_object_verify(maj, H5I_ERROR_MSG)))
@@ -179,7 +179,7 @@ H5Eget_minor(H5E_minor_t min)
char *msg_str = NULL;
char *ret_value; /* Return value */
- FUNC_ENTER_API_NOCLEAR(H5Eget_minor, NULL)
+ FUNC_ENTER_API_NOCLEAR(NULL)
/* Get the message object */
if(NULL == (msg = (H5E_msg_t *)H5I_object_verify(min, H5I_ERROR_MSG)))
@@ -236,7 +236,7 @@ H5Epush1(const char *file, const char *func, unsigned line,
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
- FUNC_ENTER_API_NOCLEAR(H5Epush1, FAIL)
+ FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE6("e", "*s*sIuii*s", file, func, line, maj, min, str);
/* Push the error on the default error stack */
@@ -267,7 +267,7 @@ H5Eclear1(void)
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
- FUNC_ENTER_API_NOCLEAR(H5Eclear1, FAIL)
+ FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE0("e","");
/* Clear the default error stack */
@@ -302,7 +302,7 @@ H5Eprint1(FILE *stream)
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
- FUNC_ENTER_API_NOCLEAR(H5Eprint1, FAIL)
+ FUNC_ENTER_API_NOCLEAR(FAIL)
/*NO TRACE*/
if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
@@ -339,7 +339,7 @@ H5Ewalk1(H5E_direction_t direction, H5E_walk1_t func, void *client_data)
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
- FUNC_ENTER_API_NOCLEAR(H5Ewalk1, FAIL)
+ FUNC_ENTER_API_NOCLEAR(FAIL)
/*NO TRACE*/
if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
@@ -384,7 +384,7 @@ H5Eget_auto1(H5E_auto1_t *func, void **client_data)
H5E_auto_op_t auto_op; /* Error stack operator */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Eget_auto1, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "*x**x", func, client_data);
/* Retrieve default error stack */
@@ -441,7 +441,7 @@ H5Eset_auto1(H5E_auto1_t func, void *client_data)
herr_t ret_value = SUCCEED; /* Return value */
/* Don't clear the error stack! :-) */
- FUNC_ENTER_API_NOCLEAR(H5Eset_auto1, FAIL)
+ FUNC_ENTER_API_NOCLEAR(FAIL)
H5TRACE2("e", "x*x", func, client_data);
if(NULL == (estack = H5E_get_my_stack())) /*lint !e506 !e774 Make lint 'constant value Boolean' in non-threaded case */
diff --git a/src/H5Eint.c b/src/H5Eint.c
index 1fc8a56..e324ff5 100644
--- a/src/H5Eint.c
+++ b/src/H5Eint.c
@@ -132,7 +132,7 @@ DESCRIPTION
static herr_t
H5E_init_int_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_init_int_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5E_init())
} /* H5E_init_int_interface() */
@@ -156,7 +156,7 @@ H5E_get_msg(const H5E_msg_t *msg, H5E_type_t *type, char *msg_str, size_t size)
{
ssize_t len; /* Length of error message */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_get_msg)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(msg);
@@ -227,7 +227,7 @@ H5E_walk1_cb(int n, H5E_error1_t *err_desc, void *client_data)
unsigned have_desc = 1; /* Flag to indicate whether the error has a "real" description */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_walk1_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(err_desc);
@@ -349,7 +349,7 @@ H5E_walk2_cb(unsigned n, const H5E_error2_t *err_desc, void *client_data)
unsigned have_desc = 1; /* Flag to indicate whether the error has a "real" description */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_walk2_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(err_desc);
@@ -450,8 +450,7 @@ H5E_print(const H5E_t *estack, FILE *stream, hbool_t bk_compatible)
H5E_walk_op_t walk_op; /* Error stack walking callback */
herr_t ret_value = SUCCEED;
- /* Don't clear the error stack! :-) */
- FUNC_ENTER_NOAPI_NOINIT(H5E_print)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(estack);
@@ -526,7 +525,7 @@ H5E_walk(const H5E_t *estack, H5E_direction_t direction, const H5E_walk_op_t *op
herr_t status; /* Status from callback function */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5E_walk)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(estack);
@@ -620,7 +619,7 @@ done:
herr_t
H5E_get_auto(const H5E_t *estack, H5E_auto_op_t *op, void **client_data)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_get_auto)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(estack);
@@ -660,7 +659,7 @@ H5E_get_auto(const H5E_t *estack, H5E_auto_op_t *op, void **client_data)
herr_t
H5E_set_auto(H5E_t *estack, const H5E_auto_op_t *op, void *client_data)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_set_auto)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(estack);
@@ -704,7 +703,7 @@ H5E_printf_stack(H5E_t *estack, const char *file, const char *func, unsigned lin
* HERROR(). HERROR() is called by HRETURN_ERROR() which could
* be called by FUNC_ENTER().
*/
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_printf_stack)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(cls_id > 0);
@@ -808,7 +807,7 @@ H5E_push_stack(H5E_t *estack, const char *file, const char *func, unsigned line,
* HERROR(). HERROR() is called by HRETURN_ERROR() which could
* be called by FUNC_ENTER().
*/
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5E_push_stack)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(cls_id > 0);
@@ -882,7 +881,7 @@ H5E_clear_entries(H5E_t *estack, size_t nentries)
unsigned u; /* Local index variable */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5E_clear_entries)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(estack);
@@ -936,7 +935,7 @@ H5E_clear_stack(H5E_t *estack)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5E_clear_stack, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check for 'default' error stack */
if(estack == NULL)
@@ -972,7 +971,7 @@ H5E_pop(H5E_t *estack, size_t count)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5E_pop)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(estack);
@@ -1006,7 +1005,7 @@ H5E_dump_api_stack(int is_api)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5E_dump_api_stack, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Only dump the error stack during an API call */
if(is_api) {
diff --git a/src/H5F.c b/src/H5F.c
index 7ae54cd..a74570a 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -99,7 +99,7 @@ H5F_init(void)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
@@ -125,7 +125,7 @@ H5F_init_interface(void)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Initialize the atom group for the file IDs.
@@ -161,7 +161,7 @@ H5F_term_interface(void)
{
int n = 0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(H5_interface_initialize_g) {
if((n = H5I_nmembers(H5I_FILE)) != 0) {
@@ -202,7 +202,7 @@ H5Fget_create_plist(hid_t file_id)
H5P_genplist_t *plist; /* Property list */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Fget_create_plist, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", file_id);
/* check args */
@@ -247,7 +247,7 @@ H5Fget_access_plist(hid_t file_id)
H5F_t *f; /* File info */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Fget_access_plist, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", file_id);
/* Check args */
@@ -295,7 +295,7 @@ H5F_get_access_plist(H5F_t *f, hbool_t app_ref)
unsigned efc_size = 0;
hid_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5F_get_access_plist, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
@@ -390,7 +390,7 @@ H5Fget_obj_count(hid_t file_id, unsigned types)
H5F_t *f = NULL; /* File to query */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Fget_obj_count, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("Zs", "iIu", file_id, types);
if(file_id != (hid_t)H5F_OBJ_ALL && (NULL == (f = (H5F_t *)H5I_object_verify(file_id, H5I_FILE))))
@@ -430,7 +430,7 @@ H5F_get_obj_count(const H5F_t *f, unsigned types, hbool_t app_ref)
{
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_obj_count)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* H5F_get_objects doesn't fail */
ret_value = H5F_get_objects(f, types, 0, NULL, app_ref);
@@ -463,7 +463,7 @@ H5Fget_obj_ids(hid_t file_id, unsigned types, size_t max_objs, hid_t *oid_list)
H5F_t *f = NULL; /* File to query */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Fget_obj_ids, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("Zs", "iIuz*i", file_id, types, max_objs, oid_list);
if(file_id != (hid_t)H5F_OBJ_ALL && (NULL == (f = (H5F_t *)H5I_object_verify(file_id, H5I_FILE))))
@@ -503,7 +503,7 @@ H5F_get_obj_ids(const H5F_t *f, unsigned types, size_t max_objs, hid_t *oid_list
{
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_obj_ids)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* H5F_get_objects doesn't fail */
ret_value = H5F_get_objects(f, types, max_objs, oid_list, app_ref);
@@ -532,7 +532,7 @@ H5F_get_objects(const H5F_t *f, unsigned types, size_t max_index, hid_t *obj_id_
H5F_olist_t olist; /* Structure to hold search results */
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_objects)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set up search information */
olist.obj_id_list = (max_index==0 ? NULL : obj_id_list);
@@ -616,7 +616,7 @@ H5F_get_objects_cb(void *obj_ptr, hid_t obj_id, void *key)
H5F_olist_t *olist = (H5F_olist_t *)key; /* Alias for search info */
int ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_get_objects_cb)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(obj_ptr);
HDassert(olist);
@@ -736,7 +736,7 @@ H5Fget_vfd_handle(hid_t file_id, hid_t fapl, void **file_handle)
H5F_t *file; /* File to query */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Fget_vfd_handle, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ii**x", file_id, fapl, file_handle);
/* Check args */
@@ -782,7 +782,7 @@ H5Fis_hdf5(const char *name)
H5FD_t *file = NULL; /* Low-level file struct */
htri_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Fis_hdf5, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("t", "*s", name);
/* Check args and all the boring stuff. */
@@ -833,7 +833,7 @@ H5F_new(H5F_file_t *shared, hid_t fcpl_id, hid_t fapl_id, H5FD_t *lf)
{
H5F_t *f = NULL, *ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5F_new)
+ FUNC_ENTER_NOAPI_NOINIT
if(NULL == (f = H5FL_CALLOC(H5F_t)))
HGOTO_ERROR(H5E_FILE, H5E_NOSPACE, NULL, "can't allocate top file structure")
@@ -990,7 +990,7 @@ H5F_dest(H5F_t *f, hid_t dxpl_id, hbool_t flush)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -1174,7 +1174,7 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id,
H5F_close_degree_t fc_degree; /*file close degree */
H5F_t *ret_value; /*actual return value */
- FUNC_ENTER_NOAPI(H5F_open, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/*
* If the driver has a `cmp' method then the driver is capable of
@@ -1395,7 +1395,7 @@ H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id)
H5F_t *new_file = NULL; /*file struct for new file */
hid_t ret_value; /*return value */
- FUNC_ENTER_API(H5Fcreate, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("i", "*sIuii", filename, flags, fcpl_id, fapl_id);
/* Check/fix arguments */
@@ -1501,7 +1501,7 @@ H5Fopen(const char *filename, unsigned flags, hid_t fapl_id)
H5F_t *new_file = NULL; /*file struct for new file */
hid_t ret_value; /*return value */
- FUNC_ENTER_API(H5Fopen, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("i", "*sIui", filename, flags, fapl_id);
/* Check/fix arguments. */
@@ -1557,7 +1557,7 @@ H5Fflush(hid_t object_id, H5F_scope_t scope)
H5O_loc_t *oloc = NULL; /* Object location for ID */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Fflush, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iFs", object_id, scope);
switch(H5I_get_type(object_id)) {
@@ -1674,7 +1674,7 @@ H5F_flush(H5F_t *f, hid_t dxpl_id, hbool_t closing)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_flush, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check arguments */
HDassert(f);
@@ -1743,7 +1743,7 @@ H5F_close(H5F_t *f)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_close)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -1803,7 +1803,7 @@ H5F_try_close(H5F_t *f)
unsigned nopen_objs = 0; /* Number of open objects in file/mount hierarchy */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_try_close)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -1962,7 +1962,7 @@ H5Fclose(hid_t file_id)
int nref;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_API(H5Fclose, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", file_id);
/* Check/fix arguments. */
@@ -2024,7 +2024,7 @@ H5Freopen(hid_t file_id)
H5F_t *new_file = NULL;
hid_t ret_value;
- FUNC_ENTER_API(H5Freopen, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", file_id);
/* Check arguments */
@@ -2075,7 +2075,7 @@ H5Fget_intent(hid_t file_id, unsigned *intent_flags)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_API(H5Fget_intent, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*Iu", file_id, intent_flags);
/* If no intent flags were passed in, exit quietly */
@@ -2119,7 +2119,7 @@ H5F_get_id(H5F_t *file, hbool_t app_ref)
{
hid_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5F_get_id)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(file);
@@ -2158,8 +2158,8 @@ done:
unsigned
H5F_incr_nopen_objs(H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_incr_nopen_objs)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@@ -2185,8 +2185,8 @@ H5F_incr_nopen_objs(H5F_t *f)
unsigned
H5F_decr_nopen_objs(H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_decr_nopen_objs)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@@ -2216,7 +2216,7 @@ H5F_build_actual_name(const H5F_t *f, const H5P_genplist_t *fapl, const char *na
hid_t new_fapl_id = -1; /* ID for duplicated FAPL */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_build_actual_name)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -2326,8 +2326,8 @@ H5F_addr_encode_len(size_t addr_len, uint8_t **pp/*in,out*/, haddr_t addr)
{
unsigned u; /* Local index variable */
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_addr_encode_len)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(addr_len);
HDassert(pp && *pp);
@@ -2365,8 +2365,8 @@ H5F_addr_encode_len(size_t addr_len, uint8_t **pp/*in,out*/, haddr_t addr)
void
H5F_addr_encode(const H5F_t *f, uint8_t **pp/*in,out*/, haddr_t addr)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_addr_encode)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@@ -2399,8 +2399,8 @@ H5F_addr_decode_len(size_t addr_len, const uint8_t **pp/*in,out*/, haddr_t *addr
hbool_t all_zero = TRUE; /* True if address was all zeroes */
unsigned u; /* Local index variable */
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_addr_decode_len)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(addr_len);
HDassert(pp && *pp);
@@ -2464,8 +2464,8 @@ H5F_addr_decode_len(size_t addr_len, const uint8_t **pp/*in,out*/, haddr_t *addr
void
H5F_addr_decode(const H5F_t *f, const uint8_t **pp/*in,out*/, haddr_t *addr_p/*out*/)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_addr_decode)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@@ -2496,7 +2496,7 @@ H5Fget_freespace(hid_t file_id)
hsize_t tot_space; /* Amount of free space in the file */
hssize_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Fget_freespace, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Hs", "i", file_id);
/* Check args */
@@ -2539,7 +2539,7 @@ H5Fget_filesize(hid_t file_id, hsize_t *size)
haddr_t eof; /* End of file address */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Fget_filesize, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*h", file_id, size);
/* Check args */
@@ -2581,7 +2581,7 @@ H5Fget_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr)
H5F_t *file; /* File object for file ID */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Fget_mdc_config, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*x", file_id, config_ptr);
/* Check args */
@@ -2620,7 +2620,7 @@ H5Fset_mdc_config(hid_t file_id, H5AC_cache_config_t *config_ptr)
H5F_t *file; /* File object for file ID */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Fset_mdc_config, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*x", file_id, config_ptr);
/* Check args */
@@ -2658,7 +2658,7 @@ H5Fget_mdc_hit_rate(hid_t file_id, double *hit_rate_ptr)
H5F_t *file; /* File object for file ID */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Fget_mdc_hit_rate, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*d", file_id, hit_rate_ptr);
/* Check args */
@@ -2702,7 +2702,7 @@ H5Fget_mdc_size(hid_t file_id, size_t *max_size_ptr, size_t *min_clean_size_ptr,
int32_t cur_num_entries;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Fget_mdc_size, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "i*z*z*z*Is", file_id, max_size_ptr, min_clean_size_ptr,
cur_size_ptr, cur_num_entries_ptr);
@@ -2749,7 +2749,7 @@ H5Freset_mdc_hit_rate_stats(hid_t file_id)
H5F_t *file; /* File object for file ID */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Freset_mdc_hit_rate_stats, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", file_id);
/* Check args */
@@ -2794,7 +2794,7 @@ H5Fget_name(hid_t obj_id, char *name/*out*/, size_t size)
size_t len;
ssize_t ret_value;
- FUNC_ENTER_API (H5Fget_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("Zs", "ixz", obj_id, name, size);
/* For file IDs, get the file object directly */
@@ -2851,7 +2851,7 @@ H5Fget_info(hid_t obj_id, H5F_info_t *finfo)
H5F_t *f; /* Top file in mount hierarchy */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Fget_info, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*x", obj_id, finfo);
/* Check args */
@@ -2913,7 +2913,7 @@ H5Fclear_elink_file_cache(hid_t file_id)
H5F_t *file; /* File */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Fclear_elink_file_cache, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", file_id);
/* Check args */
@@ -2946,8 +2946,8 @@ done:
herr_t
H5F_set_grp_btree_shared(H5F_t *f, H5RC_t *rc)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_set_grp_btree_shared)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@@ -2976,8 +2976,8 @@ H5F_set_grp_btree_shared(H5F_t *f, H5RC_t *rc)
herr_t
H5F_set_sohm_addr(H5F_t *f, haddr_t addr)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_set_sohm_addr)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@@ -3005,8 +3005,8 @@ H5F_set_sohm_addr(H5F_t *f, haddr_t addr)
herr_t
H5F_set_sohm_vers(H5F_t *f, unsigned vers)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_set_sohm_vers)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@@ -3034,8 +3034,8 @@ H5F_set_sohm_vers(H5F_t *f, unsigned vers)
herr_t
H5F_set_sohm_nindexes(H5F_t *f, unsigned nindexes)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_set_sohm_nindexes)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@@ -3063,8 +3063,8 @@ H5F_set_sohm_nindexes(H5F_t *f, unsigned nindexes)
herr_t
H5F_set_store_msg_crt_idx(H5F_t *f, hbool_t flag)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_set_store_msg_crt_idx)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
diff --git a/src/H5FD.c b/src/H5FD.c
index d0683e1..ba2bee4 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -129,7 +129,7 @@ H5FD_init(void)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
@@ -158,7 +158,7 @@ H5FD_init_interface(void)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FD_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT
if(H5I_register_type(H5I_VFL, (size_t)H5I_VFL_HASHSIZE, 0, (H5I_free_t)H5FD_free_cls)<H5I_FILE)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "unable to initialize interface")
@@ -196,7 +196,7 @@ H5FD_term_interface(void)
{
int n = 0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(H5_interface_initialize_g) {
if((n=H5I_nmembers(H5I_VFL))!=0) {
@@ -252,7 +252,7 @@ H5FD_term_interface(void)
static herr_t
H5FD_free_cls(H5FD_class_t *cls)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_free_cls)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
H5MM_xfree(cls);
@@ -290,7 +290,7 @@ H5FDregister(const H5FD_class_t *cls)
hid_t ret_value;
H5FD_mem_t type;
- FUNC_ENTER_API(H5FDregister, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "*x", cls);
/* Check arguments */
@@ -352,7 +352,7 @@ H5FD_register(const void *_cls, size_t size, hbool_t app_ref)
H5FD_mem_t type;
hid_t ret_value;
- FUNC_ENTER_NOAPI(H5FD_register, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments */
HDassert(cls);
@@ -403,7 +403,7 @@ H5FDunregister(hid_t driver_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5FDunregister, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", driver_id);
/* Check arguments */
@@ -444,7 +444,7 @@ H5FD_get_class(hid_t id)
{
H5FD_class_t *ret_value = NULL;
- FUNC_ENTER_NOAPI(H5FD_get_class, NULL)
+ FUNC_ENTER_NOAPI(NULL)
if(H5I_VFL == H5I_get_type(id))
ret_value = (H5FD_class_t *)H5I_object(id);
@@ -497,7 +497,7 @@ H5FD_sb_size(H5FD_t *file)
{
hsize_t ret_value=0;
- FUNC_ENTER_NOAPI(H5FD_sb_size, 0)
+ FUNC_ENTER_NOAPI(0)
assert(file && file->cls);
@@ -535,7 +535,7 @@ H5FD_sb_encode(H5FD_t *file, char *name/*out*/, uint8_t *buf)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_sb_encode, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
assert(file && file->cls);
if(file->cls->sb_encode &&
@@ -565,7 +565,7 @@ H5FD_sb_decode(H5FD_t *file, const char *name, const uint8_t *buf)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_sb_decode, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(file && file->cls);
if(file->cls->sb_decode && (file->cls->sb_decode)(file, name, buf) < 0)
@@ -602,7 +602,7 @@ H5FD_pl_copy(void *(*copy_func)(const void *), size_t pl_size, const void *old_p
void *new_pl = NULL; /* Copy of property list */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FD_pl_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* Copy old pl, if one exists */
if(old_pl) {
@@ -647,7 +647,7 @@ H5FD_pl_close(hid_t driver_id, herr_t (*free_func)(void *), void *pl)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FD_pl_close)
+ FUNC_ENTER_NOAPI_NOINIT
/* Allow driver to free or do it ourselves */
if(pl && free_func) {
@@ -697,7 +697,7 @@ H5FD_fapl_get(H5FD_t *file)
{
void *ret_value=NULL;
- FUNC_ENTER_NOAPI(H5FD_fapl_get, NULL)
+ FUNC_ENTER_NOAPI(NULL)
assert(file);
@@ -731,7 +731,7 @@ H5FD_fapl_open(H5P_genplist_t *plist, hid_t driver_id, const void *driver_info)
void *copied_driver_info = NULL; /* Temporary VFL driver info */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_fapl_open, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Increment the reference count on driver and copy driver info */
if(H5I_inc_ref(driver_id, FALSE) < 0)
@@ -778,7 +778,7 @@ H5FD_fapl_copy(hid_t driver_id, const void *old_fapl, void **copied_fapl)
H5FD_class_t *driver;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_fapl_copy, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
if(NULL == (driver = (H5FD_class_t *)H5I_object(driver_id)))
@@ -814,7 +814,7 @@ H5FD_fapl_close(hid_t driver_id, void *fapl)
H5FD_class_t *driver = NULL;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_fapl_close, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
if(driver_id > 0) {
@@ -853,7 +853,7 @@ H5FD_dxpl_open(H5P_genplist_t *plist, hid_t driver_id, const void *driver_info)
void *copied_driver_info = NULL; /* Temporary VFL driver info */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_dxpl_open, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Increment the reference count on the driver and copy the driver info */
if(H5I_inc_ref(driver_id, FALSE) < 0)
@@ -899,7 +899,7 @@ H5FD_dxpl_copy(hid_t driver_id, const void *old_dxpl, void **copied_dxpl)
H5FD_class_t *driver;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_dxpl_copy, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
if(NULL == (driver = (H5FD_class_t *)H5I_object(driver_id)))
@@ -935,7 +935,7 @@ H5FD_dxpl_close(hid_t driver_id, void *dxpl)
H5FD_class_t *driver;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_dxpl_close, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
if(driver_id > 0) {
@@ -1012,7 +1012,7 @@ H5FDopen(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
{
H5FD_t *ret_value=NULL;
- FUNC_ENTER_API(H5FDopen, NULL)
+ FUNC_ENTER_API(NULL)
/* Check arguments */
if(H5P_DEFAULT == fapl_id)
@@ -1059,7 +1059,7 @@ H5FD_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
H5P_genplist_t *plist; /* Property list pointer */
H5FD_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_open, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Sanity check */
if(0 == maxaddr)
@@ -1145,7 +1145,7 @@ H5FDclose(H5FD_t *file)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5FDclose, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "*x", file);
if(!file || !file->cls)
@@ -1178,7 +1178,7 @@ H5FD_close(H5FD_t *file)
const H5FD_class_t *driver;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5FD_close, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(file && file->cls);
@@ -1230,7 +1230,7 @@ H5FDcmp(const H5FD_t *f1, const H5FD_t *f2)
{
int ret_value;
- FUNC_ENTER_API(H5FDcmp, -1) /*return value is arbitrary*/
+ FUNC_ENTER_API(-1) /*return value is arbitrary*/
H5TRACE2("Is", "*x*x", f1, f2);
ret_value = H5FD_cmp(f1, f2);
@@ -1261,7 +1261,7 @@ H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2)
{
int ret_value;
- FUNC_ENTER_NOAPI(H5FD_cmp, -1) /*return value is arbitrary*/
+ FUNC_ENTER_NOAPI(-1) /*return value is arbitrary*/
if((!f1 || !f1->cls) && (!f2 || !f2->cls))
HGOTO_DONE(0)
@@ -1311,7 +1311,7 @@ H5FDquery(const H5FD_t *f, unsigned long *flags/*out*/)
{
int ret_value;
- FUNC_ENTER_API(H5FDquery, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("Is", "*xx", f, flags);
assert(f);
@@ -1345,7 +1345,7 @@ H5FD_query(const H5FD_t *f, unsigned long *flags/*out*/)
{
int ret_value=0;
- FUNC_ENTER_NOAPI(H5FD_query, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
assert(f);
assert(flags);
@@ -1405,7 +1405,7 @@ H5FDalloc(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, hsize_t size)
{
haddr_t ret_value = HADDR_UNDEF;
- FUNC_ENTER_API(H5FDalloc, HADDR_UNDEF)
+ FUNC_ENTER_API(HADDR_UNDEF)
H5TRACE4("a", "*xMtih", file, type, dxpl_id, size);
/* Check args */
@@ -1459,7 +1459,7 @@ H5FDfree(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, hsize_t siz
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5FDfree, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "*xMtiah", file, type, dxpl_id, addr, size);
/* Check args */
@@ -1502,7 +1502,7 @@ H5FDget_eoa(H5FD_t *file, H5FD_mem_t type)
{
haddr_t ret_value;
- FUNC_ENTER_API(H5FDget_eoa, HADDR_UNDEF)
+ FUNC_ENTER_API(HADDR_UNDEF)
H5TRACE2("a", "*xMt", file, type);
/* Check args */
@@ -1552,7 +1552,7 @@ H5FDset_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5FDset_eoa, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "*xMta", file, type, addr);
/* Check args */
@@ -1604,7 +1604,7 @@ H5FDget_eof(H5FD_t *file)
{
haddr_t ret_value;
- FUNC_ENTER_API(H5FDget_eof, HADDR_UNDEF)
+ FUNC_ENTER_API(HADDR_UNDEF)
H5TRACE1("a", "*x", file);
/* Check arguments */
@@ -1641,7 +1641,7 @@ H5FD_get_maxaddr(const H5FD_t *file)
{
haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_get_maxaddr, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI(HADDR_UNDEF)
HDassert(file);
@@ -1669,7 +1669,7 @@ done:
herr_t
H5FD_get_feature_flags(const H5FD_t *file, unsigned long *feature_flags)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_get_feature_flags)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(file);
HDassert(feature_flags);
@@ -1699,7 +1699,7 @@ H5FD_get_fs_type_map(const H5FD_t *file, H5FD_mem_t *type_map)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_get_fs_type_map, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(file && file->cls);
@@ -1747,7 +1747,7 @@ H5FDread(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5FDread, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "*xMtiazx", file, type, dxpl_id, addr, size, buf);
/* Check args */
@@ -1798,7 +1798,7 @@ H5FDwrite(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t siz
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5FDwrite, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "*xMtiaz*x", file, type, dxpl_id, addr, size, buf);
/* Check args */
@@ -1847,7 +1847,7 @@ H5FDflush(H5FD_t *file, hid_t dxpl_id, unsigned closing)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5FDflush, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "*xiIu", file, dxpl_id, closing);
/* Check args */
@@ -1886,7 +1886,7 @@ H5FD_flush(H5FD_t *file, hid_t dxpl_id, unsigned closing)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_flush, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(file && file->cls);
@@ -1916,7 +1916,7 @@ H5FDtruncate(H5FD_t *file, hid_t dxpl_id, unsigned closing)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5FDtruncate, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "*xiIu", file, dxpl_id, closing);
/* Check args */
@@ -1955,7 +1955,7 @@ H5FD_truncate(H5FD_t *file, hid_t dxpl_id, unsigned closing)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_truncate, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(file && file->cls);
@@ -1984,9 +1984,7 @@ done:
herr_t
H5FD_get_fileno(const H5FD_t *file, unsigned long *filenum)
{
- herr_t ret_value = SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_get_fileno, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(file);
HDassert(filenum);
@@ -1994,8 +1992,7 @@ H5FD_get_fileno(const H5FD_t *file, unsigned long *filenum)
/* Retrieve the file's serial number */
*filenum = file->fileno;
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD_get_fileno() */
@@ -2019,7 +2016,7 @@ H5FDget_vfd_handle(H5FD_t *file, hid_t fapl, void **file_handle)
{
herr_t ret_value;
- FUNC_ENTER_API(H5FDget_vfd_handle, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "*xi**x", file, fapl, file_handle);
/* Check arguments */
@@ -2050,7 +2047,7 @@ H5FD_get_vfd_handle(H5FD_t *file, hid_t fapl, void **file_handle)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5FD_get_vfd_handle, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(file);
@@ -2081,9 +2078,7 @@ done:
herr_t
H5FD_set_base_addr(H5FD_t *file, haddr_t base_addr)
{
- herr_t ret_value = SUCCEED;
-
- FUNC_ENTER_NOAPI(H5FD_set_base_addr, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(file);
HDassert(H5F_addr_defined(base_addr));
@@ -2091,8 +2086,7 @@ H5FD_set_base_addr(H5FD_t *file, haddr_t base_addr)
/* Set the file's base address */
file->base_addr = base_addr;
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD_set_base_addr() */
@@ -2112,16 +2106,11 @@ done:
haddr_t
H5FD_get_base_addr(const H5FD_t *file)
{
- haddr_t ret_value; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_get_base_addr, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(file);
/* Return the file's base address */
- ret_value = file->base_addr;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(file->base_addr)
} /* end H5FD_get_base_addr() */
diff --git a/src/H5FDcore.c b/src/H5FDcore.c
index 0b19e78..f213f42 100644
--- a/src/H5FDcore.c
+++ b/src/H5FDcore.c
@@ -179,7 +179,7 @@ DESCRIPTION
static herr_t
H5FD_core_init_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_core_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5FD_core_init())
} /* H5FD_core_init_interface() */
@@ -207,7 +207,7 @@ H5FD_core_init(void)
{
hid_t ret_value=H5FD_CORE_g; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_core_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if (H5I_VFL!=H5Iget_type(H5FD_CORE_g))
H5FD_CORE_g = H5FD_register(&H5FD_core_g,sizeof(H5FD_class_t),FALSE);
@@ -237,7 +237,7 @@ done:
void
H5FD_core_term(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_core_term)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Reset VFL ID */
H5FD_CORE_g=0;
@@ -276,7 +276,7 @@ H5Pset_fapl_core(hid_t fapl_id, size_t increment, hbool_t backing_store)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
- FUNC_ENTER_API(H5Pset_fapl_core, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "izb", fapl_id, increment, backing_store);
/* Check argument */
@@ -323,7 +323,7 @@ H5Pget_fapl_core(hid_t fapl_id, size_t *increment/*out*/,
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_fapl_core, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ixx", fapl_id, increment, backing_store);
if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
@@ -366,7 +366,7 @@ H5FD_core_fapl_get(H5FD_t *_file)
H5FD_core_fapl_t *fa;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_core_fapl_get, NULL)
+ FUNC_ENTER_NOAPI_NOINIT
if(NULL == (fa = (H5FD_core_fapl_t *)H5MM_calloc(sizeof(H5FD_core_fapl_t))))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
@@ -421,7 +421,7 @@ H5FD_core_open(const char *name, unsigned flags, hid_t fapl_id,
int fd=-1;
H5FD_t *ret_value;
- FUNC_ENTER_NOAPI(H5FD_core_open, NULL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(!name || !*name)
@@ -538,7 +538,7 @@ H5FD_core_close(H5FD_t *_file)
H5FD_core_t *file = (H5FD_core_t*)_file;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_core_close, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Flush any changed buffers */
if(H5FD_core_flush(_file, (hid_t)-1, TRUE) < 0)
@@ -591,7 +591,7 @@ H5FD_core_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
const H5FD_core_t *f2 = (const H5FD_core_t*)_f2;
int ret_value = 0;
- FUNC_ENTER_NOAPI(H5FD_core_cmp, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(f1->fd >= 0 && f2->fd >= 0) {
/* Compare low level file information for backing store */
@@ -666,7 +666,7 @@ H5FD_core_query(const H5FD_t * _file, unsigned long *flags /* out */)
{
const H5FD_core_t *file = (const H5FD_core_t*)_file;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_core_query)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set the VFL feature flags that this driver supports */
if(flags) {
@@ -710,15 +710,10 @@ static haddr_t
H5FD_core_get_eoa(const H5FD_t *_file, H5FD_mem_t UNUSED type)
{
const H5FD_core_t *file = (const H5FD_core_t*)_file;
- haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_core_get_eoa, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
- /* Set return value */
- ret_value=file->eoa;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(file->eoa)
}
@@ -749,7 +744,7 @@ H5FD_core_set_eoa(H5FD_t *_file, H5FD_mem_t UNUSED type, haddr_t addr)
H5FD_core_t *file = (H5FD_core_t*)_file;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_core_set_eoa, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
if(ADDR_OVERFLOW(addr))
HGOTO_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "address overflow")
@@ -784,17 +779,11 @@ done:
static haddr_t
H5FD_core_get_eof(const H5FD_t *_file)
{
- haddr_t ret_value; /* Return value */
-
const H5FD_core_t *file = (const H5FD_core_t*)_file;
- FUNC_ENTER_NOAPI(H5FD_core_get_eof, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
- /* Set return value */
- ret_value=MAX(file->eof, file->eoa);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(MAX(file->eof, file->eoa))
}
@@ -818,7 +807,7 @@ H5FD_core_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle)
H5FD_core_t *file = (H5FD_core_t *)_file; /* core VFD info */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_core_get_handle, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
if(!file_handle)
@@ -887,7 +876,7 @@ H5FD_core_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, hadd
H5FD_core_t *file = (H5FD_core_t*)_file;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_core_read, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
assert(file && file->pub.cls);
assert(buf);
@@ -954,7 +943,7 @@ H5FD_core_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, had
H5FD_core_t *file = (H5FD_core_t*)_file;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_core_write, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(file && file->pub.cls);
HDassert(buf);
@@ -1026,7 +1015,7 @@ H5FD_core_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned UNUSED closing)
H5FD_core_t *file = (H5FD_core_t*)_file;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_core_flush, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Write to backing store */
if (file->dirty && file->fd>=0 && file->backing_store) {
@@ -1078,7 +1067,7 @@ H5FD_core_truncate(H5FD_t *_file, hid_t UNUSED dxpl_id, hbool_t UNUSED closing)
size_t new_eof; /* New size of memory buffer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_core_truncate, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(file);
diff --git a/src/H5FDdirect.c b/src/H5FDdirect.c
index 8e7a2b7..1f12e5d 100644
--- a/src/H5FDdirect.c
+++ b/src/H5FDdirect.c
@@ -226,7 +226,7 @@ DESCRIPTION
static herr_t
H5FD_direct_init_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_direct_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5FD_direct_init())
} /* H5FD_direct_init_interface() */
@@ -254,7 +254,7 @@ H5FD_direct_init(void)
{
hid_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_direct_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if (H5I_VFL!=H5I_get_type(H5FD_DIRECT_g))
H5FD_DIRECT_g = H5FD_register(&H5FD_direct_g,sizeof(H5FD_class_t),FALSE);
@@ -284,7 +284,7 @@ done:
void
H5FD_direct_term(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_direct_term)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Reset VFL ID */
H5FD_DIRECT_g=0;
@@ -316,7 +316,7 @@ H5Pset_fapl_direct(hid_t fapl_id, size_t boundary, size_t block_size, size_t cbu
H5FD_direct_fapl_t fa;
herr_t ret_value;
- FUNC_ENTER_API(H5Pset_fapl_direct, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "izzz", fapl_id, boundary, block_size, cbuf_size);
if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
@@ -374,7 +374,7 @@ H5Pget_fapl_direct(hid_t fapl_id, size_t *boundary/*out*/, size_t *block_size/*o
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_fapl_direct, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "ixxx", fapl_id, boundary, block_size, cbuf_size);
if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
@@ -420,7 +420,7 @@ H5FD_direct_fapl_get(H5FD_t *_file)
H5FD_direct_t *file = (H5FD_direct_t*)_file;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_direct_fapl_get, NULL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Set return value */
ret_value= H5FD_direct_fapl_copy(&(file->fa));
@@ -451,20 +451,15 @@ H5FD_direct_fapl_copy(const void *_old_fa)
{
const H5FD_direct_fapl_t *old_fa = (const H5FD_direct_fapl_t*)_old_fa;
H5FD_direct_fapl_t *new_fa = H5MM_malloc(sizeof(H5FD_direct_fapl_t));
- void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_direct_fapl_copy, NULL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(new_fa);
/* Copy the general information */
HDmemcpy(new_fa, old_fa, sizeof(H5FD_direct_fapl_t));
- /* Set return value */
- ret_value=new_fa;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(new_fa)
} /* end H5FD_direct_fapl_copy() */
@@ -502,7 +497,7 @@ H5FD_direct_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxadd
int *buf1, *buf2;
H5FD_t *ret_value;
- FUNC_ENTER_NOAPI(H5FD_direct_open, NULL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check on file offsets */
assert(sizeof(file_offset_t)>=sizeof(size_t));
@@ -640,7 +635,7 @@ H5FD_direct_close(H5FD_t *_file)
H5FD_direct_t *file = (H5FD_direct_t*)_file;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_direct_close, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
if (HDclose(file->fd)<0)
HSYS_GOTO_ERROR(H5E_IO, H5E_CANTCLOSEFILE, FAIL, "unable to close file")
@@ -677,7 +672,7 @@ H5FD_direct_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
const H5FD_direct_t *f2 = (const H5FD_direct_t*)_f2;
int ret_value=0;
- FUNC_ENTER_NOAPI(H5FD_direct_cmp, H5FD_VFD_DEFAULT)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef H5_HAVE_WIN32_API
if (f1->fileindexhi < f2->fileindexhi) HGOTO_DONE(-1)
@@ -734,9 +729,7 @@ done:
static herr_t
H5FD_direct_query(const H5FD_t UNUSED * _f, unsigned long *flags /* out */)
{
- herr_t ret_value=SUCCEED;
-
- FUNC_ENTER_NOAPI(H5FD_direct_query, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set the VFL feature flags that this driver supports */
if(flags) {
@@ -747,8 +740,7 @@ H5FD_direct_query(const H5FD_t UNUSED * _f, unsigned long *flags /* out */)
*flags|=H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
}
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(SUCCEED)
}
@@ -777,15 +769,10 @@ static haddr_t
H5FD_direct_get_eoa(const H5FD_t *_file, H5FD_mem_t UNUSED type)
{
const H5FD_direct_t *file = (const H5FD_direct_t*)_file;
- haddr_t ret_value; /* Return value */
-
- FUNC_ENTER_NOAPI(H5FD_direct_get_eoa, HADDR_UNDEF)
- /* Set return value */
- ret_value=file->eoa;
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(file->eoa)
}
@@ -814,14 +801,12 @@ static herr_t
H5FD_direct_set_eoa(H5FD_t *_file, H5FD_mem_t UNUSED type, haddr_t addr)
{
H5FD_direct_t *file = (H5FD_direct_t*)_file;
- herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_direct_set_eoa, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
file->eoa = addr;
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(SUCCEED)
}
@@ -849,15 +834,10 @@ static haddr_t
H5FD_direct_get_eof(const H5FD_t *_file)
{
const H5FD_direct_t *file = (const H5FD_direct_t*)_file;
- haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_direct_get_eof, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI(HADDR_UNDEF)
- /* Set return value */
- ret_value=MAX(file->eof, file->eoa);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(MAX(file->eof, file->eoa))
}
@@ -881,7 +861,7 @@ H5FD_direct_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void** file_handle)
H5FD_direct_t *file = (H5FD_direct_t *)_file;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5FD_direct_get_handle, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
if(!file_handle)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
@@ -928,7 +908,7 @@ H5FD_direct_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, ha
size_t copy_size = size; /* Size remaining to read when using copy buffer */
size_t copy_offset; /* Offset into copy buffer of the requested data */
- FUNC_ENTER_NOAPI(H5FD_direct_read, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
assert(file && file->pub.cls);
assert(buf);
@@ -1116,7 +1096,7 @@ H5FD_direct_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, h
size_t copy_size = size; /* Size remaining to write when using copy buffer */
size_t copy_offset; /* Offset into copy buffer of the data to write */
- FUNC_ENTER_NOAPI(H5FD_direct_write, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
assert(file && file->pub.cls);
assert(buf);
@@ -1334,7 +1314,7 @@ H5FD_direct_truncate(H5FD_t *_file, hid_t UNUSED dxpl_id, hbool_t UNUSED closing
H5FD_direct_t *file = (H5FD_direct_t*)_file;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_direct_truncate, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
assert(file);
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c
index 5fd0294..8b6b819 100644
--- a/src/H5FDfamily.c
+++ b/src/H5FDfamily.c
@@ -166,7 +166,7 @@ DESCRIPTION
static herr_t
H5FD_family_init_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_family_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5FD_family_init())
} /* H5FD_family_init_interface() */
@@ -194,7 +194,7 @@ H5FD_family_init(void)
{
hid_t ret_value=H5FD_FAMILY_g; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_family_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if (H5I_VFL!=H5Iget_type(H5FD_FAMILY_g))
H5FD_FAMILY_g = H5FD_register(&H5FD_family_g,sizeof(H5FD_class_t),FALSE);
@@ -224,7 +224,7 @@ done:
void
H5FD_family_term(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_family_term)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Reset VFL ID */
H5FD_FAMILY_g=0;
@@ -265,7 +265,7 @@ H5Pset_fapl_family(hid_t fapl_id, hsize_t msize, hid_t memb_fapl_id)
H5FD_family_fapl_t fa={0, -1};
H5P_genplist_t *plist; /* Property list pointer */
- FUNC_ENTER_API(H5Pset_fapl_family, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ihi", fapl_id, msize, memb_fapl_id);
@@ -324,7 +324,7 @@ H5Pget_fapl_family(hid_t fapl_id, hsize_t *msize/*out*/,
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_fapl_family, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ixx", fapl_id, msize, memb_fapl_id);
if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
@@ -371,7 +371,7 @@ H5FD_family_fapl_get(H5FD_t *_file)
H5P_genplist_t *plist; /* Property list pointer */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_family_fapl_get, NULL)
+ FUNC_ENTER_NOAPI_NOINIT
if(NULL == (fa = (H5FD_family_fapl_t *)H5MM_calloc(sizeof(H5FD_family_fapl_t))))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
@@ -417,7 +417,7 @@ H5FD_family_fapl_copy(const void *_old_fa)
H5P_genplist_t *plist; /* Property list pointer */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_family_fapl_copy, NULL)
+ FUNC_ENTER_NOAPI_NOINIT
if(NULL == (new_fa = (H5FD_family_fapl_t *)H5MM_malloc(sizeof(H5FD_family_fapl_t))))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
@@ -470,7 +470,7 @@ H5FD_family_fapl_free(void *_fa)
H5FD_family_fapl_t *fa = (H5FD_family_fapl_t*)_fa;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_family_fapl_free, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
if(H5I_dec_ref(fa->memb_fapl_id) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTDEC, FAIL, "can't close driver ID")
@@ -505,7 +505,7 @@ H5FD_family_dxpl_copy(const void *_old_dx)
H5P_genplist_t *plist; /* Property list pointer */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_family_dxpl_copy, NULL)
+ FUNC_ENTER_NOAPI_NOINIT
if(NULL == (new_dx = (H5FD_family_dxpl_t *)H5MM_malloc(sizeof(H5FD_family_dxpl_t))))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
@@ -556,7 +556,7 @@ H5FD_family_dxpl_free(void *_dx)
H5FD_family_dxpl_t *dx = (H5FD_family_dxpl_t*)_dx;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_family_dxpl_free, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
if(H5I_dec_ref(dx->memb_dxpl_id) < 0)
HGOTO_ERROR(H5E_VFL, H5E_CANTDEC, FAIL, "can't close driver ID")
@@ -587,16 +587,11 @@ done:
static hsize_t
H5FD_family_sb_size(H5FD_t UNUSED *_file)
{
- hsize_t ret_value = 0; /*size of header*/
-
- FUNC_ENTER_NOAPI(H5FD_family_sb_size, UFAIL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* 8 bytes field for the size of member file size field should be
* enough for now. */
- ret_value += 8;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(8)
}
@@ -625,7 +620,7 @@ H5FD_family_sb_encode(H5FD_t *_file, char *name/*out*/, unsigned char *buf/*out*
{
H5FD_family_t *file = (H5FD_family_t*)_file;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_family_sb_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Name and version number */
HDstrncpy(name, "NCSAfami", (size_t)9);
@@ -670,7 +665,7 @@ H5FD_family_sb_decode(H5FD_t *_file, const char UNUSED *name, const unsigned cha
uint64_t msize;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_family_sb_decode, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Read member file size. Skip name template for now although it's saved. */
UINT64DECODE(buf, msize);
@@ -748,7 +743,7 @@ H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id,
hsize_t eof=HADDR_UNDEF;
unsigned t_flags = flags & ~H5F_ACC_CREAT;
- FUNC_ENTER_NOAPI(H5FD_family_open, NULL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(!name || !*name)
@@ -905,7 +900,7 @@ H5FD_family_close(H5FD_t *_file)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_family_close, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Close as many members as possible. Use private function here to avoid clearing
* the error stack. We need the error message to indicate wrong member file size. */
@@ -929,7 +924,6 @@ H5FD_family_close(H5FD_t *_file)
H5MM_xfree(file->name);
H5MM_xfree(file);
-done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5FD_family_close() */
@@ -959,7 +953,7 @@ H5FD_family_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
const H5FD_family_t *f2 = (const H5FD_family_t*)_f2;
int ret_value=(H5FD_VFD_DEFAULT);
- FUNC_ENTER_NOAPI(H5FD_family_cmp, H5FD_VFD_DEFAULT)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(f1->nmembs>=1 && f1->memb[0]);
assert(f2->nmembs>=1 && f2->memb[0]);
@@ -991,7 +985,7 @@ H5FD_family_query(const H5FD_t * _file, unsigned long *flags /* out */)
{
const H5FD_family_t *file = (const H5FD_family_t*)_file; /* Family VFD info */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_family_query)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set the VFL feature flags that this driver supports */
if(flags) {
@@ -1035,15 +1029,10 @@ static haddr_t
H5FD_family_get_eoa(const H5FD_t *_file, H5FD_mem_t UNUSED type)
{
const H5FD_family_t *file = (const H5FD_family_t*)_file;
- haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_family_get_eoa, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
- /* Set return value */
- ret_value=file->eoa;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(file->eoa)
}
@@ -1075,7 +1064,7 @@ H5FD_family_set_eoa(H5FD_t *_file, H5FD_mem_t type, haddr_t abs_eoa)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_family_set_eoa, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
for(u = 0; addr || u < file->nmembs; u++) {
@@ -1153,7 +1142,7 @@ H5FD_family_get_eof(const H5FD_t *_file)
int i; /* Local index variable */
haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_family_get_eof, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Find the last member that has a non-zero EOF and break out of the loop
@@ -1180,7 +1169,6 @@ H5FD_family_get_eof(const H5FD_t *_file)
/* Set return value */
ret_value = MAX(eof, file->eoa);
-done:
FUNC_LEAVE_NOAPI(ret_value)
}
@@ -1208,7 +1196,7 @@ H5FD_family_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle)
int memb;
herr_t ret_value;
- FUNC_ENTER_NOAPI(H5FD_family_get_handle, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get the plist structure and family offset */
if(NULL == (plist = H5P_object_verify(fapl, H5P_FILE_ACCESS)))
@@ -1260,7 +1248,7 @@ H5FD_family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, si
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_family_read, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Get the member data transfer property list. If the transfer property
@@ -1337,7 +1325,7 @@ H5FD_family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, s
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_family_write, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Get the member data transfer property list. If the transfer property
@@ -1402,7 +1390,7 @@ H5FD_family_flush(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
unsigned u, nerrors = 0;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_family_flush, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
for(u = 0; u < file->nmembs; u++)
if(file->memb[u] && H5FD_flush(file->memb[u], dxpl_id, closing) < 0)
@@ -1437,7 +1425,7 @@ H5FD_family_truncate(H5FD_t *_file, hid_t dxpl_id, unsigned closing)
unsigned u, nerrors = 0;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_family_truncate, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
for(u = 0; u < file->nmembs; u++)
if(file->memb[u] && H5FD_truncate(file->memb[u], dxpl_id, closing) < 0)
diff --git a/src/H5FDint.c b/src/H5FDint.c
index 74b3bf6..09af4ed 100644
--- a/src/H5FDint.c
+++ b/src/H5FDint.c
@@ -97,7 +97,7 @@ DESCRIPTION
static herr_t
H5FD_int_init_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_int_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5FD_init())
} /* H5FD_int_init_interface() */
@@ -122,7 +122,7 @@ H5FD_read(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_read, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(file && file->cls);
HDassert(H5I_GENPROP_LST == H5I_get_type(dxpl_id));
@@ -165,7 +165,7 @@ H5FD_write(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_write, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(file && file->cls);
HDassert(H5I_GENPROP_LST == H5I_get_type(dxpl_id));
@@ -212,7 +212,7 @@ H5FD_set_eoa(H5FD_t *file, H5FD_mem_t type, haddr_t addr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_set_eoa, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(file && file->cls);
HDassert(H5F_addr_defined(addr) && addr <= file->maxaddr);
@@ -249,7 +249,7 @@ H5FD_get_eoa(const H5FD_t *file, H5FD_mem_t type)
{
haddr_t ret_value;
- FUNC_ENTER_NOAPI(H5FD_get_eoa, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI(HADDR_UNDEF)
HDassert(file && file->cls);
@@ -291,7 +291,7 @@ H5FD_get_eof(const H5FD_t *file)
{
haddr_t ret_value;
- FUNC_ENTER_NOAPI(H5FD_get_eof, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI(HADDR_UNDEF)
HDassert(file && file->cls);
diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index 2cb795e..8bb2392 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -254,7 +254,7 @@ DESCRIPTION
static herr_t
H5FD_log_init_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5FD_log_init())
} /* H5FD_log_init_interface() */
@@ -279,7 +279,7 @@ H5FD_log_init(void)
{
hid_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_log_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if(H5I_VFL != H5I_get_type(H5FD_LOG_g))
H5FD_LOG_g = H5FD_register(&H5FD_log_g, sizeof(H5FD_class_t), FALSE);
@@ -307,7 +307,7 @@ done:
void
H5FD_log_term(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_term)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Reset VFL ID */
H5FD_LOG_g = 0;
@@ -336,7 +336,7 @@ H5Pset_fapl_log(hid_t fapl_id, const char *logfile, unsigned long long flags, si
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Pset_fapl_log, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*sULz", fapl_id, logfile, flags, buf_size);
/* Check arguments */
@@ -379,7 +379,7 @@ H5FD_log_fapl_get(H5FD_t *_file)
H5FD_log_t *file = (H5FD_log_t *)_file;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_fapl_get)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set return value */
ret_value = H5FD_log_fapl_copy(&(file->fa));
@@ -408,7 +408,7 @@ H5FD_log_fapl_copy(const void *_old_fa)
H5FD_log_fapl_t *new_fa = NULL; /* New FAPL info */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FD_log_fapl_copy)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(old_fa);
@@ -457,7 +457,7 @@ H5FD_log_fapl_free(void *_fa)
{
H5FD_log_fapl_t *fa = (H5FD_log_fapl_t*)_fa;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_fapl_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Free the fapl information */
if(fa->logfile)
@@ -502,7 +502,7 @@ H5FD_log_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
h5_stat_t sb;
H5FD_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FD_log_open)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check on file offsets */
HDcompile_assert(sizeof(HDoff_t) >= sizeof(size_t));
@@ -698,7 +698,7 @@ H5FD_log_close(H5FD_t *_file)
#endif /* H5_HAVE_GETTIMEOFDAY */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FD_log_close)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(file);
@@ -846,7 +846,7 @@ H5FD_log_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
const H5FD_log_t *f2 = (const H5FD_log_t *)_f2;
int ret_value = 0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_cmp)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef H5_HAVE_WIN32_API
if(f1->dwVolumeSerialNumber < f2->dwVolumeSerialNumber) HGOTO_DONE(-1)
@@ -904,7 +904,7 @@ H5FD_log_query(const H5FD_t *_file, unsigned long *flags /* out */)
{
const H5FD_log_t *file = (const H5FD_log_t *)_file;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_query)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set the VFL feature flags that this driver supports */
if(flags) {
@@ -945,7 +945,7 @@ H5FD_log_alloc(H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, hsize_t siz
haddr_t addr;
haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_alloc)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Compute the address for the block to allocate */
addr = file->eoa;
@@ -998,7 +998,7 @@ H5FD_log_get_eoa(const H5FD_t *_file, H5FD_mem_t UNUSED type)
{
const H5FD_log_t *file = (const H5FD_log_t *)_file;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_get_eoa)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(file->eoa)
} /* end H5FD_log_get_eoa() */
@@ -1024,7 +1024,7 @@ H5FD_log_set_eoa(H5FD_t *_file, H5FD_mem_t UNUSED type, haddr_t addr)
{
H5FD_log_t *file = (H5FD_log_t *)_file;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_set_eoa)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
file->eoa = addr;
@@ -1054,7 +1054,7 @@ H5FD_log_get_eof(const H5FD_t *_file)
{
const H5FD_log_t *file = (const H5FD_log_t *)_file;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_log_get_eof)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(MAX(file->eof, file->eoa))
} /* end H5FD_log_get_eof() */
@@ -1079,7 +1079,7 @@ H5FD_log_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void **file_handle)
H5FD_log_t *file = (H5FD_log_t *)_file;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5FD_log_get_handle)
+ FUNC_ENTER_NOAPI_NOINIT
if(!file_handle)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
@@ -1120,7 +1120,7 @@ H5FD_log_read(H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, haddr_t addr
#endif /* H5_HAVE_GETTIMEOFDAY */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FD_log_read)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(file && file->pub.cls);
HDassert(buf);
@@ -1321,7 +1321,7 @@ H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, haddr_t add
#endif /* H5_HAVE_GETTIMEOFDAY */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FD_log_write)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(file && file->pub.cls);
HDassert(size > 0);
@@ -1519,7 +1519,7 @@ H5FD_log_truncate(H5FD_t *_file, hid_t UNUSED dxpl_id, hbool_t UNUSED closing)
H5FD_log_t *file = (H5FD_log_t *)_file;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FD_log_truncate)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(file);
diff --git a/src/H5FDmpi.c b/src/H5FDmpi.c
index 21c761a..ff2c87d 100644
--- a/src/H5FDmpi.c
+++ b/src/H5FDmpi.c
@@ -59,7 +59,7 @@ H5FD_mpi_get_rank(const H5FD_t *file)
const H5FD_class_mpi_t *cls=(const H5FD_class_mpi_t *)(file->cls);
int ret_value;
- FUNC_ENTER_NOAPI(H5FD_mpi_get_rank, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
assert(file && cls);
assert(cls->get_rank); /* All MPI drivers must implement this */
@@ -95,7 +95,7 @@ H5FD_mpi_get_size(const H5FD_t *file)
const H5FD_class_mpi_t *cls=(const H5FD_class_mpi_t *)(file->cls);
int ret_value;
- FUNC_ENTER_NOAPI(H5FD_mpi_get_size, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
assert(file && cls);
assert(cls->get_size); /* All MPI drivers must implement this */
@@ -131,7 +131,7 @@ H5FD_mpi_get_comm(const H5FD_t *file)
const H5FD_class_mpi_t *cls=(const H5FD_class_mpi_t *)(file->cls);
MPI_Comm ret_value;
- FUNC_ENTER_NOAPI(H5FD_mpi_get_comm, MPI_COMM_NULL)
+ FUNC_ENTER_NOAPI(MPI_COMM_NULL)
assert(file && cls);
assert(cls->get_comm); /* All MPI drivers must implement this */
@@ -172,7 +172,7 @@ H5FD_mpi_MPIOff_to_haddr(MPI_Offset mpi_off)
{
haddr_t ret_value=HADDR_UNDEF;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpi_MPIOff_to_haddr)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if (mpi_off != (MPI_Offset)(haddr_t)mpi_off)
ret_value=HADDR_UNDEF;
@@ -213,7 +213,7 @@ H5FD_mpi_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off/*out*/)
{
herr_t ret_value=FAIL;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpi_haddr_to_MPIOff)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(mpi_off);
@@ -257,7 +257,7 @@ H5FD_mpi_comm_info_dup(MPI_Comm comm, MPI_Info info, MPI_Comm *comm_new, MPI_Inf
MPI_Info info_dup=MPI_INFO_NULL;
int mpi_code;
- FUNC_ENTER_NOAPI(H5FD_mpi_comm_info_dup, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments */
if (MPI_COMM_NULL == comm)
@@ -316,7 +316,8 @@ herr_t
H5FD_mpi_comm_info_free(MPI_Comm *comm, MPI_Info *info)
{
herr_t ret_value=SUCCEED;
- FUNC_ENTER_NOAPI(H5FD_mpi_comm_info_free, FAIL)
+
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments */
if (!comm || !info)
@@ -368,7 +369,7 @@ H5FD_mpio_wait_for_left_neighbor(H5FD_t *_file)
int mpi_code; /* mpi return code */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpio_wait_for_left_neighbor, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
assert(file);
assert(H5FD_MPIO==file->pub.driver_id);
@@ -422,7 +423,7 @@ H5FD_mpio_signal_right_neighbor(H5FD_t *_file)
int mpi_code; /* mpi return code */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpio_signal_right_neighbor, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
assert(file);
assert(H5FD_MPIO==file->pub.driver_id);
@@ -470,7 +471,7 @@ H5FD_mpi_setup_collective(hid_t dxpl_id, MPI_Datatype btype, MPI_Datatype ftype)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpi_setup_collective, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments */
if(NULL == (plist = H5P_object_verify(dxpl_id,H5P_DATASET_XFER)))
@@ -510,7 +511,7 @@ H5FD_mpi_teardown_collective(hid_t dxpl_id)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpi_teardown_collective, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments */
if(NULL == (plist = H5P_object_verify(dxpl_id,H5P_DATASET_XFER)))
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index f82dca9..4c40359 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -169,7 +169,7 @@ DESCRIPTION
static herr_t
H5FD_mpio_init_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpio_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5FD_mpio_init())
} /* H5FD_mpio_init_interface() */
@@ -200,7 +200,7 @@ H5FD_mpio_init(void)
#endif /* H5FDmpio_DEBUG */
hid_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpio_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if (H5I_VFL!=H5I_get_type(H5FD_MPIO_g))
H5FD_MPIO_g = H5FD_register((const H5FD_class_t *)&H5FD_mpio_g,sizeof(H5FD_class_mpi_t),FALSE);
@@ -246,7 +246,7 @@ done:
void
H5FD_mpio_term(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpio_term)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Reset VFL ID */
H5FD_MPIO_g=0;
@@ -321,7 +321,7 @@ H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
- FUNC_ENTER_API(H5Pset_fapl_mpio, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "iMcMi", fapl_id, comm, info);
if(fapl_id == H5P_DEFAULT)
@@ -392,7 +392,7 @@ H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm/*out*/, MPI_Info *info/*out*/)
int mpi_code; /* mpi return code */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_fapl_mpio, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ixx", fapl_id, comm, info);
if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
@@ -466,7 +466,7 @@ H5Pset_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
- FUNC_ENTER_API(H5Pset_dxpl_mpio, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iDt", dxpl_id, xfer_mode);
if(dxpl_id==H5P_DEFAULT)
@@ -516,7 +516,7 @@ H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode/*out*/)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_dxpl_mpio, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ix", dxpl_id, xfer_mode);
if(NULL == (plist = H5P_object_verify(dxpl_id, H5P_DATASET_XFER)))
@@ -563,7 +563,7 @@ H5Pset_dxpl_mpio_collective_opt(hid_t dxpl_id, H5FD_mpio_collective_opt_t opt_mo
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
- FUNC_ENTER_API(H5Pset_dxpl_mpio_collective_opt, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iDc", dxpl_id, opt_mode);
if(dxpl_id == H5P_DEFAULT)
@@ -615,7 +615,7 @@ H5Pset_dxpl_mpio_chunk_opt(hid_t dxpl_id, H5FD_mpio_chunk_opt_t opt_mode)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
- FUNC_ENTER_API(H5Pset_dxpl_mpio_chunk_opt, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iDh", dxpl_id, opt_mode);
if(dxpl_id == H5P_DEFAULT)
@@ -662,7 +662,7 @@ H5Pset_dxpl_mpio_chunk_opt_num(hid_t dxpl_id, unsigned num_chunk_per_proc)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
- FUNC_ENTER_API(H5Pset_dxpl_mpio_chunk_opt_num, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iIu", dxpl_id, num_chunk_per_proc);
if(dxpl_id == H5P_DEFAULT)
@@ -709,7 +709,7 @@ H5Pset_dxpl_mpio_chunk_opt_ratio(hid_t dxpl_id, unsigned percent_num_proc_per_ch
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
- FUNC_ENTER_API(H5Pset_dxpl_mpio_chunk_opt_ratio, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iIu", dxpl_id, percent_num_proc_per_chunk);
if(dxpl_id == H5P_DEFAULT)
@@ -758,7 +758,7 @@ H5FD_mpio_fapl_get(H5FD_t *_file)
H5FD_mpio_fapl_t *fa = NULL;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpio_fapl_get, NULL)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(file);
HDassert(H5FD_MPIO == file->pub.driver_id);
@@ -801,7 +801,7 @@ H5FD_mpio_fapl_copy(const void *_old_fa)
const H5FD_mpio_fapl_t *old_fa = (const H5FD_mpio_fapl_t*)_old_fa;
H5FD_mpio_fapl_t *new_fa = NULL;
- FUNC_ENTER_NOAPI(H5FD_mpio_fapl_copy, NULL)
+ FUNC_ENTER_NOAPI_NOINIT
#ifdef H5FDmpio_DEBUG
if (H5FD_mpio_Debug[(int)'t'])
fprintf(stderr, "enter H5FD_mpio_fapl_copy\n");
@@ -855,7 +855,7 @@ H5FD_mpio_fapl_free(void *_fa)
herr_t ret_value = SUCCEED;
H5FD_mpio_fapl_t *fa = (H5FD_mpio_fapl_t*)_fa;
- FUNC_ENTER_NOAPI(H5FD_mpio_fapl_free, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef H5FDmpio_DEBUG
if (H5FD_mpio_Debug[(int)'t'])
fprintf(stderr, "in H5FD_mpio_fapl_free\n");
@@ -867,7 +867,6 @@ fprintf(stderr, "in H5FD_mpio_fapl_free\n");
H5FD_mpi_comm_info_free(&fa->comm, &fa->info);
H5MM_xfree(fa);
-done:
#ifdef H5FDmpio_DEBUG
if (H5FD_mpio_Debug[(int)'t'])
fprintf(stderr, "leaving H5FD_mpio_fapl_free\n");
@@ -943,7 +942,7 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id,
h5_stat_t stat_buf;
#endif
- FUNC_ENTER_NOAPI(H5FD_mpio_open, NULL)
+ FUNC_ENTER_NOAPI_NOINIT
#ifdef H5FDmpio_DEBUG
if (H5FD_mpio_Debug[(int)'t']) {
@@ -1103,7 +1102,7 @@ H5FD_mpio_close(H5FD_t *_file)
int mpi_code; /* MPI return code */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpio_close, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
#ifdef H5FDmpio_DEBUG
if (H5FD_mpio_Debug[(int)'t'])
@@ -1156,9 +1155,7 @@ done:
static herr_t
H5FD_mpio_query(const H5FD_t UNUSED *_file, unsigned long *flags /* out */)
{
- herr_t ret_value=SUCCEED;
-
- FUNC_ENTER_NOAPI(H5FD_mpio_query, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set the VFL feature flags that this driver supports */
if(flags) {
@@ -1167,8 +1164,7 @@ H5FD_mpio_query(const H5FD_t UNUSED *_file, unsigned long *flags /* out */)
*flags|=H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
} /* end if */
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(SUCCEED)
}
@@ -1197,18 +1193,13 @@ static haddr_t
H5FD_mpio_get_eoa(const H5FD_t *_file, H5FD_mem_t UNUSED type)
{
const H5FD_mpio_t *file = (const H5FD_mpio_t*)_file;
- haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpio_get_eoa, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIO==file->pub.driver_id);
- /* Set return value */
- ret_value=file->eoa;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(file->eoa)
}
@@ -1237,17 +1228,15 @@ static herr_t
H5FD_mpio_set_eoa(H5FD_t *_file, H5FD_mem_t UNUSED type, haddr_t addr)
{
H5FD_mpio_t *file = (H5FD_mpio_t*)_file;
- herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpio_set_eoa, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIO==file->pub.driver_id);
file->eoa = addr;
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(SUCCEED)
}
@@ -1284,18 +1273,13 @@ static haddr_t
H5FD_mpio_get_eof(const H5FD_t *_file)
{
const H5FD_mpio_t *file = (const H5FD_mpio_t*)_file;
- haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpio_get_eof, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIO==file->pub.driver_id);
- /* Set return value */
- ret_value=file->eof;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(file->eof)
}
@@ -1319,7 +1303,7 @@ H5FD_mpio_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void** file_handle)
H5FD_mpio_t *file = (H5FD_mpio_t *)_file;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5FD_mpio_get_handle, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
if(!file_handle)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
@@ -1417,7 +1401,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add
hbool_t use_view_this_time = FALSE;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5FD_mpio_read, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
#ifdef H5FDmpio_DEBUG
if (H5FD_mpio_Debug[(int)'t'])
@@ -1701,7 +1685,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
H5P_genplist_t *plist = NULL; /* Property list pointer */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5FD_mpio_write, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
#ifdef H5FDmpio_DEBUG
if (H5FD_mpio_Debug[(int)'t'])
@@ -1876,7 +1860,7 @@ H5FD_mpio_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned closing)
int mpi_code; /* mpi return code */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5FD_mpio_flush, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
#ifdef H5FDmpio_DEBUG
if(H5FD_mpio_Debug[(int)'t'])
@@ -1920,7 +1904,7 @@ H5FD_mpio_truncate(H5FD_t *_file, hid_t UNUSED dxpl_id, hbool_t UNUSED closing)
H5FD_mpio_t *file = (H5FD_mpio_t*)_file;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5FD_mpio_truncate, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
#ifdef H5FDmpio_DEBUG
if(H5FD_mpio_Debug[(int)'t'])
@@ -2010,18 +1994,13 @@ static int
H5FD_mpio_mpi_rank(const H5FD_t *_file)
{
const H5FD_mpio_t *file = (const H5FD_mpio_t*)_file;
- int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpio_mpi_rank, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIO==file->pub.driver_id);
- /* Set return value */
- ret_value=file->mpi_rank;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(file->mpi_rank)
} /* end H5FD_mpio_mpi_rank() */
@@ -2044,18 +2023,13 @@ static int
H5FD_mpio_mpi_size(const H5FD_t *_file)
{
const H5FD_mpio_t *file = (const H5FD_mpio_t*)_file;
- int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpio_mpi_size, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIO==file->pub.driver_id);
- /* Set return value */
- ret_value=file->mpi_size;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(file->mpi_size)
} /* end H5FD_mpio_mpi_size() */
@@ -2079,18 +2053,14 @@ static MPI_Comm
H5FD_mpio_communicator(const H5FD_t *_file)
{
const H5FD_mpio_t *file = (const H5FD_mpio_t*)_file;
- MPI_Comm ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpio_communicator, MPI_COMM_NULL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIO==file->pub.driver_id);
- /* Set return value */
- ret_value=file->comm;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(file->comm)
}
#endif /* H5_HAVE_PARALLEL */
+
diff --git a/src/H5FDmpiposix.c b/src/H5FDmpiposix.c
index 558c709..74eb566 100644
--- a/src/H5FDmpiposix.c
+++ b/src/H5FDmpiposix.c
@@ -258,7 +258,7 @@ DESCRIPTION
static herr_t
H5FD_mpiposix_init_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpiposix_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5FD_mpiposix_init())
} /* H5FD_mpiposix_init_interface() */
@@ -286,7 +286,7 @@ H5FD_mpiposix_init(void)
{
hid_t ret_value=H5FD_MPIPOSIX_g; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpiposix_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if (H5I_VFL!=H5Iget_type(H5FD_MPIPOSIX_g))
H5FD_MPIPOSIX_g = H5FD_register((const H5FD_class_t *)&H5FD_mpiposix_g,sizeof(H5FD_class_mpi_t),FALSE);
@@ -316,7 +316,7 @@ done:
void
H5FD_mpiposix_term(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_mpiposix_term)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Reset VFL ID */
H5FD_MPIPOSIX_g=0;
@@ -366,7 +366,7 @@ H5Pset_fapl_mpiposix(hid_t fapl_id, MPI_Comm comm, hbool_t use_gpfs)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
- FUNC_ENTER_API(H5Pset_fapl_mpiposix, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "iMcb", fapl_id, comm, use_gpfs);
/* Check arguments */
@@ -425,7 +425,7 @@ H5Pget_fapl_mpiposix(hid_t fapl_id, MPI_Comm *comm/*out*/, hbool_t *use_gpfs/*ou
int mpi_code; /* mpi return code */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_fapl_mpiposix, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ixx", fapl_id, comm, use_gpfs);
if(NULL == (plist = H5P_object_verify(fapl_id,H5P_FILE_ACCESS)))
@@ -478,7 +478,7 @@ H5FD_mpiposix_fapl_get(H5FD_t *_file)
int mpi_code; /* MPI return code */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpiposix_fapl_get, NULL)
+ FUNC_ENTER_NOAPI_NOINIT
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
@@ -524,7 +524,7 @@ H5FD_mpiposix_fapl_copy(const void *_old_fa)
H5FD_mpiposix_fapl_t *new_fa = NULL;
int mpi_code; /* MPI return code */
- FUNC_ENTER_NOAPI(H5FD_mpiposix_fapl_copy, NULL)
+ FUNC_ENTER_NOAPI_NOINIT
if (NULL==(new_fa=H5MM_malloc(sizeof(H5FD_mpiposix_fapl_t))))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
@@ -569,10 +569,10 @@ done:
static herr_t
H5FD_mpiposix_fapl_free(void *_fa)
{
- herr_t ret_value = SUCCEED;
H5FD_mpiposix_fapl_t *fa = (H5FD_mpiposix_fapl_t*)_fa;
- FUNC_ENTER_NOAPI(H5FD_mpiposix_fapl_free, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
+
assert(fa);
/* Free the internal communicator */
@@ -580,8 +580,7 @@ H5FD_mpiposix_fapl_free(void *_fa)
MPI_Comm_free(&fa->comm);
H5MM_xfree(fa);
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD_mpiposix_fapl_free() */
@@ -630,7 +629,7 @@ H5FD_mpiposix_open(const char *name, unsigned flags, hid_t fapl_id,
H5FD_t *ret_value=NULL; /* Return value */
MPI_Comm comm_dup=MPI_COMM_NULL;
- FUNC_ENTER_NOAPI(H5FD_mpiposix_open, NULL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if (!name || !*name)
@@ -824,7 +823,7 @@ H5FD_mpiposix_close(H5FD_t *_file)
H5FD_mpiposix_t *file = (H5FD_mpiposix_t*)_file;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpiposix_close, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
@@ -868,7 +867,7 @@ H5FD_mpiposix_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
const H5FD_mpiposix_t *f2 = (const H5FD_mpiposix_t*)_f2;
int ret_value=0;
- FUNC_ENTER_NOAPI(H5FD_mpiposix_cmp, H5FD_VFD_DEFAULT)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef H5_HAVE_WIN32_API
if (f1->fileindexhi < f2->fileindexhi) HGOTO_DONE(-1)
@@ -924,9 +923,7 @@ done:
static herr_t
H5FD_mpiposix_query(const H5FD_t UNUSED *_file, unsigned long *flags /* out */)
{
- herr_t ret_value=SUCCEED;
-
- FUNC_ENTER_NOAPI(H5FD_mpiposix_query, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set the VFL feature flags that this driver supports */
if(flags) {
@@ -935,8 +932,7 @@ H5FD_mpiposix_query(const H5FD_t UNUSED *_file, unsigned long *flags /* out */)
*flags|=H5FD_FEAT_AGGREGATE_SMALLDATA; /* OK to aggregate "small" raw data allocations */
} /* end if */
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD_mpiposix_query() */
@@ -964,18 +960,13 @@ static haddr_t
H5FD_mpiposix_get_eoa(const H5FD_t *_file, H5FD_mem_t UNUSED type)
{
const H5FD_mpiposix_t *file = (const H5FD_mpiposix_t*)_file;
- haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpiposix_get_eoa, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
- /* Set return value */
- ret_value=file->eoa;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(file->eoa)
} /* end H5FD_mpiposix_get_eoa() */
@@ -1003,17 +994,15 @@ static herr_t
H5FD_mpiposix_set_eoa(H5FD_t *_file, H5FD_mem_t UNUSED type, haddr_t addr)
{
H5FD_mpiposix_t *file = (H5FD_mpiposix_t*)_file;
- herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpiposix_set_eoa, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
file->eoa = addr;
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5FD_mpi_posix_set_eoa() */
@@ -1043,18 +1032,13 @@ static haddr_t
H5FD_mpiposix_get_eof(const H5FD_t *_file)
{
const H5FD_mpiposix_t *file = (const H5FD_mpiposix_t*)_file;
- haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpiposix_get_eof, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
- /* Set return value */
- ret_value=MAX(file->eof,file->eoa);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(MAX(file->eof,file->eoa))
} /* end H5FD_mpiposix_get_eof() */
@@ -1078,7 +1062,7 @@ H5FD_mpiposix_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void** file_handle)
H5FD_mpiposix_t *file = (H5FD_mpiposix_t *)_file;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5FD_mpiposix_get_handle, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
if(!file_handle)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
@@ -1120,7 +1104,7 @@ H5FD_mpiposix_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id,
ssize_t nbytes; /* Number of bytes read each I/O call */
herr_t ret_value=SUCCEED;
- FUNC_ENTER_NOAPI(H5FD_mpiposix_read, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
@@ -1222,7 +1206,7 @@ H5FD_mpiposix_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr,
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpiposix_write, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
@@ -1395,7 +1379,7 @@ H5FD_mpiposix_truncate(H5FD_t *_file, hid_t UNUSED dxpl_id, hbool_t UNUSED closi
int mpi_code; /* MPI return code */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5FD_mpiposix_truncate, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(file);
HDassert(H5FD_MPIPOSIX == file->pub.driver_id);
@@ -1462,18 +1446,13 @@ static int
H5FD_mpiposix_mpi_rank(const H5FD_t *_file)
{
const H5FD_mpiposix_t *file = (const H5FD_mpiposix_t*)_file;
- int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpiposix_mpi_rank, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
- /* Set return value */
- ret_value=file->mpi_rank;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(file->mpi_rank)
} /* end H5FD_mpiposix_mpi_rank() */
@@ -1496,18 +1475,13 @@ static int
H5FD_mpiposix_mpi_size(const H5FD_t *_file)
{
const H5FD_mpiposix_t *file = (const H5FD_mpiposix_t*)_file;
- int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpiposix_mpi_size, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
- /* Set return value */
- ret_value=file->mpi_size;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(file->mpi_size)
} /* end H5FD_mpiposix_mpi_size() */
@@ -1531,18 +1505,13 @@ static MPI_Comm
H5FD_mpiposix_communicator(const H5FD_t *_file)
{
const H5FD_mpiposix_t *file = (const H5FD_mpiposix_t*)_file;
- MPI_Comm ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_mpiposix_communicator, MPI_COMM_NULL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(file);
assert(H5FD_MPIPOSIX==file->pub.driver_id);
- /* Set return value */
- ret_value=file->comm;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(file->comm)
} /* end H5FD_mpi_posix_communicator() */
#endif /*H5_HAVE_PARALLEL*/
diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c
index a7ae93e..c3a25c9 100644
--- a/src/H5FDsec2.c
+++ b/src/H5FDsec2.c
@@ -212,7 +212,7 @@ DESCRIPTION
static herr_t
H5FD_sec2_init_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5FD_sec2_init())
} /* H5FD_sec2_init_interface() */
@@ -237,7 +237,7 @@ H5FD_sec2_init(void)
{
hid_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_sec2_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if(H5I_VFL != H5I_get_type(H5FD_SEC2_g))
H5FD_SEC2_g = H5FD_register(&H5FD_sec2_g, sizeof(H5FD_class_t), FALSE);
@@ -265,7 +265,7 @@ done:
void
H5FD_sec2_term(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_term)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Reset VFL ID */
H5FD_SEC2_g = 0;
@@ -294,7 +294,7 @@ H5Pset_fapl_sec2(hid_t fapl_id)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value;
- FUNC_ENTER_API(H5Pset_fapl_sec2, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", fapl_id);
if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
@@ -334,7 +334,7 @@ H5FD_sec2_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
h5_stat_t sb;
H5FD_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FD_sec2_open)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check on file offsets */
HDcompile_assert(sizeof(HDoff_t) >= sizeof(size_t));
@@ -451,7 +451,7 @@ H5FD_sec2_close(H5FD_t *_file)
H5FD_sec2_t *file = (H5FD_sec2_t *)_file;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FD_sec2_close)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(file);
@@ -490,7 +490,7 @@ H5FD_sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
const H5FD_sec2_t *f2 = (const H5FD_sec2_t *)_f2;
int ret_value = 0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_cmp)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef H5_HAVE_WIN32_API
if(f1->dwVolumeSerialNumber < f2->dwVolumeSerialNumber) HGOTO_DONE(-1)
@@ -546,7 +546,7 @@ H5FD_sec2_query(const H5FD_t *_file, unsigned long *flags /* out */)
{
const H5FD_sec2_t *file = (const H5FD_sec2_t *)_file; /* sec2 VFD info */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_query)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set the VFL feature flags that this driver supports */
if(flags) {
@@ -587,7 +587,7 @@ H5FD_sec2_get_eoa(const H5FD_t *_file, H5FD_mem_t UNUSED type)
{
const H5FD_sec2_t *file = (const H5FD_sec2_t *)_file;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_get_eoa)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(file->eoa)
} /* end H5FD_sec2_get_eoa() */
@@ -614,7 +614,7 @@ H5FD_sec2_set_eoa(H5FD_t *_file, H5FD_mem_t UNUSED type, haddr_t addr)
{
H5FD_sec2_t *file = (H5FD_sec2_t *)_file;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_set_eoa)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
file->eoa = addr;
@@ -644,7 +644,7 @@ H5FD_sec2_get_eof(const H5FD_t *_file)
{
const H5FD_sec2_t *file = (const H5FD_sec2_t *)_file;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_sec2_get_eof)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(MAX(file->eof, file->eoa))
} /* end H5FD_sec2_get_eof() */
@@ -669,7 +669,7 @@ H5FD_sec2_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void **file_handle)
H5FD_sec2_t *file = (H5FD_sec2_t *)_file;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5FD_sec2_get_handle)
+ FUNC_ENTER_NOAPI_NOINIT
if(!file_handle)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "file handle not valid")
@@ -705,7 +705,7 @@ H5FD_sec2_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id,
H5FD_sec2_t *file = (H5FD_sec2_t *)_file;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FD_sec2_read)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(file && file->pub.cls);
HDassert(buf);
@@ -805,7 +805,7 @@ H5FD_sec2_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id,
H5FD_sec2_t *file = (H5FD_sec2_t *)_file;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FD_sec2_write)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(file && file->pub.cls);
HDassert(buf);
@@ -898,7 +898,7 @@ H5FD_sec2_truncate(H5FD_t *_file, hid_t UNUSED dxpl_id, hbool_t UNUSED closing)
H5FD_sec2_t *file = (H5FD_sec2_t *)_file;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FD_sec2_truncate)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(file);
diff --git a/src/H5FDspace.c b/src/H5FDspace.c
index 9895938..deb2153 100644
--- a/src/H5FDspace.c
+++ b/src/H5FDspace.c
@@ -102,7 +102,7 @@ DESCRIPTION
static herr_t
H5FD_space_init_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FD_space_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5FD_init())
} /* H5FD_space_init_interface() */
@@ -131,7 +131,7 @@ H5FD_extend(H5FD_t *file, H5FD_mem_t type, hbool_t new_block, hsize_t size, hadd
hsize_t extra; /* Extra space to allocate, to align request */
haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FD_extend)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(file);
@@ -199,7 +199,7 @@ H5FD_alloc_real(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, hsize_t size, hadd
{
haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_alloc_real, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI(HADDR_UNDEF)
#ifdef H5FD_ALLOC_DEBUG
HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
#endif /* H5FD_ALLOC_DEBUG */
@@ -255,7 +255,7 @@ H5FD_alloc(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, H5F_t *f, hsize_t size,
{
haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_alloc, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI(HADDR_UNDEF)
/* check args */
HDassert(file);
@@ -295,7 +295,7 @@ H5FD_free_real(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr, hsize
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FD_free_real)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(file);
@@ -380,7 +380,7 @@ H5FD_free(H5FD_t *file, hid_t dxpl_id, H5FD_mem_t type, H5F_t *f, haddr_t addr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_free, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(file);
@@ -426,7 +426,7 @@ H5FD_try_extend(H5FD_t *file, H5FD_mem_t type, H5F_t *f, haddr_t blk_end,
haddr_t eoa; /* End of allocated space in file */
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI(H5FD_try_extend, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(file);
diff --git a/src/H5FL.c b/src/H5FL.c
index a41da2a..aec92ff 100644
--- a/src/H5FL.c
+++ b/src/H5FL.c
@@ -164,13 +164,11 @@ DESCRIPTION
static herr_t
H5FL_init_interface(void)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Nothing currently... */
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5FL_init_interface() */
@@ -195,7 +193,7 @@ H5FL_malloc(size_t mem_size)
{
void *ret_value; /* return value*/
- FUNC_ENTER_NOAPI(H5FL_malloc, NULL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Attempt to allocate the memory requested */
if(NULL==(ret_value=H5MM_malloc(mem_size))) {
@@ -235,7 +233,7 @@ H5FL_reg_init(H5FL_reg_head_t *head)
H5FL_reg_gc_node_t *new_node; /* Pointer to the node for the new list to garbage collect */
herr_t ret_value=SUCCEED; /* return value*/
- FUNC_ENTER_NOAPI_NOINIT(H5FL_reg_init)
+ FUNC_ENTER_NOAPI_NOINIT
/* Allocate a new garbage collection node */
if(NULL == (new_node = (H5FL_reg_gc_node_t *)H5MM_malloc(sizeof(H5FL_reg_gc_node_t))))
@@ -287,7 +285,7 @@ H5FL_reg_free(H5FL_reg_head_t *head, void *obj)
/* NOINIT OK here because this must be called after H5FL_reg_malloc/calloc
* -NAF */
- FUNC_ENTER_NOAPI_NOINIT(H5FL_reg_free)
+ FUNC_ENTER_NOAPI_NOINIT
/* Double check parameters */
HDassert(head);
@@ -372,7 +370,7 @@ H5FL_reg_malloc(H5FL_reg_head_t *head H5FL_TRACK_PARAMS)
{
void *ret_value; /* Pointer to object to return */
- FUNC_ENTER_NOAPI(H5FL_reg_malloc, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@@ -449,7 +447,7 @@ H5FL_reg_calloc(H5FL_reg_head_t *head H5FL_TRACK_PARAMS)
{
void *ret_value; /* Pointer to object to return */
- FUNC_ENTER_NOAPI(H5FL_reg_calloc, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@@ -489,7 +487,7 @@ H5FL_reg_gc_list(H5FL_reg_head_t *head)
void *tmp; /* Temporary node pointer */
size_t total_mem; /* Total memory used on list */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_reg_gc_list)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Calculate the total memory used on this list */
total_mem=head->onlist*head->size;
@@ -541,7 +539,7 @@ H5FL_reg_gc(void)
H5FL_reg_gc_node_t *gc_node; /* Pointer into the list of things to garbage collect */
herr_t ret_value=SUCCEED; /* return value*/
- FUNC_ENTER_NOAPI_NOINIT(H5FL_reg_gc)
+ FUNC_ENTER_NOAPI_NOINIT
/* Walk through all the free lists, free()'ing the nodes */
gc_node=H5FL_reg_gc_head.first;
@@ -593,7 +591,7 @@ H5FL_reg_term(void)
H5FL_reg_gc_node_t *left; /* pointer to garbage collection lists with work left */
H5FL_reg_gc_node_t *tmp; /* Temporary pointer to a garbage collection node */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_reg_term)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if (H5_interface_initialize_g) {
/* Free the nodes on the garbage collection list, keeping nodes with allocations outstanding */
@@ -658,7 +656,7 @@ H5FL_blk_find_list(H5FL_blk_node_t **head, size_t size)
{
H5FL_blk_node_t *temp; /* Temp. pointer to node in the native list */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_blk_find_list)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Find the correct free list */
temp=*head;
@@ -720,7 +718,7 @@ H5FL_blk_create_list(H5FL_blk_node_t **head, size_t size)
H5FL_blk_node_t *temp; /* Temp. pointer to node in the list */
H5FL_blk_node_t *ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5FL_blk_create_list)
+ FUNC_ENTER_NOAPI_NOINIT
/* Allocate room for the new free list node */
if(NULL==(temp=H5FL_MALLOC(H5FL_blk_node_t)))
@@ -771,7 +769,7 @@ H5FL_blk_init(H5FL_blk_head_t *head)
H5FL_blk_gc_node_t *new_node; /* Pointer to the node for the new list to garbage collect */
herr_t ret_value=SUCCEED; /* return value*/
- FUNC_ENTER_NOAPI_NOINIT(H5FL_blk_init)
+ FUNC_ENTER_NOAPI_NOINIT
/* Allocate a new garbage collection node */
if(NULL == (new_node = (H5FL_blk_gc_node_t *)H5MM_malloc(sizeof(H5FL_blk_gc_node_t))))
@@ -814,7 +812,7 @@ H5FL_blk_free_block_avail(H5FL_blk_head_t *head, size_t size)
H5FL_blk_node_t *free_list; /* The free list of nodes of correct size */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FL_blk_free_block_avail, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Double check parameters */
HDassert(head);
@@ -855,7 +853,7 @@ H5FL_blk_malloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS)
H5FL_blk_list_t *temp; /* Temp. ptr to the new native list allocated */
void *ret_value; /* Pointer to the block to return to the user */
- FUNC_ENTER_NOAPI(H5FL_blk_malloc, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@@ -945,7 +943,7 @@ H5FL_blk_calloc(H5FL_blk_head_t *head, size_t size H5FL_TRACK_PARAMS)
{
void *ret_value; /* Pointer to the block to return to the user */
- FUNC_ENTER_NOAPI(H5FL_blk_calloc, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@@ -991,7 +989,7 @@ H5FL_blk_free(H5FL_blk_head_t *head, void *block)
/* NOINIT OK here because this must be called after H5FL_blk_malloc/calloc
* -NAF */
- FUNC_ENTER_NOAPI_NOINIT(H5FL_blk_free)
+ FUNC_ENTER_NOAPI_NOINIT
/* Double check parameters */
HDassert(head);
@@ -1089,7 +1087,7 @@ H5FL_blk_realloc(H5FL_blk_head_t *head, void *block, size_t new_size H5FL_TRACK_
{
void *ret_value=NULL; /* Return value */
- FUNC_ENTER_NOAPI(H5FL_blk_realloc, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@@ -1163,7 +1161,7 @@ H5FL_blk_gc_list(H5FL_blk_head_t *head)
void *next; /* Temp. ptr to the free list list node */
void *temp; /* Temp. ptr to the free list page node */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_blk_gc_list)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Loop through all the nodes in the block free list queue */
while(head->head!=NULL) {
@@ -1226,7 +1224,7 @@ H5FL_blk_gc(void)
H5FL_blk_gc_node_t *gc_node; /* Pointer into the list of things to garbage collect */
herr_t ret_value=SUCCEED; /* return value*/
- FUNC_ENTER_NOAPI_NOINIT(H5FL_blk_gc)
+ FUNC_ENTER_NOAPI_NOINIT
/* Walk through all the free lists, free()'ing the nodes */
gc_node=H5FL_blk_gc_head.first;
@@ -1272,7 +1270,7 @@ H5FL_blk_term(void)
H5FL_blk_gc_node_t *left; /* pointer to garbage collection lists with work left */
H5FL_blk_gc_node_t *tmp; /* Temporary pointer to a garbage collection node */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_blk_term)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Free the nodes on the garbage collection list, keeping nodes with allocations outstanding */
left=NULL;
@@ -1331,7 +1329,7 @@ H5FL_arr_init(H5FL_arr_head_t *head)
size_t u; /* Local index variable */
herr_t ret_value=SUCCEED; /* return value*/
- FUNC_ENTER_NOAPI_NOINIT(H5FL_arr_init)
+ FUNC_ENTER_NOAPI_NOINIT
/* Allocate a new garbage collection node */
if(NULL == (new_node = (H5FL_gc_arr_node_t *)H5MM_malloc(sizeof(H5FL_gc_arr_node_t))))
@@ -1385,7 +1383,7 @@ H5FL_arr_free(H5FL_arr_head_t *head, void *obj)
/* NOINIT OK here because this must be called after H5FL_arr_malloc/calloc
* -NAF */
- FUNC_ENTER_NOAPI_NOINIT(H5FL_arr_free)
+ FUNC_ENTER_NOAPI_NOINIT
/* The H5MM_xfree code allows obj to null */
if (!obj)
@@ -1460,7 +1458,7 @@ H5FL_arr_malloc(H5FL_arr_head_t *head, size_t elem)
void *ret_value; /* Pointer to object to return */
size_t mem_size; /* Size of memory block being recycled */
- FUNC_ENTER_NOAPI(H5FL_arr_malloc, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@@ -1533,7 +1531,7 @@ H5FL_arr_calloc(H5FL_arr_head_t *head, size_t elem)
{
void *ret_value; /* Pointer to object to return */
- FUNC_ENTER_NOAPI(H5FL_arr_calloc, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@@ -1571,7 +1569,7 @@ H5FL_arr_realloc(H5FL_arr_head_t *head, void * obj, size_t new_elem)
{
void *ret_value; /* Pointer to object to return */
- FUNC_ENTER_NOAPI(H5FL_arr_realloc, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@@ -1635,7 +1633,7 @@ H5FL_arr_gc_list(H5FL_arr_head_t *head)
unsigned u; /* Counter for array of free lists */
size_t total_mem; /* Total memory used on list */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_arr_gc_list)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Walk through the array of free lists */
for(u=0; u<(unsigned)head->maxelem; u++) {
@@ -1695,7 +1693,7 @@ H5FL_arr_gc(void)
H5FL_gc_arr_node_t *gc_arr_node; /* Pointer into the list of things to garbage collect */
herr_t ret_value=SUCCEED; /* return value*/
- FUNC_ENTER_NOAPI_NOINIT(H5FL_arr_gc)
+ FUNC_ENTER_NOAPI_NOINIT
/* Walk through all the free lists, free()'ing the nodes */
gc_arr_node=H5FL_arr_gc_head.first;
@@ -1741,7 +1739,7 @@ H5FL_arr_term(void)
H5FL_gc_arr_node_t *left; /* pointer to garbage collection lists with work left */
H5FL_gc_arr_node_t *tmp; /* Temporary pointer to a garbage collection node */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_arr_term)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Free the nodes on the garbage collection list, keeping nodes with allocations outstanding */
left=NULL;
@@ -1799,7 +1797,7 @@ H5FL_seq_free(H5FL_seq_head_t *head, void *obj)
{
/* NOINIT OK here because this must be called after H5FL_seq_malloc/calloc
* -NAF */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_seq_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Double check parameters */
HDassert(head);
@@ -1835,7 +1833,7 @@ H5FL_seq_malloc(H5FL_seq_head_t *head, size_t elem H5FL_TRACK_PARAMS)
{
void *ret_value; /* Pointer to object to return */
- FUNC_ENTER_NOAPI(H5FL_seq_malloc, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@@ -1869,7 +1867,7 @@ H5FL_seq_calloc(H5FL_seq_head_t *head, size_t elem H5FL_TRACK_PARAMS)
{
void *ret_value; /* Pointer to object to return */
- FUNC_ENTER_NOAPI(H5FL_seq_calloc, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@@ -1903,7 +1901,7 @@ H5FL_seq_realloc(H5FL_seq_head_t *head, void * obj, size_t new_elem H5FL_TRACK_P
{
void *ret_value; /* Pointer to object to return */
- FUNC_ENTER_NOAPI(H5FL_seq_realloc, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Double check parameters */
HDassert(head);
@@ -1942,7 +1940,7 @@ H5FL_fac_init(size_t size)
H5FL_fac_head_t *factory = NULL; /* Pointer to new block factory */
H5FL_fac_head_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FL_fac_init, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Sanity check */
HDassert(size > 0);
@@ -2018,7 +2016,7 @@ H5FL_fac_free(H5FL_fac_head_t *head, void *obj)
void *ret_value=NULL; /* Return value */
/* NOINIT OK here because this must be called after H5FL_fac_init -NAF */
- FUNC_ENTER_NOAPI_NOINIT(H5FL_fac_free)
+ FUNC_ENTER_NOAPI_NOINIT
/* Double check parameters */
HDassert(head);
@@ -2107,7 +2105,7 @@ H5FL_fac_malloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS)
void *ret_value; /* Pointer to object to return */
/* NOINIT OK here because this must be called after H5FL_fac_init -NAF */
- FUNC_ENTER_NOAPI_NOINIT(H5FL_fac_malloc)
+ FUNC_ENTER_NOAPI_NOINIT
/* Double check parameters */
HDassert(head);
@@ -2184,7 +2182,7 @@ H5FL_fac_calloc(H5FL_fac_head_t *head H5FL_TRACK_PARAMS)
void *ret_value; /* Pointer to object to return */
/* NOINIT OK here because this must be called after H5FL_fac_init -NAF */
- FUNC_ENTER_NOAPI_NOINIT(H5FL_fac_calloc)
+ FUNC_ENTER_NOAPI_NOINIT
/* Double check parameters */
HDassert(head);
@@ -2223,7 +2221,7 @@ H5FL_fac_gc_list(H5FL_fac_head_t *head)
void *tmp; /* Temporary node pointer */
size_t total_mem; /* Total memory used on list */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_fac_gc_list)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Calculate the total memory used on this list */
total_mem=head->onlist*head->size;
@@ -2273,7 +2271,7 @@ H5FL_fac_gc(void)
H5FL_fac_gc_node_t *gc_node; /* Pointer into the list of things to garbage collect */
herr_t ret_value=SUCCEED; /* return value*/
- FUNC_ENTER_NOAPI_NOINIT(H5FL_fac_gc)
+ FUNC_ENTER_NOAPI_NOINIT
/* Walk through all the free lists, free()'ing the nodes */
gc_node=H5FL_fac_gc_head.first;
@@ -2319,7 +2317,7 @@ H5FL_fac_term(H5FL_fac_head_t *factory)
herr_t ret_value = SUCCEED; /* Return value */
/* NOINIT OK here because this must be called after H5FL_fac_init -NAF */
- FUNC_ENTER_NOAPI_NOINIT(H5FL_fac_term)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(factory);
@@ -2379,7 +2377,7 @@ H5FL_fac_term_all(void)
{
H5FL_fac_gc_node_t *tmp; /* Temporary pointer to a garbage collection node */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_fac_term_all)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Free the nodes on the garbage collection list */
while(H5FL_fac_gc_head.first != NULL) {
@@ -2425,7 +2423,7 @@ H5FL_garbage_coll(void)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5FL_garbage_coll, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Garbage collect the free lists for array objects */
if(H5FL_arr_gc()<0)
@@ -2486,7 +2484,7 @@ H5FL_set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_l
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5FL_set_free_list_limits, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Set the limit variables */
/* limit on all regular free lists */
@@ -2535,7 +2533,7 @@ H5FL_term_interface(void)
{
int ret_value=0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FL_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Garbage collect any nodes on the free lists */
(void)H5FL_garbage_coll();
diff --git a/src/H5FO.c b/src/H5FO.c
index cae3d6d..ace66ec 100644
--- a/src/H5FO.c
+++ b/src/H5FO.c
@@ -75,7 +75,7 @@ H5FO_create(const H5F_t *f)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FO_create,FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
assert(f);
@@ -116,7 +116,7 @@ H5FO_opened(const H5F_t *f, haddr_t addr)
H5FO_open_obj_t *open_obj; /* Information about open object */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5FO_opened)
+ FUNC_ENTER_NOAPI_NOERR
/* Sanity check */
HDassert(f);
@@ -163,7 +163,7 @@ H5FO_insert(const H5F_t *f, haddr_t addr, void *obj, hbool_t delete_flag)
H5FO_open_obj_t *open_obj; /* Information about open object */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FO_insert,FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
assert(f);
@@ -215,7 +215,7 @@ H5FO_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr)
H5FO_open_obj_t *open_obj; /* Information about open object */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FO_delete,FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@@ -266,7 +266,7 @@ H5FO_mark(const H5F_t *f, haddr_t addr, hbool_t deleted)
H5FO_open_obj_t *open_obj; /* Information about open object */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5FO_mark)
+ FUNC_ENTER_NOAPI_NOERR
/* Sanity check */
assert(f);
@@ -310,7 +310,7 @@ H5FO_marked(const H5F_t *f, haddr_t addr)
H5FO_open_obj_t *open_obj; /* Information about open object */
hbool_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5FO_marked)
+ FUNC_ENTER_NOAPI_NOERR
/* Sanity check */
HDassert(f);
@@ -349,7 +349,7 @@ H5FO_dest(const H5F_t *f)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FO_dest,FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
assert(f);
@@ -394,7 +394,7 @@ H5FO_top_create(H5F_t *f)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FO_top_create, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@@ -433,7 +433,7 @@ H5FO_top_incr(const H5F_t *f, haddr_t addr)
H5FO_obj_count_t *obj_count; /* Ref. count for object */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FO_top_incr, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@@ -488,7 +488,7 @@ H5FO_top_decr(const H5F_t *f, haddr_t addr)
H5FO_obj_count_t *obj_count; /* Ref. count for object */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FO_top_decr, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@@ -542,7 +542,7 @@ H5FO_top_count(const H5F_t *f, haddr_t addr)
H5FO_obj_count_t *obj_count; /* Ref. count for object */
hsize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FO_top_count)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@@ -582,7 +582,7 @@ H5FO_top_dest(H5F_t *f)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FO_top_dest, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
diff --git a/src/H5FS.c b/src/H5FS.c
index d7a4950..73420d2 100644
--- a/src/H5FS.c
+++ b/src/H5FS.c
@@ -109,7 +109,7 @@ H5FS_create(H5F_t *f, hid_t dxpl_id, haddr_t *fs_addr, const H5FS_create_t *fs_c
H5FS_t *fspace = NULL; /* New free space structure */
H5FS_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FS_create, NULL)
+ FUNC_ENTER_NOAPI(NULL)
#ifdef H5FS_DEBUG
HDfprintf(stderr, "%s: Creating free space manager, nclasses = %Zu\n", FUNC, nclasses);
#endif /* H5FS_DEBUG */
@@ -198,7 +198,7 @@ H5FS_open(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr, size_t nclasses,
H5FS_hdr_cache_ud_t cache_udata; /* User-data for metadata cache callback */
H5FS_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5FS_open, NULL)
+ FUNC_ENTER_NOAPI(NULL)
#ifdef H5FS_DEBUG
HDfprintf(stderr, "%s: Opening free space manager, fs_addr = %a, nclasses = %Zu\n", FUNC, fs_addr, nclasses);
#endif /* H5FS_DEBUG */
@@ -267,7 +267,7 @@ H5FS_delete(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr)
H5FS_hdr_cache_ud_t cache_udata; /* User-data for metadata cache callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FS_delete, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
#ifdef H5FS_DEBUG
HDfprintf(stderr, "%s: Deleting free space manager, fs_addr = %a\n", FUNC, fs_addr);
#endif /* H5FS_DEBUG */
@@ -358,7 +358,7 @@ H5FS_close(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FS_close, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
HDassert(f);
@@ -525,7 +525,7 @@ H5FS_new(const H5F_t *f, size_t nclasses, const H5FS_section_class_t *classes[],
size_t u; /* Local index variable */
H5FS_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_new)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(nclasses == 0 || (nclasses > 0 && classes));
@@ -600,7 +600,7 @@ done:
herr_t
H5FS_size(const H5F_t *f, const H5FS_t *fspace, hsize_t *meta_size)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5FS_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -634,7 +634,7 @@ H5FS_incr(H5FS_t *fspace)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FS_incr, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
#ifdef H5FS_DEBUG
HDfprintf(stderr, "%s: Entering, fpace->addr = %a, fspace->rc = %u\n", FUNC, fspace->addr, fspace->rc);
#endif /* H5FS_DEBUG */
@@ -675,7 +675,7 @@ H5FS_decr(H5FS_t *fspace)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FS_decr, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
#ifdef H5FS_DEBUG
HDfprintf(stderr, "%s: Entering, fpace->addr = %a, fspace->rc = %u\n", FUNC, fspace->addr, fspace->rc);
#endif /* H5FS_DEBUG */
@@ -723,7 +723,7 @@ H5FS_dirty(H5FS_t *fspace)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_dirty)
+ FUNC_ENTER_NOAPI_NOINIT
#ifdef QAK
HDfprintf(stderr, "%s: Marking free space header as dirty\n", FUNC);
#endif /* QAK */
@@ -761,7 +761,7 @@ H5FS_hdr_dest(H5FS_t *fspace)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_hdr_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -807,7 +807,7 @@ H5FS_sinfo_free_sect_cb(void *_sect, void UNUSED *key, void *op_data)
H5FS_section_info_t *sect = (H5FS_section_info_t *)_sect; /* Section to free */
const H5FS_sinfo_t *sinfo = (const H5FS_sinfo_t *)op_data; /* Free space manager for section */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_sinfo_free_sect_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(sect);
HDassert(sinfo);
@@ -838,7 +838,7 @@ H5FS_sinfo_free_node_cb(void *item, void UNUSED *key, void *op_data)
{
H5FS_node_t *fspace_node = (H5FS_node_t *)item; /* Temporary pointer to free space list node */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_sinfo_free_node_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(fspace_node);
HDassert(op_data);
@@ -872,7 +872,7 @@ H5FS_sinfo_dest(H5FS_sinfo_t *sinfo)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sinfo_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -930,7 +930,7 @@ done:
herr_t
H5FS_assert(const H5FS_t *fspace)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_assert)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifndef QAK
HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", "H5FS_assert", fspace->tot_sect_count);
#endif /* QAK */
diff --git a/src/H5FScache.c b/src/H5FScache.c
index b681b2c..9450c4c 100644
--- a/src/H5FScache.c
+++ b/src/H5FScache.c
@@ -158,7 +158,7 @@ H5FS_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
unsigned nclasses; /* Number of section classes */
H5FS_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_hdr_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -285,7 +285,7 @@ H5FS_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5F
uint8_t hdr_buf[H5FS_HDR_BUF_SIZE]; /* Buffer for header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_hdr_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -447,7 +447,7 @@ H5FS_cache_hdr_dest(H5F_t *f, H5FS_t *fspace)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_hdr_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(fspace);
@@ -496,7 +496,7 @@ H5FS_cache_hdr_clear(H5F_t *f, H5FS_t *fspace, hbool_t destroy)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_hdr_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -533,7 +533,7 @@ done:
static herr_t
H5FS_cache_hdr_size(const H5F_t UNUSED *f, const H5FS_t *fspace, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_cache_hdr_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(f);
@@ -574,7 +574,7 @@ H5FS_cache_sinfo_load(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, void *_udata
uint32_t computed_chksum; /* Computed metadata checksum value */
H5FS_sinfo_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_sinfo_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -731,7 +731,7 @@ H5FS_sinfo_serialize_sect_cb(void *_item, void UNUSED *key, void *_udata)
H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sinfo_serialize_sect_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect);
@@ -786,7 +786,7 @@ H5FS_sinfo_serialize_node_cb(void *_item, void UNUSED *key, void *_udata)
H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sinfo_serialize_node_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace_node);
@@ -830,7 +830,7 @@ H5FS_cache_sinfo_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_sinfo_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -928,7 +928,7 @@ H5FS_cache_sinfo_dest(H5F_t *f, H5FS_sinfo_t *sinfo)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_sinfo_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(sinfo);
@@ -974,7 +974,7 @@ H5FS_cache_sinfo_clear(H5F_t *f, H5FS_sinfo_t *sinfo, hbool_t destroy)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_sinfo_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1011,7 +1011,7 @@ done:
static herr_t
H5FS_cache_sinfo_size(const H5F_t UNUSED *f, const H5FS_sinfo_t *sinfo, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_cache_sinfo_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(sinfo);
diff --git a/src/H5FSdbg.c b/src/H5FSdbg.c
index e9f96d1..570909b 100644
--- a/src/H5FSdbg.c
+++ b/src/H5FSdbg.c
@@ -100,7 +100,7 @@ H5FS_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int
H5FS_hdr_cache_ud_t cache_udata; /* User-data for cache callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FS_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -197,7 +197,7 @@ H5FS_sect_debug(const H5FS_t *fspace, const H5FS_section_info_t *sect, FILE *str
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FS_sect_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -240,7 +240,7 @@ H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, FILE *stream, int
H5FS_hdr_cache_ud_t cache_udata; /* User-data for cache callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FS_sects_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
diff --git a/src/H5FSsection.c b/src/H5FSsection.c
index fe3b722..a32d8ce 100644
--- a/src/H5FSsection.c
+++ b/src/H5FSsection.c
@@ -129,7 +129,7 @@ H5FS_sinfo_new(H5F_t *f, H5FS_t *fspace)
H5FS_sinfo_t *sinfo = NULL; /* Section information struct created */
H5FS_sinfo_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sinfo_new)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(f);
@@ -209,7 +209,7 @@ H5FS_sinfo_lock(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5AC_protect_t accmode)
H5FS_sinfo_cache_ud_t cache_udata; /* User-data for cache callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sinfo_lock)
+ FUNC_ENTER_NOAPI_NOINIT
#ifdef H5FS_SINFO_DEBUG
HDfprintf(stderr, "%s: Called, fspace->addr = %a, fspace->sinfo = %p, fspace->sect_addr = %a\n", FUNC, fspace->addr, fspace->sinfo, fspace->sect_addr);
HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n", FUNC, fspace->alloc_sect_size, fspace->sect_size);
@@ -314,7 +314,7 @@ H5FS_sinfo_unlock(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, hbool_t modified)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sinfo_unlock)
+ FUNC_ENTER_NOAPI_NOINIT
#ifdef H5FS_SINFO_DEBUG
HDfprintf(stderr, "%s: Called, modified = %t, fspace->addr = %a, fspace->sect_addr = %a\n", FUNC, modified, fspace->addr, fspace->sect_addr);
HDfprintf(stderr, "%s: fspace->sinfo_lock_count = %u, fspace->sinfo_modified = %t, fspace->sinfo_protected = %t\n", FUNC, fspace->sinfo_lock_count, fspace->sinfo_modified, fspace->sinfo_protected);
@@ -473,7 +473,7 @@ HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
static herr_t
H5FS_sect_serialize_size(H5FS_t *fspace)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_sect_serialize_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(fspace);
@@ -541,7 +541,7 @@ H5FS_sect_increase(H5FS_t *fspace, const H5FS_section_class_t *cls,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_increase)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@@ -603,7 +603,7 @@ H5FS_sect_decrease(H5FS_t *fspace, const H5FS_section_class_t *cls)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_decrease)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@@ -661,7 +661,7 @@ H5FS_size_node_decr(H5FS_sinfo_t *sinfo, unsigned bin, H5FS_node_t *fspace_node,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_size_node_decr)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sinfo);
@@ -753,7 +753,7 @@ H5FS_sect_unlink_size(H5FS_sinfo_t *sinfo, const H5FS_section_class_t *cls,
unsigned bin; /* Bin to put the free space section in */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_unlink_size)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sinfo);
@@ -807,7 +807,7 @@ H5FS_sect_unlink_rest(H5FS_t *fspace, const H5FS_section_class_t *cls,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_unlink_rest)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@@ -861,7 +861,7 @@ H5FS_sect_remove_real(H5FS_t *fspace, H5FS_section_info_t *sect)
const H5FS_section_class_t *cls; /* Class of section */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_remove_real)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@@ -904,7 +904,7 @@ H5FS_sect_remove(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
hbool_t sinfo_valid = FALSE; /* Whether the section info is valid */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_remove)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(f);
@@ -951,7 +951,7 @@ H5FS_sect_link_size(H5FS_sinfo_t *sinfo, const H5FS_section_class_t *cls,
unsigned bin; /* Bin to put the free space section in */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_link_size)
+ FUNC_ENTER_NOAPI_NOINIT
#ifdef QAK
HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a\n", FUNC, sect->size, sect->addr);
#endif /* QAK */
@@ -1058,7 +1058,7 @@ H5FS_sect_link_rest(H5FS_t *fspace, const H5FS_section_class_t *cls,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_link_rest)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@@ -1109,7 +1109,7 @@ H5FS_sect_link(H5FS_t *fspace, H5FS_section_info_t *sect, unsigned flags)
const H5FS_section_class_t *cls; /* Class of section */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_link)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@@ -1171,7 +1171,7 @@ H5FS_sect_merge(H5FS_t *fspace, H5FS_section_info_t **sect, void *op_data)
htri_t status; /* Status value */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_merge)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@@ -1380,7 +1380,7 @@ H5FS_sect_add(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_section_info_t *sect
hbool_t sinfo_modified = FALSE; /* Whether the section info was modified */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5FS_sect_add, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
#ifdef H5FS_SINFO_DEBUG
HDfprintf(stderr, "%s: *sect = {%a, %Hu, %u, %s}\n", FUNC, sect->addr, sect->size, sect->type, (sect->state == H5FS_SECT_LIVE ? "H5FS_SECT_LIVE" : "H5FS_SECT_SERIALIZED"));
@@ -1468,7 +1468,7 @@ H5FS_sect_try_extend(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, haddr_t addr,
hbool_t sinfo_modified = FALSE; /* Whether the section info was modified */
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI(H5FS_sect_try_extend, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
#ifdef H5FS_SINFO_DEBUG
HDfprintf(stderr, "%s: addr = %a, size = %Hu, extra_requested = %hu\n", FUNC, addr, size, extra_requested);
@@ -1609,7 +1609,7 @@ H5FS_sect_find_node(H5FS_t *fspace, hsize_t request, H5FS_section_info_t **node)
const H5FS_section_class_t *cls; /* Class of section */
hsize_t alignment;
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_find_node)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@@ -1761,7 +1761,7 @@ H5FS_sect_find(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, hsize_t request,
hbool_t sinfo_modified = FALSE; /* Whether the section info was modified */
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI(H5FS_sect_find, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
#ifdef QAK
HDfprintf(stderr, "%s: request = %Hu\n", FUNC, request);
@@ -1833,7 +1833,7 @@ H5FS_iterate_sect_cb(void *_item, void UNUSED *key, void *_udata)
H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_iterate_sect_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect_info);
@@ -1871,7 +1871,7 @@ H5FS_iterate_node_cb(void *_item, void UNUSED *key, void *_udata)
H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_iterate_node_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace_node);
@@ -1909,7 +1909,7 @@ H5FS_sect_iterate(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_operator_t op, v
hbool_t sinfo_valid = FALSE; /* Whether the section info is valid */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_iterate)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@@ -1972,7 +1972,7 @@ done:
herr_t
H5FS_sect_stats(const H5FS_t *fspace, hsize_t *tot_space, hsize_t *nsects)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5FS_sect_stats)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(fspace);
@@ -2012,7 +2012,7 @@ H5FS_sect_change_class(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
hbool_t sinfo_valid = FALSE; /* Whether the section info is valid */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_change_class)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(fspace);
@@ -2177,7 +2177,7 @@ H5FS_sect_assert(const H5FS_t *fspace)
{
hsize_t separate_obj; /* The number of separate objects managed */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_sect_assert)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifndef QAK
HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", "H5FS_sect_assert", fspace->tot_sect_count);
#endif /* QAK */
diff --git a/src/H5FSstat.c b/src/H5FSstat.c
index cc4822a..66c5495 100644
--- a/src/H5FSstat.c
+++ b/src/H5FSstat.c
@@ -84,7 +84,7 @@
herr_t
H5FS_stat_info(const H5F_t *f, const H5FS_t *frsp, H5FS_stat_t *stats)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_stat_info)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(frsp);
@@ -103,3 +103,4 @@ H5FS_stat_info(const H5F_t *f, const H5FS_t *frsp, H5FS_stat_t *stats)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5FS_stat_info() */
+
diff --git a/src/H5FStest.c b/src/H5FStest.c
index af9eaec..63ba94c 100644
--- a/src/H5FStest.c
+++ b/src/H5FStest.c
@@ -85,7 +85,7 @@
herr_t
H5FS_get_cparam_test(const H5FS_t *frsp, H5FS_create_t *cparam)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_get_cparam_test)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(frsp);
@@ -100,6 +100,7 @@ H5FS_get_cparam_test(const H5FS_t *frsp, H5FS_create_t *cparam)
FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5FS_get_cparam_test() */
+
/*-------------------------------------------------------------------------
* Function: H5FS_cmp_cparam_test
*
@@ -118,7 +119,7 @@ H5FS_cmp_cparam_test(const H5FS_create_t *cparam1, const H5FS_create_t *cparam2)
{
int ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_cmp_cparam_test)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(cparam1);
@@ -152,3 +153,4 @@ H5FS_cmp_cparam_test(const H5FS_create_t *cparam1, const H5FS_create_t *cparam2)
done:
FUNC_LEAVE_NOAPI(ret_value)
} /* H5FS_cmp_cparam_test */
+
diff --git a/src/H5Faccum.c b/src/H5Faccum.c
index 3384be0..1c2abd9 100644
--- a/src/H5Faccum.c
+++ b/src/H5Faccum.c
@@ -117,7 +117,7 @@ H5F_accum_read(const H5F_t *f, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_accum_read, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@@ -278,7 +278,7 @@ H5F_accum_adjust(H5F_meta_accum_t *accum, H5FD_t *lf, hid_t dxpl_id,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_accum_adjust)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(accum);
HDassert(lf);
@@ -417,7 +417,7 @@ H5F_accum_write(const H5F_t *f, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_accum_write, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@@ -833,7 +833,7 @@ H5F_accum_free(H5F_t *f, hid_t dxpl_id, H5FD_mem_t UNUSED type, haddr_t addr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_accum_free, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
@@ -989,7 +989,7 @@ H5F_accum_flush(const H5F_t *f, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_accum_flush, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@@ -1027,7 +1027,7 @@ H5F_accum_reset(const H5F_t *f, hid_t dxpl_id, hbool_t flush)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_accum_reset, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
diff --git a/src/H5Fcwfs.c b/src/H5Fcwfs.c
index cc3cbd6..d0688f7 100644
--- a/src/H5Fcwfs.c
+++ b/src/H5Fcwfs.c
@@ -109,7 +109,7 @@ H5F_cwfs_add(H5F_t *f, H5HG_heap_t *heap)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_cwfs_add, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
@@ -167,7 +167,7 @@ H5F_cwfs_find_free_heap(H5F_t *f, hid_t dxpl_id, size_t need, haddr_t *addr)
hbool_t found = FALSE; /* Flag to indicate a heap with enough space was found */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_cwfs_find_free_heap, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
@@ -261,7 +261,7 @@ H5F_cwfs_advance_heap(H5F_t *f, H5HG_heap_t *heap, hbool_t add_heap)
{
unsigned u; /* Local index variable */
- FUNC_ENTER_NOAPI_NOFUNC(H5F_cwfs_advance_heap)
+ FUNC_ENTER_NOAPI_NOERR
/* Check args */
HDassert(f);
@@ -303,7 +303,7 @@ H5F_cwfs_remove_heap(H5F_file_t *shared, H5HG_heap_t *heap)
{
unsigned u; /* Local index variable */
- FUNC_ENTER_NOAPI_NOFUNC(H5F_cwfs_remove_heap)
+ FUNC_ENTER_NOAPI_NOERR
/* Check args */
HDassert(shared);
diff --git a/src/H5Fdbg.c b/src/H5Fdbg.c
index 0ae0eb1..40d24e5 100644
--- a/src/H5Fdbg.c
+++ b/src/H5Fdbg.c
@@ -53,7 +53,7 @@ H5F_debug(H5F_t *f, FILE *stream, int indent, int fwidth)
hsize_t userblock_size; /* Userblock size */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -123,13 +123,13 @@ H5F_debug(H5F_t *f, FILE *stream, int indent, int fwidth)
f->shared->root_grp ? "" : "(none)");
if(f->shared->root_grp) {
if(f->shared->sblock->root_ent) /* Use real root group symbol table entry */
- H5G_ent_debug(f->shared->sblock->root_ent, stream, indent + 3, MAX(0, fwidth - 3), NULL);
+ H5G__ent_debug(f->shared->sblock->root_ent, stream, indent + 3, MAX(0, fwidth - 3), NULL);
else {
H5O_loc_t *root_oloc; /* Root object location */
H5G_entry_t root_ent; /* Constructed root symbol table entry */
/* Reset the root group entry */
- H5G_ent_reset(&root_ent);
+ H5G__ent_reset(&root_ent);
/* Build up a simulated root group symbol table entry */
root_oloc = H5G_oloc(f->shared->root_grp);
@@ -138,7 +138,7 @@ H5F_debug(H5F_t *f, FILE *stream, int indent, int fwidth)
root_ent.header = root_oloc->addr;
/* Display root group symbol table entry info */
- H5G_ent_debug(&root_ent, stream, indent + 3, MAX(0, fwidth - 3), NULL);
+ H5G__ent_debug(&root_ent, stream, indent + 3, MAX(0, fwidth - 3), NULL);
} /* end else */
} /* end if */
diff --git a/src/H5Fefc.c b/src/H5Fefc.c
index 1dc7f70..08d27a1 100644
--- a/src/H5Fefc.c
+++ b/src/H5Fefc.c
@@ -95,7 +95,7 @@ H5F_efc_create(unsigned max_nfiles)
H5F_efc_t *efc = NULL; /* EFC object */
H5F_efc_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5F_efc_create, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Sanity checks */
HDassert(max_nfiles > 0);
@@ -149,7 +149,7 @@ H5F_efc_open(H5F_t *parent, const char *name, unsigned flags, hid_t fcpl_id,
hbool_t open_file = FALSE; /* Whether ent->file needs to be closed in case of error */
H5F_t *ret_value = NULL; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_efc_open)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(parent);
@@ -338,7 +338,7 @@ H5F_efc_close(H5F_t *parent, H5F_t *file)
H5F_efc_ent_t *ent = NULL; /* Entry for target file in efc */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_efc_close)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(parent);
@@ -396,7 +396,7 @@ done:
unsigned
H5F_efc_max_nfiles(H5F_efc_t *efc)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_efc_max_nfiles)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(efc);
HDassert(efc->max_nfiles > 0);
@@ -427,7 +427,7 @@ H5F_efc_release(H5F_efc_t *efc)
H5F_efc_ent_t *prev_ent = NULL; /* Previous EFC entry */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_efc_release)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(efc);
@@ -487,7 +487,7 @@ H5F_efc_destroy(H5F_efc_t *efc)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_efc_destroy)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(efc);
@@ -538,7 +538,7 @@ H5F_efc_remove_ent(H5F_efc_t *efc, H5F_efc_ent_t *ent)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_efc_remove_ent)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(efc);
@@ -605,7 +605,7 @@ H5F_efc_try_close_tag1(H5F_file_t *sf, H5F_file_t **tail)
H5F_efc_ent_t *ent = NULL; /* EFC entry */
H5F_file_t *esf; /* Convenience pointer to ent->file->shared */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_efc_try_close_tag1)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity checks */
HDassert(sf);
@@ -679,7 +679,7 @@ H5F_efc_try_close_tag2(H5F_file_t *sf, H5F_file_t **tail)
H5F_efc_ent_t *ent = NULL; /* EFC entry */
H5F_file_t *esf; /* Convenience pointer to ent->file->shared */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_efc_try_close_tag2)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity checks */
HDassert(sf);
@@ -790,7 +790,7 @@ H5F_efc_try_close(H5F_t *f)
H5F_file_t *next; /* Temporary file pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_efc_try_close)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(f);
diff --git a/src/H5Ffake.c b/src/H5Ffake.c
index f71d373..af048bc 100644
--- a/src/H5Ffake.c
+++ b/src/H5Ffake.c
@@ -43,7 +43,7 @@ DESCRIPTION
static herr_t
H5F_init_fake_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_init_fake_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5F_init())
} /* H5F_init_fake_interface() */
@@ -72,7 +72,7 @@ H5F_fake_alloc(uint8_t sizeof_size)
H5F_t *f = NULL; /* Pointer to fake file struct */
H5F_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5F_fake_alloc, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Allocate faked file struct */
if(NULL == (f = H5FL_CALLOC(H5F_t)))
@@ -114,7 +114,7 @@ done:
herr_t
H5F_fake_free(H5F_t *f)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_fake_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Free faked file struct */
if(f) {
diff --git a/src/H5Fio.c b/src/H5Fio.c
index c8c75b2..83c86ea 100644
--- a/src/H5Fio.c
+++ b/src/H5Fio.c
@@ -97,7 +97,7 @@ H5F_block_read(const H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_block_read, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@@ -138,7 +138,7 @@ H5F_block_write(const H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_block_write, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
#ifdef QAK
HDfprintf(stderr, "%s: write to addr = %a, size = %Zu\n", FUNC, addr, size);
#endif /* QAK */
diff --git a/src/H5Fmount.c b/src/H5Fmount.c
index 707495a..ee7af97 100644
--- a/src/H5Fmount.c
+++ b/src/H5Fmount.c
@@ -52,7 +52,7 @@ DESCRIPTION
static herr_t
H5F_init_mount_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_init_mount_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5F_init())
} /* H5F_init_mount_interface() */
@@ -76,7 +76,7 @@ H5F_close_mounts(H5F_t *f)
unsigned u; /* Local index */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_close_mounts, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
@@ -141,7 +141,7 @@ H5F_mount(H5G_loc_t *loc, const char *name, H5F_t *child,
H5G_loc_t root_loc; /* Group location of root of file to mount */
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_mount)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(loc);
HDassert(name && *name);
@@ -307,7 +307,7 @@ H5F_unmount(H5G_loc_t *loc, const char *name, hid_t dxpl_id)
int child_idx; /* Index of child in parent's mtab */
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_unmount)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(loc);
HDassert(name && *name);
@@ -441,7 +441,7 @@ H5F_is_mount(const H5F_t *file)
{
hbool_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_is_mount)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(file);
@@ -474,7 +474,7 @@ H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id)
H5F_t *child = NULL;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Fmount, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*sii", loc_id, name, child_id, plist_id);
/* Check arguments */
@@ -524,7 +524,7 @@ H5Funmount(hid_t loc_id, const char *name)
H5G_loc_t loc;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Funmount, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*s", loc_id, name);
/* Check args */
@@ -560,7 +560,7 @@ H5F_mount_count_ids_recurse(H5F_t *f, unsigned *nopen_files, unsigned *nopen_obj
{
unsigned u; /* Local index value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_mount_count_ids_recurse)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@@ -608,9 +608,7 @@ H5F_mount_count_ids_recurse(H5F_t *f, unsigned *nopen_files, unsigned *nopen_obj
herr_t
H5F_mount_count_ids(H5F_t *f, unsigned *nopen_files, unsigned *nopen_objs)
{
- herr_t ret_value = SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5F_mount_count_ids, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@@ -624,8 +622,7 @@ H5F_mount_count_ids(H5F_t *f, unsigned *nopen_files, unsigned *nopen_objs)
/* Count open IDs in the hierarchy */
H5F_mount_count_ids_recurse(f, nopen_files, nopen_objs);
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5F_mount_count_ids() */
@@ -648,7 +645,7 @@ H5F_flush_mounts_recurse(H5F_t *f, hid_t dxpl_id)
unsigned u; /* Index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_flush_mounts_recurse)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -688,7 +685,7 @@ H5F_flush_mounts(H5F_t *f, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_flush_mounts, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@@ -729,7 +726,7 @@ H5F_traverse_mount(H5O_loc_t *oloc/*in,out*/)
H5O_loc_t *mnt_oloc = NULL; /* Object location for mount points */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_traverse_mount, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(oloc);
diff --git a/src/H5Fmpi.c b/src/H5Fmpi.c
index c90ad7c..4fd04f6 100644
--- a/src/H5Fmpi.c
+++ b/src/H5Fmpi.c
@@ -98,7 +98,7 @@ H5F_mpi_get_rank(const H5F_t *f)
{
int ret_value;
- FUNC_ENTER_NOAPI(H5F_mpi_get_rank, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
assert(f && f->shared);
@@ -132,7 +132,7 @@ H5F_mpi_get_comm(const H5F_t *f)
{
MPI_Comm ret_value;
- FUNC_ENTER_NOAPI(H5F_mpi_get_comm, MPI_COMM_NULL)
+ FUNC_ENTER_NOAPI(MPI_COMM_NULL)
assert(f && f->shared);
@@ -166,7 +166,7 @@ H5F_mpi_get_size(const H5F_t *f)
{
int ret_value;
- FUNC_ENTER_NOAPI(H5F_mpi_get_size, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
assert(f && f->shared);
diff --git a/src/H5Fquery.c b/src/H5Fquery.c
index 4c05066..c04ba24 100644
--- a/src/H5Fquery.c
+++ b/src/H5Fquery.c
@@ -93,8 +93,8 @@
unsigned
H5F_get_intent(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_intent)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@@ -118,8 +118,8 @@ H5F_get_intent(const H5F_t *f)
char *
H5F_get_open_name(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_open_name)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->open_name);
@@ -144,8 +144,8 @@ H5F_get_open_name(const H5F_t *f)
char *
H5F_get_actual_name(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_actual_name)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->actual_name);
@@ -170,8 +170,8 @@ H5F_get_actual_name(const H5F_t *f)
char *
H5F_get_extpath(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_extpath)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->extpath);
@@ -194,8 +194,8 @@ H5F_get_extpath(const H5F_t *f)
H5F_file_t *
H5F_get_shared(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_shared)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@@ -217,8 +217,8 @@ H5F_get_shared(const H5F_t *f)
hbool_t
H5F_same_shared(const H5F_t *f1, const H5F_t *f2)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_same_shared)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f1);
HDassert(f1->shared);
@@ -243,8 +243,8 @@ H5F_same_shared(const H5F_t *f1, const H5F_t *f2)
unsigned
H5F_get_nopen_objs(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_nopen_objs)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@@ -266,8 +266,8 @@ H5F_get_nopen_objs(const H5F_t *f)
hid_t
H5F_get_file_id(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_file_id)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@@ -289,8 +289,8 @@ H5F_get_file_id(const H5F_t *f)
H5F_t *
H5F_get_parent(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_parent)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@@ -312,8 +312,8 @@ H5F_get_parent(const H5F_t *f)
unsigned
H5F_get_nmounts(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_nmounts)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@@ -339,8 +339,8 @@ H5F_get_nmounts(const H5F_t *f)
hid_t
H5F_get_fcpl(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_fcpl)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -366,8 +366,8 @@ H5F_get_fcpl(const H5F_t *f)
uint8_t
H5F_sizeof_addr(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sizeof_addr)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -393,8 +393,8 @@ H5F_sizeof_addr(const H5F_t *f)
uint8_t
H5F_sizeof_size(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sizeof_size)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -417,8 +417,8 @@ H5F_sizeof_size(const H5F_t *f)
haddr_t
H5F_get_sohm_addr(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_sohm_addr)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -441,8 +441,8 @@ H5F_get_sohm_addr(const H5F_t *f)
unsigned
H5F_get_sohm_vers(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_sohm_vers)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -465,8 +465,8 @@ H5F_get_sohm_vers(const H5F_t *f)
unsigned
H5F_get_sohm_nindexes(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_sohm_nindexes)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -496,8 +496,8 @@ H5F_get_sohm_nindexes(const H5F_t *f)
unsigned
H5F_sym_leaf_k(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sym_leaf_k)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -528,8 +528,8 @@ H5F_sym_leaf_k(const H5F_t *f)
unsigned
H5F_Kvalue(const H5F_t *f, const H5B_class_t *type)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_Kvalue)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -554,8 +554,8 @@ H5F_Kvalue(const H5F_t *f, const H5B_class_t *type)
unsigned
H5F_get_nrefs(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_nrefs)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -585,8 +585,8 @@ H5F_get_nrefs(const H5F_t *f)
size_t
H5F_rdcc_nslots(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_rdcc_nslots)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -616,8 +616,8 @@ H5F_rdcc_nslots(const H5F_t *f)
size_t
H5F_rdcc_nbytes(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_rdcc_nbytes)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -647,8 +647,8 @@ H5F_rdcc_nbytes(const H5F_t *f)
double
H5F_rdcc_w0(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_rdcc_w0)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -674,8 +674,8 @@ H5F_rdcc_w0(const H5F_t *f)
haddr_t
H5F_get_base_addr(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_base_addr)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -706,8 +706,8 @@ H5F_get_base_addr(const H5F_t *f)
H5RC_t *
H5F_grp_btree_shared(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_grp_btree_shared)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -737,8 +737,8 @@ H5F_grp_btree_shared(const H5F_t *f)
size_t
H5F_sieve_buf_size(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sieve_buf_size)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -768,8 +768,8 @@ H5F_sieve_buf_size(const H5F_t *f)
unsigned
H5F_gc_ref(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_gc_ref)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -797,8 +797,8 @@ H5F_gc_ref(const H5F_t *f)
hbool_t
H5F_use_latest_format(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_use_latest_format)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -825,8 +825,8 @@ H5F_use_latest_format(const H5F_t *f)
H5F_close_degree_t
H5F_get_fc_degree(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_fc_degree)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -853,8 +853,8 @@ H5F_get_fc_degree(const H5F_t *f)
hbool_t
H5F_store_msg_crt_idx(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_store_msg_crt_idx)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -880,8 +880,8 @@ H5F_store_msg_crt_idx(const H5F_t *f)
hbool_t
H5F_has_feature(const H5F_t *f, unsigned feature)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_has_feature)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -907,8 +907,8 @@ H5F_has_feature(const H5F_t *f, unsigned feature)
hid_t
H5F_get_driver_id(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_get_driver_id)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -937,7 +937,7 @@ H5F_get_fileno(const H5F_t *f, unsigned long *filenum)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5F_get_fileno, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(f->shared);
@@ -970,7 +970,7 @@ H5F_get_eoa(const H5F_t *f, H5FD_mem_t type)
{
haddr_t ret_value;
- FUNC_ENTER_NOAPI(H5F_get_eoa, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI(HADDR_UNDEF)
HDassert(f);
HDassert(f->shared);
@@ -1003,7 +1003,7 @@ H5F_get_vfd_handle(const H5F_t *file, hid_t fapl, void **file_handle)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_get_vfd_handle, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(file);
@@ -1036,8 +1036,8 @@ done:
hbool_t
H5F_is_tmp_addr(const H5F_t *f, haddr_t addr)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_is_tmp_addr)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
@@ -1064,8 +1064,8 @@ H5F_is_tmp_addr(const H5F_t *f, haddr_t addr)
hbool_t
H5F_use_tmp_space(const H5F_t *f)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_use_tmp_space)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(f->shared);
diff --git a/src/H5Fsfile.c b/src/H5Fsfile.c
index 8144986..95e5ad2 100644
--- a/src/H5Fsfile.c
+++ b/src/H5Fsfile.c
@@ -58,7 +58,7 @@ H5F_sfile_node_t *H5F_sfile_head_g = NULL;
herr_t
H5F_sfile_assert_num(unsigned n)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sfile_assert_num)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(n == 0) {
/* Sanity checking */
@@ -107,7 +107,7 @@ H5F_sfile_add(H5F_file_t *shared)
H5F_sfile_node_t *new_shared; /* New shared file node */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_sfile_add)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(shared);
@@ -149,7 +149,7 @@ H5F_sfile_search(H5FD_t *lf)
H5F_sfile_node_t *curr; /* Current shared file node */
H5F_file_t *ret_value = NULL; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sfile_search)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(lf);
@@ -191,7 +191,7 @@ H5F_sfile_remove(H5F_file_t *shared)
H5F_sfile_node_t *last; /* Last shared file node */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_sfile_remove)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(shared);
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index 4eedfb8..a953271 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -93,7 +93,7 @@ DESCRIPTION
static herr_t
H5F_init_super_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_init_super_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5F_init())
} /* H5F_init_super_interface() */
@@ -123,7 +123,7 @@ H5F_locate_signature(H5FD_t *file, hid_t dxpl_id)
unsigned n, maxpow;
haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_locate_signature)
+ FUNC_ENTER_NOAPI_NOINIT
/* Find the least N such that 2^N is larger than the file size */
if(HADDR_UNDEF == (addr = H5FD_get_eof(file)) || HADDR_UNDEF == (eoa = H5FD_get_eoa(file, H5FD_MEM_SUPER)))
@@ -180,7 +180,7 @@ H5F_super_ext_create(H5F_t *f, hid_t dxpl_id, H5O_loc_t *ext_ptr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_super_ext_create)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -233,7 +233,7 @@ H5F_super_ext_open(H5F_t *f, haddr_t ext_addr, H5O_loc_t *ext_ptr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_super_ext_open)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -272,7 +272,7 @@ H5F_super_ext_close(H5F_t *f, H5O_loc_t *ext_ptr, hid_t dxpl_id,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_super_ext_close)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -327,7 +327,7 @@ H5F_super_read(H5F_t *f, hid_t dxpl_id)
hbool_t dirtied = FALSE; /* Bool for sblock protect call */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOAPI(H5F_super_read, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Find the superblock */
if(HADDR_UNDEF == (super_addr = H5F_locate_signature(f->shared->lf, dxpl_id)))
@@ -401,7 +401,7 @@ H5F_super_init(H5F_t *f, hid_t dxpl_id)
hbool_t ext_created = FALSE; /* Whether the extension has been created */
herr_t ret_value = SUCCEED; /* Return Value */
- FUNC_ENTER_NOAPI(H5F_super_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Allocate space for the superblock */
if(NULL == (sblock = H5FL_CALLOC(H5F_super_t)))
@@ -653,7 +653,7 @@ H5F_super_dirty(H5F_t *f)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_super_dirty, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@@ -685,7 +685,7 @@ done:
herr_t
H5F_super_free(H5F_super_t *sblock)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_super_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(sblock);
@@ -718,7 +718,7 @@ H5F_super_size(H5F_t *f, hid_t dxpl_id, hsize_t *super_size, hsize_t *super_ext_
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_super_size, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
@@ -777,7 +777,7 @@ H5F_super_ext_write_msg(H5F_t *f, hid_t dxpl_id, void *mesg, unsigned id, hbool_
htri_t status; /* Indicate whether the message exists or not */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5F_super_ext_write_msg, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
HDassert(f);
diff --git a/src/H5Fsuper_cache.c b/src/H5Fsuper_cache.c
index 834c1c5..a437451 100644
--- a/src/H5Fsuper_cache.c
+++ b/src/H5Fsuper_cache.c
@@ -129,7 +129,7 @@ H5F_sblock_load(H5F_t *f, hid_t dxpl_id, haddr_t UNUSED addr, void *_udata)
hbool_t *dirtied = (hbool_t *)_udata; /* Set up dirtied out value */
H5F_super_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_sblock_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -599,7 +599,7 @@ H5F_sblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t UNUSED addr,
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5F_sblock_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -797,7 +797,7 @@ H5F_sblock_dest(H5F_t UNUSED *f, H5F_super_t* sblock)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_sblock_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(sblock);
@@ -828,7 +828,7 @@ H5F_sblock_clear(H5F_t *f, H5F_super_t *sblock, hbool_t destroy)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_sblock_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -862,7 +862,7 @@ done:
static herr_t
H5F_sblock_size(const H5F_t *f, const H5F_super_t *sblock, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5F_sblock_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(f);
diff --git a/src/H5Ftest.c b/src/H5Ftest.c
index e2ee606..73b00a6 100644
--- a/src/H5Ftest.c
+++ b/src/H5Ftest.c
@@ -102,7 +102,7 @@ H5F_get_sohm_mesg_count_test(hid_t file_id, unsigned type_id,
H5F_t *file; /* File info */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_get_sohm_mesg_count_test)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
@@ -139,14 +139,14 @@ H5F_check_cached_stab_test(hid_t file_id)
H5F_t *file; /* File info */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_check_cached_stab_test)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file")
/* Verify the cached stab info */
- if(H5G_verify_cached_stab_test(H5G_oloc(file->shared->root_grp), file->shared->sblock->root_ent) < 0)
+ if(H5G__verify_cached_stab_test(H5G_oloc(file->shared->root_grp), file->shared->sblock->root_ent) < 0)
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "unable to verify cached symbol table info")
done:
@@ -173,7 +173,7 @@ H5F_get_maxaddr_test(hid_t file_id, haddr_t *maxaddr)
H5F_t *file; /* File info */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5F_get_maxaddr_test)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(NULL == (file = (H5F_t *)H5I_object_verify(file_id, H5I_FILE)))
diff --git a/src/H5G.c b/src/H5G.c
index a9c28bf..3883ade 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -91,12 +91,8 @@
#include "H5private.h" /* Generic Functions */
#include "H5ACprivate.h" /* Metadata cache */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Fprivate.h" /* File access */
-#include "H5FOprivate.h" /* File objects */
#include "H5Gpkg.h" /* Groups */
#include "H5Iprivate.h" /* IDs */
-#include "H5Lprivate.h" /* Links */
-#include "H5MMprivate.h" /* Memory management */
#include "H5Pprivate.h" /* Property lists */
@@ -111,34 +107,6 @@
/* Local Typedefs */
/******************/
-/* User data for path traversal routine for "insertion file" routine */
-typedef struct {
- H5G_loc_t *loc; /* Pointer to the location for insertion */
-} H5G_trav_ins_t;
-
-/* User data for application-style iteration over links in a group */
-typedef struct {
- hid_t gid; /* The group ID for the application callback */
- H5G_link_iterate_t lnk_op; /* Application callback */
- void *op_data; /* Application's op data */
-} H5G_iter_appcall_ud_t;
-
-/* User data for recursive traversal over links from a group */
-typedef struct {
- hid_t gid; /* The group ID for the starting group */
- H5G_loc_t *curr_loc; /* Location of starting group */
- hid_t lapl_id; /* LAPL for walking across links */
- hid_t dxpl_id; /* DXPL for operations */
- H5_index_t idx_type; /* Index to use */
- H5_iter_order_t order; /* Iteration order within index */
- H5SL_t *visited; /* Skip list for tracking visited nodes */
- char *path; /* Path name of the link */
- size_t curr_path_len; /* Current length of the path in the buffer */
- size_t path_buf_size; /* Size of path buffer */
- H5L_iterate_t op; /* Application callback */
- void *op_data; /* Application's op data */
-} H5G_iter_visit_ud_t;
-
/********************/
/* Package Typedefs */
@@ -149,20 +117,11 @@ typedef struct {
/* Local Prototypes */
/********************/
-static herr_t H5G_open_oid(H5G_t *grp, hid_t dxpl_id);
-
/*********************/
/* Package Variables */
/*********************/
-/* Declare a free list to manage the H5G_t struct */
-H5FL_DEFINE(H5G_t);
-H5FL_DEFINE(H5G_shared_t);
-
-/* Declare the free list to manage H5_obj_t's */
-H5FL_DEFINE(H5_obj_t);
-
/*****************************/
/* Library Private Variables */
@@ -176,6 +135,106 @@ H5FL_DEFINE(H5_obj_t);
/*-------------------------------------------------------------------------
+ * Function: H5G__init
+ *
+ * Purpose: Initialize the interface from some other package.
+ *
+ * Return: Success: non-negative
+ * Failure: negative
+ *
+ * Programmer: Quincey Koziol
+ * Saturday, November 11, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5G__init(void)
+{
+ herr_t ret_value = SUCCEED; /* Return value */
+
+ FUNC_ENTER_NOAPI(FAIL)
+ /* FUNC_ENTER() does all the work */
+
+done:
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5G__init() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G_init_interface
+ *
+ * Purpose: Initializes the H5G interface.
+ *
+ * Return: Non-negative on success/Negative on failure
+ *
+ * Programmer: Robb Matzke
+ * Monday, January 5, 1998
+ *
+ * Notes: The group creation properties are registered in the property
+ * list interface initialization routine (H5P_init_interface)
+ * so that the file creation property class can inherit from it
+ * correctly. (Which allows the file creation property list to
+ * control the group creation properties of the root group of
+ * a file) QAK - 24/10/2005
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5G_init_interface(void)
+{
+ herr_t ret_value = SUCCEED; /* Return value */
+
+ FUNC_ENTER_NOAPI_NOINIT
+
+ /* Initialize the atom group for the group IDs */
+ if(H5I_register_type(H5I_GROUP, (size_t)H5I_GROUPID_HASHSIZE, H5G_RESERVED_ATOMS, (H5I_free_t)H5G_close) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to initialize interface")
+
+done:
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5G_init_interface() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G_term_interface
+ *
+ * Purpose: Terminates the H5G interface
+ *
+ * Return: Success: Positive if anything is done that might
+ * affect other interfaces; zero otherwise.
+ *
+ * Failure: Negative.
+ *
+ * Programmer: Robb Matzke
+ * Monday, January 5, 1998
+ *
+ *-------------------------------------------------------------------------
+ */
+int
+H5G_term_interface(void)
+{
+ int n = 0;
+
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
+
+ if(H5_interface_initialize_g) {
+ if((n = H5I_nmembers(H5I_GROUP)))
+ H5I_clear_type(H5I_GROUP, FALSE, FALSE);
+ else {
+ /* Destroy the group object id group */
+ H5I_dec_type_ref(H5I_GROUP);
+
+ /* Mark closed */
+ H5_interface_initialize_g = 0;
+ n = 1; /*H5I*/
+ } /* end else */
+ } /* end if */
+
+ FUNC_LEAVE_NOAPI(n)
+} /* end H5G_term_interface() */
+
+
+/*-------------------------------------------------------------------------
* Function: H5Gcreate2
*
* Purpose: Creates a new group relative to LOC_ID, giving it the
@@ -209,7 +268,7 @@ H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id,
H5G_t *grp = NULL; /* New group created */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Gcreate2, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("i", "i*siii", loc_id, name, lcpl_id, gcpl_id, gapl_id);
/* Check arguments */
@@ -240,7 +299,7 @@ H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id,
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group access property list")
/* Create the new group & get its ID */
- if(NULL == (grp = H5G_create_named(&loc, name, lcpl_id, gcpl_id, gapl_id, H5AC_dxpl_id)))
+ if(NULL == (grp = H5G__create_named(&loc, name, lcpl_id, gcpl_id, gapl_id, H5AC_dxpl_id)))
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group")
if((ret_value = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
@@ -255,61 +314,6 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_create_named
- *
- * Purpose: Internal routine to create a new "named" group.
- *
- * Return: Success: Non-NULL, pointer to new group object.
- *
- * Failure: NULL
- *
- * Programmer: Quincey Koziol
- * April 5, 2007
- *
- *-------------------------------------------------------------------------
- */
-H5G_t *
-H5G_create_named(const H5G_loc_t *loc, const char *name, hid_t lcpl_id,
- hid_t gcpl_id, hid_t gapl_id, hid_t dxpl_id)
-{
- H5O_obj_create_t ocrt_info; /* Information for object creation */
- H5G_obj_create_t gcrt_info; /* Information for group creation */
- H5G_t *ret_value; /* Return value */
-
- FUNC_ENTER_NOAPI_NOINIT(H5G_create_named)
-
- /* Check arguments */
- HDassert(loc);
- HDassert(name && *name);
- HDassert(lcpl_id != H5P_DEFAULT);
- HDassert(gcpl_id != H5P_DEFAULT);
- HDassert(gapl_id != H5P_DEFAULT);
- HDassert(dxpl_id != H5P_DEFAULT);
-
- /* Set up group creation info */
- gcrt_info.gcpl_id = gcpl_id;
- gcrt_info.cache_type = H5G_NOTHING_CACHED;
- HDmemset(&gcrt_info.cache, 0, sizeof(gcrt_info.cache));
-
- /* Set up object creation information */
- ocrt_info.obj_type = H5O_TYPE_GROUP;
- ocrt_info.crt_info = &gcrt_info;
- ocrt_info.new_obj = NULL;
-
- /* Create the new group and link it to its parent group */
- if(H5L_link_object(loc, name, &ocrt_info, lcpl_id, gapl_id, dxpl_id) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "unable to create and link to group")
- HDassert(ocrt_info.new_obj);
-
- /* Set the return value */
- ret_value = (H5G_t *)ocrt_info.new_obj;
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_create_named() */
-
-
-/*-------------------------------------------------------------------------
* Function: H5Gcreate_anon
*
* Purpose: Creates a new group relative to LOC_ID, giving it the
@@ -352,7 +356,7 @@ H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id)
H5G_obj_create_t gcrt_info; /* Information for group creation */
hid_t ret_value;
- FUNC_ENTER_API(H5Gcreate_anon, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("i", "iii", loc_id, gcpl_id, gapl_id);
/* Check arguments */
@@ -379,7 +383,7 @@ H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id)
HDmemset(&gcrt_info.cache, 0, sizeof(gcrt_info.cache));
/* Create the new group & get its ID */
- if(NULL == (grp = H5G_create(loc.oloc->file, &gcrt_info, H5AC_dxpl_id)))
+ if(NULL == (grp = H5G__create(loc.oloc->file, &gcrt_info, H5AC_dxpl_id)))
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group")
if((ret_value = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
@@ -431,7 +435,7 @@ H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id)
H5G_loc_t loc; /* Location of parent for group */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Gopen2, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("i", "i*si", loc_id, name, gapl_id);
/* Check args */
@@ -448,7 +452,7 @@ H5Gopen2(hid_t loc_id, const char *name, hid_t gapl_id)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not group access property list")
/* Open the group */
- if((grp = H5G_open_name(&loc, name, gapl_id, H5AC_dxpl_id)) == NULL)
+ if((grp = H5G__open_name(&loc, name, gapl_id, H5AC_dxpl_id)) == NULL)
HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
/* Register an ID for the group */
@@ -494,7 +498,7 @@ H5Gget_create_plist(hid_t group_id)
hid_t new_gcpl_id = FAIL;
hid_t ret_value = FAIL;
- FUNC_ENTER_API(H5Gget_create_plist, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", group_id);
/* Check args */
@@ -529,7 +533,7 @@ H5Gget_create_plist(hid_t group_id)
} /* end if */
/* Check for the group having a link info message */
- if((linfo_exists = H5G_obj_get_linfo(&(grp->oloc), &linfo, H5AC_ind_dxpl_id)) < 0)
+ if((linfo_exists = H5G__obj_get_linfo(&(grp->oloc), &linfo, H5AC_ind_dxpl_id)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header")
if(linfo_exists) {
/* Set the link info for the property list */
@@ -586,7 +590,7 @@ H5Gget_info(hid_t grp_id, H5G_info_t *grp_info)
H5G_loc_t loc; /* Location of group */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Gget_info, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*x", grp_id, grp_info);
/* Check args */
@@ -601,7 +605,7 @@ H5Gget_info(hid_t grp_id, H5G_info_t *grp_info)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
/* Retrieve the group's information */
- if(H5G_obj_info(loc.oloc, grp_info/*out*/, H5AC_ind_dxpl_id) < 0)
+ if(H5G__obj_info(loc.oloc, grp_info/*out*/, H5AC_ind_dxpl_id) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve group info")
done:
@@ -633,7 +637,7 @@ H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *grp_info,
hbool_t loc_found = FALSE; /* Location at 'name' found */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Gget_info_by_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*s*xi", loc_id, name, grp_info, lapl_id);
/* Check args */
@@ -660,7 +664,7 @@ H5Gget_info_by_name(hid_t loc_id, const char *name, H5G_info_t *grp_info,
loc_found = TRUE;
/* Retrieve the group's information */
- if(H5G_obj_info(grp_loc.oloc, grp_info/*out*/, H5AC_ind_dxpl_id) < 0)
+ if(H5G__obj_info(grp_loc.oloc, grp_info/*out*/, H5AC_ind_dxpl_id) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve group info")
done:
@@ -696,7 +700,7 @@ H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
hbool_t loc_found = FALSE; /* Entry at 'name' found */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Gget_info_by_idx, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE7("e", "i*sIiIoh*xi", loc_id, group_name, idx_type, order, n, grp_info,
lapl_id);
@@ -728,7 +732,7 @@ H5Gget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
loc_found = TRUE;
/* Retrieve the group's information */
- if(H5G_obj_info(grp_loc.oloc, grp_info/*out*/, H5AC_ind_dxpl_id) < 0)
+ if(H5G__obj_info(grp_loc.oloc, grp_info/*out*/, H5AC_ind_dxpl_id) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve group info")
done:
@@ -758,7 +762,7 @@ H5Gclose(hid_t group_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Gclose, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", group_id);
/* Check args */
@@ -776,1101 +780,3 @@ done:
FUNC_LEAVE_API(ret_value)
} /* end H5Gclose() */
-/*
- *-------------------------------------------------------------------------
- *-------------------------------------------------------------------------
- * N O A P I F U N C T I O N S B E Y O N D T H I S P O I N T
- *-------------------------------------------------------------------------
- *-------------------------------------------------------------------------
- */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_init
- *
- * Purpose: Initialize the interface from some other package.
- *
- * Return: Success: non-negative
- * Failure: negative
- *
- * Programmer: Quincey Koziol
- * Saturday, November 11, 2006
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5G_init(void)
-{
- herr_t ret_value = SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5G_init, FAIL)
- /* FUNC_ENTER() does all the work */
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_init() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_init_interface
- *
- * Purpose: Initializes the H5G interface.
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Robb Matzke
- * Monday, January 5, 1998
- *
- * Notes: The group creation properties are registered in the property
- * list interface initialization routine (H5P_init_interface)
- * so that the file creation property class can inherit from it
- * correctly. (Which allows the file creation property list to
- * control the group creation properties of the root group of
- * a file) QAK - 24/10/2005
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5G_init_interface(void)
-{
- herr_t ret_value = SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI_NOINIT(H5G_init_interface)
-
- /* Initialize the atom group for the group IDs */
- if(H5I_register_type(H5I_GROUP, (size_t)H5I_GROUPID_HASHSIZE, H5G_RESERVED_ATOMS, (H5I_free_t)H5G_close) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to initialize interface")
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_init_interface() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_term_interface
- *
- * Purpose: Terminates the H5G interface
- *
- * Return: Success: Positive if anything is done that might
- * affect other interfaces; zero otherwise.
- *
- * Failure: Negative.
- *
- * Programmer: Robb Matzke
- * Monday, January 5, 1998
- *
- *-------------------------------------------------------------------------
- */
-int
-H5G_term_interface(void)
-{
- int n = 0;
-
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_term_interface)
-
- if(H5_interface_initialize_g) {
- if((n = H5I_nmembers(H5I_GROUP)))
- H5I_clear_type(H5I_GROUP, FALSE, FALSE);
- else {
- /* Destroy the group object id group */
- H5I_dec_type_ref(H5I_GROUP);
-
- /* Mark closed */
- H5_interface_initialize_g = 0;
- n = 1; /*H5I*/
- } /* end else */
- } /* end if */
-
- FUNC_LEAVE_NOAPI(n)
-} /* end H5G_term_interface() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_create
- *
- * Purpose: Creates a new empty group with the specified name. The name
- * is either an absolute name or is relative to LOC.
- *
- * Return: Success: A handle for the group. The group is opened
- * and should eventually be close by calling
- * H5G_close().
- *
- * Failure: NULL
- *
- * Programmer: Robb Matzke
- * matzke@llnl.gov
- * Aug 11 1997
- *
- *-------------------------------------------------------------------------
- */
-H5G_t *
-H5G_create(H5F_t *file, H5G_obj_create_t *gcrt_info, hid_t dxpl_id)
-{
- H5G_t *grp = NULL; /*new group */
- unsigned oloc_init = 0; /* Flag to indicate that the group object location was created successfully */
- H5G_t *ret_value; /* Return value */
-
- FUNC_ENTER_NOAPI_NOINIT(H5G_create)
-
- /* check args */
- HDassert(file);
- HDassert(gcrt_info->gcpl_id != H5P_DEFAULT);
- HDassert(dxpl_id != H5P_DEFAULT);
-
- /* create an open group */
- if(NULL == (grp = H5FL_CALLOC(H5G_t)))
- HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
- if(NULL == (grp->shared = H5FL_CALLOC(H5G_shared_t)))
- HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-
- /* Create the group object header */
- if(H5G_obj_create(file, dxpl_id, gcrt_info, &(grp->oloc)/*out*/) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "unable to create group object header")
- oloc_init = 1; /* Indicate that the object location information is valid */
-
- /* Add group to list of open objects in file */
- if(H5FO_top_incr(grp->oloc.file, grp->oloc.addr) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTINC, NULL, "can't incr object ref. count")
- if(H5FO_insert(grp->oloc.file, grp->oloc.addr, grp->shared, TRUE) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, NULL, "can't insert group into list of open objects")
-
- /* Set the count of times the object is opened */
- grp->shared->fo_count = 1;
-
- /* Set return value */
- ret_value = grp;
-
-done:
- if(ret_value == NULL) {
- /* Check if we need to release the file-oriented symbol table info */
- if(oloc_init) {
- if(H5O_dec_rc_by_loc(&(grp->oloc), dxpl_id) < 0)
- HDONE_ERROR(H5E_SYM, H5E_CANTDEC, NULL, "unable to decrement refcount on newly created object")
- if(H5O_close(&(grp->oloc)) < 0)
- HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, NULL, "unable to release object header")
- if(H5O_delete(file, dxpl_id, grp->oloc.addr) < 0)
- HDONE_ERROR(H5E_SYM, H5E_CANTDELETE, NULL, "unable to delete object header")
- } /* end if */
- if(grp != NULL) {
- if(grp->shared != NULL)
- grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
- grp = H5FL_FREE(H5G_t, grp);
- } /* end if */
- } /* end if */
-
- FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_create() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_open_name
- *
- * Purpose: Opens an existing group by name.
- *
- * Return: Success: Ptr to a new group.
- * Failure: NULL
- *
- * Programmer: Quincey Koziol
- * Monday, August 27, 2007
- *
- *-------------------------------------------------------------------------
- */
-H5G_t *
-H5G_open_name(const H5G_loc_t *loc, const char *name, hid_t gapl_id,
- hid_t dxpl_id)
-{
- H5G_t *grp = NULL; /* Group to open */
- H5G_loc_t grp_loc; /* Location used to open group */
- H5G_name_t grp_path; /* Opened object group hier. path */
- H5O_loc_t grp_oloc; /* Opened object object location */
- hbool_t loc_found = FALSE; /* Location at 'name' found */
- H5O_type_t obj_type; /* Type of object at location */
- H5G_t *ret_value; /* Return value */
-
- FUNC_ENTER_NOAPI(H5G_open_name, NULL)
-
- /* Check args */
- HDassert(loc);
- HDassert(name);
-
- /* Set up opened group location to fill in */
- grp_loc.oloc = &grp_oloc;
- grp_loc.path = &grp_path;
- H5G_loc_reset(&grp_loc);
-
- /* Find the group object using the gapl passed in */
- if(H5G_loc_find(loc, name, &grp_loc/*out*/, gapl_id, dxpl_id) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "group not found")
- loc_found = TRUE;
-
- /* Check that the object found is the correct type */
- if(H5O_obj_type(&grp_oloc, &obj_type, dxpl_id) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTGET, NULL, "can't get object type")
- if(obj_type != H5O_TYPE_GROUP)
- HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, NULL, "not a group")
-
- /* Open the group */
- if((grp = H5G_open(&grp_loc, dxpl_id)) == NULL)
- HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, NULL, "unable to open group")
-
- /* Set return value */
- ret_value = grp;
-
-done:
- if(!ret_value) {
- if(loc_found && H5G_loc_free(&grp_loc) < 0)
- HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, NULL, "can't free location")
- } /* end if */
-
- FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_open_name() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_open
- *
- * Purpose: Opens an existing group. The group should eventually be
- * closed by calling H5G_close().
- *
- * Return: Success: Ptr to a new group.
- *
- * Failure: NULL
- *
- * Programmer: Robb Matzke
- * Monday, January 5, 1998
- *
- *-------------------------------------------------------------------------
- */
-H5G_t *
-H5G_open(const H5G_loc_t *loc, hid_t dxpl_id)
-{
- H5G_t *grp = NULL; /* Group opened */
- H5G_shared_t *shared_fo; /* Shared group object */
- H5G_t *ret_value; /* Return value */
-
- FUNC_ENTER_NOAPI(H5G_open, NULL)
-
- /* Check args */
- HDassert(loc);
-
- /* Allocate the group structure */
- if(NULL == (grp = H5FL_CALLOC(H5G_t)))
- HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate space for group")
-
- /* Shallow copy (take ownership) of the group location object */
- if(H5O_loc_copy(&(grp->oloc), loc->oloc, H5_COPY_SHALLOW) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, NULL, "can't copy object location")
- if(H5G_name_copy(&(grp->path), loc->path, H5_COPY_SHALLOW) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, NULL, "can't copy path")
-
- /* Check if group was already open */
- if((shared_fo = (H5G_shared_t *)H5FO_opened(grp->oloc.file, grp->oloc.addr)) == NULL) {
-
- /* Clear any errors from H5FO_opened() */
- H5E_clear_stack(NULL);
-
- /* Open the group object */
- if(H5G_open_oid(grp, dxpl_id) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "not found")
-
- /* Add group to list of open objects in file */
- if(H5FO_insert(grp->oloc.file, grp->oloc.addr, grp->shared, FALSE) < 0) {
- grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
- HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, NULL, "can't insert group into list of open objects")
- } /* end if */
-
- /* Increment object count for the object in the top file */
- if(H5FO_top_incr(grp->oloc.file, grp->oloc.addr) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTINC, NULL, "can't increment object count")
-
- /* Set open object count */
- grp->shared->fo_count = 1;
- } /* end if */
- else {
- /* Point to shared group info */
- grp->shared = shared_fo;
-
- /* Increment shared reference count */
- shared_fo->fo_count++;
-
- /* Check if the object has been opened through the top file yet */
- if(H5FO_top_count(grp->oloc.file, grp->oloc.addr) == 0) {
- /* Open the object through this top file */
- if(H5O_open(&(grp->oloc)) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, NULL, "unable to open object header")
- } /* end if */
-
- /* Increment object count for the object in the top file */
- if(H5FO_top_incr(grp->oloc.file, grp->oloc.addr) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTINC, NULL, "can't increment object count")
- } /* end else */
-
- /* Set return value */
- ret_value = grp;
-
-done:
- if(!ret_value && grp) {
- H5O_loc_free(&(grp->oloc));
- H5G_name_free(&(grp->path));
- grp = H5FL_FREE(H5G_t, grp);
- } /* end if */
-
- FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_open() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_open_oid
- *
- * Purpose: Opens an existing group. The group should eventually be
- * closed by calling H5G_close().
- *
- * Return: Success: Ptr to a new group.
- *
- * Failure: NULL
- *
- * Programmer: Quincey Koziol
- * Wednesday, March 17, 1999
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5G_open_oid(H5G_t *grp, hid_t dxpl_id)
-{
- hbool_t obj_opened = FALSE;
- herr_t ret_value = SUCCEED;
-
- FUNC_ENTER_NOAPI_NOINIT(H5G_open_oid)
-
- /* Check args */
- HDassert(grp);
-
- /* Allocate the shared information for the group */
- if(NULL == (grp->shared = H5FL_CALLOC(H5G_shared_t)))
- HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-
- /* Grab the object header */
- if(H5O_open(&(grp->oloc)) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
- obj_opened = TRUE;
-
- /* Check if this object has the right message(s) to be treated as a group */
- if((H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, dxpl_id) <= 0)
- && (H5O_msg_exists(&(grp->oloc), H5O_LINFO_ID, dxpl_id) <= 0))
- HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "not a group")
-
-done:
- if(ret_value < 0) {
- if(obj_opened)
- H5O_close(&(grp->oloc));
- if(grp->shared)
- grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
- } /* end if */
-
- FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_open_oid() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_close
- *
- * Purpose: Closes the specified group.
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Robb Matzke
- * Monday, January 5, 1998
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5G_close(H5G_t *grp)
-{
- herr_t ret_value = SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5G_close, FAIL)
-
- /* Check args */
- HDassert(grp && grp->shared);
- HDassert(grp->shared->fo_count > 0);
-
- --grp->shared->fo_count;
-
- if(0 == grp->shared->fo_count) {
- HDassert(grp != H5G_rootof(H5G_fileof(grp)));
-
- /* Remove the group from the list of opened objects in the file */
- if(H5FO_top_decr(grp->oloc.file, grp->oloc.addr) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't decrement count for object")
- if(H5FO_delete(grp->oloc.file, H5AC_dxpl_id, grp->oloc.addr) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't remove group from list of open objects")
- if(H5O_close(&(grp->oloc)) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close")
- grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
- } else {
- /* Decrement the ref. count for this object in the top file */
- if(H5FO_top_decr(grp->oloc.file, grp->oloc.addr) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't decrement count for object")
-
- /* Check reference count for this object in the top file */
- if(H5FO_top_count(grp->oloc.file, grp->oloc.addr) == 0) {
- if(H5O_close(&(grp->oloc)) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close")
- } /* end if */
- else
- /* Free object location (i.e. "unhold" the file if appropriate) */
- if(H5O_loc_free(&(grp->oloc)) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "problem attempting to free location")
-
- /* If this group is a mount point and the mount point is the last open
- * reference to the group, then attempt to close down the file hierarchy
- */
- if(grp->shared->mounted && grp->shared->fo_count == 1) {
- /* Attempt to close down the file hierarchy */
- if(H5F_try_close(grp->oloc.file) < 0)
- HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "problem attempting file close")
- } /* end if */
- } /* end else */
-
- if(H5G_name_free(&(grp->path)) < 0) {
- grp = H5FL_FREE(H5G_t, grp);
- HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't free group entry name")
- } /* end if */
-
- grp = H5FL_FREE(H5G_t, grp);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_close() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_oloc
- *
- * Purpose: Returns a pointer to the object location for a group.
- *
- * Return: Success: Ptr to group entry
- * Failure: NULL
- *
- * Programmer: Robb Matzke
- * Tuesday, March 24, 1998
- *
- *-------------------------------------------------------------------------
- */
-H5O_loc_t *
-H5G_oloc(H5G_t *grp)
-{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_oloc)
-
- FUNC_LEAVE_NOAPI(grp ? &(grp->oloc) : NULL)
-} /* end H5G_oloc() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_nameof
- *
- * Purpose: Returns a pointer to the hier. name for a group.
- *
- * Return: Success: Ptr to hier. name
- * Failure: NULL
- *
- * Programmer: Quincey Koziol
- * Monday, September 12, 2005
- *
- *-------------------------------------------------------------------------
- */
-H5G_name_t *
-H5G_nameof(H5G_t *grp)
-{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_nameof)
-
- FUNC_LEAVE_NOAPI(grp ? &(grp->path) : NULL)
-} /* end H5G_nameof() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_fileof
- *
- * Purpose: Returns the file to which the specified group belongs.
- *
- * Return: Success: File pointer.
- *
- * Failure: NULL
- *
- * Programmer: Robb Matzke
- * Tuesday, March 24, 1998
- *
- *-------------------------------------------------------------------------
- */
-H5F_t *
-H5G_fileof(H5G_t *grp)
-{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_fileof)
-
- HDassert(grp);
-
- FUNC_LEAVE_NOAPI(grp->oloc.file)
-} /* end H5G_fileof() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_get_shared_count
- *
- * Purpose: Queries the group object's "shared count"
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Quincey Koziol
- * Tuesday, July 5, 2005
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5G_get_shared_count(H5G_t *grp)
-{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_get_shared_count)
-
- /* Check args */
- HDassert(grp && grp->shared);
-
- FUNC_LEAVE_NOAPI(grp->shared->fo_count)
-} /* end H5G_get_shared_count() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_mount
- *
- * Purpose: Sets the 'mounted' flag for a group
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Quincey Koziol
- * Tuesday, July 19, 2005
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5G_mount(H5G_t *grp)
-{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_mount)
-
- /* Check args */
- HDassert(grp && grp->shared);
- HDassert(grp->shared->mounted == FALSE);
-
- /* Set the 'mounted' flag */
- grp->shared->mounted = TRUE;
-
- FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5G_mount() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_mounted
- *
- * Purpose: Retrieves the 'mounted' flag for a group
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Quincey Koziol
- * Tuesday, July 15, 2008
- *
- *-------------------------------------------------------------------------
- */
-hbool_t
-H5G_mounted(H5G_t *grp)
-{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_mounted)
-
- /* Check args */
- HDassert(grp && grp->shared);
-
- FUNC_LEAVE_NOAPI(grp->shared->mounted)
-} /* end H5G_mounted() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_unmount
- *
- * Purpose: Resets the 'mounted' flag for a group
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Quincey Koziol
- * Tuesday, July 19, 2005
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5G_unmount(H5G_t *grp)
-{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_unmount)
-
- /* Check args */
- HDassert(grp && grp->shared);
- HDassert(grp->shared->mounted == TRUE);
-
- /* Reset the 'mounted' flag */
- grp->shared->mounted = FALSE;
-
- FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5G_unmount() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_iterate_cb
- *
- * Purpose: Callback function for iterating over links in a group
- *
- * Return: Success: Non-negative
- * Failure: Negative
- *
- * Programmer: Quincey Koziol
- * Oct 3, 2005
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5G_iterate_cb(const H5O_link_t *lnk, void *_udata)
-{
- H5G_iter_appcall_ud_t *udata = (H5G_iter_appcall_ud_t *)_udata; /* User data for callback */
- herr_t ret_value = H5_ITER_ERROR; /* Return value */
-
- FUNC_ENTER_NOAPI_NOINIT(H5G_iterate_cb)
-
- /* Sanity check */
- HDassert(lnk);
- HDassert(udata);
-
- switch(udata->lnk_op.op_type) {
-#ifndef H5_NO_DEPRECATED_SYMBOLS
- case H5G_LINK_OP_OLD:
- /* Make the old-type application callback */
- ret_value = (udata->lnk_op.op_func.op_old)(udata->gid, lnk->name, udata->op_data);
- break;
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-
- case H5G_LINK_OP_NEW:
- {
- H5L_info_t info; /* Link info */
-
- /* Retrieve the info for the link */
- if(H5G_link_to_info(lnk, &info) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get info for link")
-
- /* Make the application callback */
- ret_value = (udata->lnk_op.op_func.op_new)(udata->gid, lnk->name, &info, udata->op_data);
- }
- break;
-
- default:
- HDassert(0 && "Unknown link op type?!?");
- } /* end switch */
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_iterate_cb() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_iterate
- *
- * Purpose: Private function for iterating over links in a group
- *
- * Return: Success: Non-negative
- * Failure: Negative
- *
- * Programmer: Quincey Koziol
- * Oct 3, 2005
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5G_iterate(hid_t loc_id, const char *group_name,
- H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
- const H5G_link_iterate_t *lnk_op, void *op_data, hid_t lapl_id, hid_t dxpl_id)
-{
- H5G_loc_t loc; /* Location of parent for group */
- hid_t gid = -1; /* ID of group to iterate over */
- H5G_t *grp = NULL; /* Pointer to group data structure to iterate over */
- H5G_iter_appcall_ud_t udata; /* User data for callback */
- herr_t ret_value; /* Return value */
-
- FUNC_ENTER_NOAPI(H5G_iterate, FAIL)
-
- /* Sanity check */
- HDassert(group_name);
- HDassert(last_lnk);
- HDassert(lnk_op && lnk_op->op_func.op_new);
-
- /*
- * Open the group on which to operate. We also create a group ID which
- * we can pass to the application-defined operator.
- */
- if(H5G_loc(loc_id, &loc) < 0)
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
- if(NULL == (grp = H5G_open_name(&loc, group_name, lapl_id, dxpl_id)))
- HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
- if((gid = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
- HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
-
- /* Set up user data for callback */
- udata.gid = gid;
- udata.lnk_op = *lnk_op;
- udata.op_data = op_data;
-
- /* Call the real group iteration routine */
- if((ret_value = H5G_obj_iterate(&(grp->oloc), idx_type, order, skip, last_lnk, H5G_iterate_cb, &udata, dxpl_id)) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "error iterating over links")
-
-done:
- /* Release the group opened */
- if(gid > 0) {
- if(H5I_dec_app_ref(gid) < 0)
- HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close group")
- } /* end if */
- else if(grp && H5G_close(grp) < 0)
- HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group")
-
- FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_iterate() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_free_visit_visited
- *
- * Purpose: Free the key for an object visited during a group traversal
- *
- * Return: Non-negative on success, negative on failure
- *
- * Programmer: Quincey Koziol
- * Nov 4, 2007
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5G_free_visit_visited(void *item, void UNUSED *key, void UNUSED *operator_data/*in,out*/)
-{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_free_visit_visited)
-
- item = H5FL_FREE(H5_obj_t, item);
-
- FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5G_free_visit_visited() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_visit_cb
- *
- * Purpose: Callback function for recursively visiting links from a group
- *
- * Return: Success: Non-negative
- * Failure: Negative
- *
- * Programmer: Quincey Koziol
- * Nov 4, 2007
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5G_visit_cb(const H5O_link_t *lnk, void *_udata)
-{
- H5G_iter_visit_ud_t *udata = (H5G_iter_visit_ud_t *)_udata; /* User data for callback */
- H5L_info_t info; /* Link info */
- H5G_loc_t obj_loc; /* Location of object */
- H5G_name_t obj_path; /* Object's group hier. path */
- H5O_loc_t obj_oloc; /* Object's object location */
- hbool_t obj_found = FALSE; /* Object at 'name' found */
- size_t old_path_len = udata->curr_path_len; /* Length of path before appending this link's name */
- size_t link_name_len; /* Length of link's name */
- size_t len_needed; /* Length of path string needed */
- herr_t ret_value = H5_ITER_CONT; /* Return value */
-
- FUNC_ENTER_NOAPI_NOINIT(H5G_visit_cb)
-
- /* Sanity check */
- HDassert(lnk);
- HDassert(udata);
-
- /* Check if we will need more space to store this link's relative path */
- /* ("+2" is for string terminator and possible '/' for group separator later) */
- link_name_len = HDstrlen(lnk->name);
- len_needed = udata->curr_path_len + link_name_len + 2;
- if(len_needed > udata->path_buf_size) {
- void *new_path; /* Pointer to new path buffer */
-
- /* Attempt to allocate larger buffer for path */
- if(NULL == (new_path = H5MM_realloc(udata->path, len_needed)))
- HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, H5_ITER_ERROR, "can't allocate path string")
- udata->path = (char *)new_path;
- udata->path_buf_size = len_needed;
- } /* end if */
-
- /* Build the link's relative path name */
- HDassert(udata->path[old_path_len] == '\0');
- HDstrcpy(&(udata->path[old_path_len]), lnk->name);
- udata->curr_path_len += link_name_len;
-
- /* Construct the link info from the link message */
- if(H5G_link_to_info(lnk, &info) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get info for link")
-
- /* Make the application callback */
- ret_value = (udata->op)(udata->gid, udata->path, &info, udata->op_data);
-
- /* Check for doing more work */
- if(ret_value == H5_ITER_CONT && lnk->type == H5L_TYPE_HARD) {
- H5_obj_t obj_pos; /* Object "position" for this object */
-
- /* Set up opened group location to fill in */
- obj_loc.oloc = &obj_oloc;
- obj_loc.path = &obj_path;
- H5G_loc_reset(&obj_loc);
-
- /* Find the object using the LAPL passed in */
- /* (Correctly handles mounted files) */
- if(H5G_loc_find(udata->curr_loc, lnk->name, &obj_loc/*out*/, udata->lapl_id, udata->dxpl_id) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5_ITER_ERROR, "object not found")
- obj_found = TRUE;
-
- /* Construct unique "position" for this object */
- H5F_GET_FILENO(obj_oloc.file, obj_pos.fileno);
- obj_pos.addr = obj_oloc.addr;
-
- /* Check if we've seen the object the link references before */
- if(NULL == H5SL_search(udata->visited, &obj_pos)) {
- H5O_type_t otype; /* Basic object type (group, dataset, etc.) */
- unsigned rc; /* Reference count of object */
-
- /* Get the object's reference count and type */
- if(H5O_get_rc_and_type(&obj_oloc, udata->dxpl_id, &rc, &otype) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get object info")
-
- /* If its ref count is > 1, we add it to the list of visited objects */
- /* (because it could come up again during traversal) */
- if(rc > 1) {
- H5_obj_t *new_node; /* New object node for visited list */
-
- /* Allocate new object "position" node */
- if((new_node = H5FL_MALLOC(H5_obj_t)) == NULL)
- HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, H5_ITER_ERROR, "can't allocate object node")
-
- /* Set node information */
- *new_node = obj_pos;
-
- /* Add to list of visited objects */
- if(H5SL_insert(udata->visited, new_node, new_node) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, H5_ITER_ERROR, "can't insert object node into visited list")
- } /* end if */
-
- /* If it's a group, we recurse into it */
- if(otype == H5O_TYPE_GROUP) {
- H5G_loc_t *old_loc = udata->curr_loc; /* Pointer to previous group location info */
- H5_index_t idx_type = udata->idx_type; /* Type of index to use */
- H5O_linfo_t linfo; /* Link info message */
- htri_t linfo_exists; /* Whether the link info message exists */
-
- /* Add the path separator to the current path */
- HDassert(udata->path[udata->curr_path_len] == '\0');
- HDstrcpy(&(udata->path[udata->curr_path_len]), "/");
- udata->curr_path_len++;
-
- /* Attempt to get the link info for this group */
- if((linfo_exists = H5G_obj_get_linfo(&obj_oloc, &linfo, udata->dxpl_id)) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "can't check for link info message")
- if(linfo_exists) {
- /* Check for creation order tracking, if creation order index lookup requested */
- if(idx_type == H5_INDEX_CRT_ORDER) {
- /* Check if creation order is tracked */
- if(!linfo.track_corder)
- /* Switch to name order for this group */
- idx_type = H5_INDEX_NAME;
- } /* end if */
- else
- HDassert(idx_type == H5_INDEX_NAME);
- } /* end if */
- else {
- /* Can only perform name lookups on groups with symbol tables */
- if(idx_type != H5_INDEX_NAME)
- /* Switch to name order for this group */
- idx_type = H5_INDEX_NAME;
- } /* end if */
-
- /* Point to this group's location info */
- udata->curr_loc = &obj_loc;
-
- /* Iterate over links in group */
- ret_value = H5G_obj_iterate(&obj_oloc, idx_type, udata->order, (hsize_t)0, NULL, H5G_visit_cb, udata, udata->dxpl_id);
-
- /* Restore location */
- udata->curr_loc = old_loc;
- } /* end if */
- } /* end if */
- } /* end if */
-
-done:
- /* Reset path back to incoming path */
- udata->path[old_path_len] = '\0';
- udata->curr_path_len = old_path_len;
-
- /* Release resources */
- if(obj_found && H5G_loc_free(&obj_loc) < 0)
- HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, H5_ITER_ERROR, "can't free location")
-
- FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_visit_cb() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_visit
- *
- * Purpose: Recursively visit all the links in a group and all
- * the groups that are linked to from that group. Links within
- * each group are visited according to the order within the
- * specified index (unless the specified index does not exist for
- * a particular group, then the "name" index is used).
- *
- * NOTE: Each _link_ reachable from the initial group will only be
- * visited once. However, because an object may be reached from
- * more than one link, the visitation may call the application's
- * callback with more than one link that points to a particular
- * _object_.
- *
- * Return: Success: The return value of the first operator that
- * returns non-zero, or zero if all members were
- * processed with no operator returning non-zero.
- *
- * Failure: Negative if something goes wrong within the
- * library, or the negative value returned by one
- * of the operators.
- *
- *
- *
- * Programmer: Quincey Koziol
- * November 4 2007
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5G_visit(hid_t loc_id, const char *group_name, H5_index_t idx_type,
- H5_iter_order_t order, H5L_iterate_t op, void *op_data, hid_t lapl_id,
- hid_t dxpl_id)
-{
- H5G_iter_visit_ud_t udata; /* User data for callback */
- H5O_linfo_t linfo; /* Link info message */
- htri_t linfo_exists; /* Whether the link info message exists */
- hid_t gid = (-1); /* Group ID */
- H5G_t *grp = NULL; /* Group opened */
- H5G_loc_t loc; /* Location of group passed in */
- H5G_loc_t start_loc; /* Location of starting group */
- unsigned rc; /* Reference count of object */
- herr_t ret_value; /* Return value */
-
- /* Portably clear udata struct (before FUNC_ENTER) */
- HDmemset(&udata, 0, sizeof(udata));
-
- FUNC_ENTER_NOAPI(H5G_visit, FAIL)
-
- /* Check args */
- if(H5G_loc(loc_id, &loc) < 0)
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-
- /* Open the group to begin visiting within */
- if((grp = H5G_open_name(&loc, group_name, lapl_id, dxpl_id)) == NULL)
- HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
-
- /* Register an ID for the starting group */
- if((gid = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
- HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
-
- /* Get the location of the starting group */
- if(H5G_loc(gid, &start_loc) < 0)
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
-
- /* Set up user data */
- udata.gid = gid;
- udata.curr_loc = &start_loc;
- udata.lapl_id = lapl_id;
- udata.dxpl_id = dxpl_id;
- udata.idx_type = idx_type;
- udata.order = order;
- udata.op = op;
- udata.op_data = op_data;
-
- /* Allocate space for the path name */
- if(NULL == (udata.path = H5MM_strdup("")))
- HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate path name buffer")
- udata.path_buf_size = 1;
- udata.curr_path_len = 0;
-
- /* Create skip list to store visited object information */
- if((udata.visited = H5SL_create(H5SL_TYPE_OBJ, NULL)) == NULL)
- HGOTO_ERROR(H5E_SYM, H5E_CANTCREATE, FAIL, "can't create skip list for visited objects")
-
- /* Get the group's reference count */
- if(H5O_get_rc_and_type(&grp->oloc, dxpl_id, &rc, NULL) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get object info")
-
- /* If its ref count is > 1, we add it to the list of visited objects */
- /* (because it could come up again during traversal) */
- if(rc > 1) {
- H5_obj_t *obj_pos; /* New object node for visited list */
-
- /* Allocate new object "position" node */
- if((obj_pos = H5FL_MALLOC(H5_obj_t)) == NULL)
- HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate object node")
-
- /* Construct unique "position" for this object */
- H5F_GET_FILENO(grp->oloc.file, obj_pos->fileno);
- obj_pos->addr = grp->oloc.addr;
-
- /* Add to list of visited objects */
- if(H5SL_insert(udata.visited, obj_pos, obj_pos) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "can't insert object node into visited list")
- } /* end if */
-
- /* Attempt to get the link info for this group */
- if((linfo_exists = H5G_obj_get_linfo(&(grp->oloc), &linfo, dxpl_id)) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
- if(linfo_exists) {
- /* Check for creation order tracking, if creation order index lookup requested */
- if(idx_type == H5_INDEX_CRT_ORDER) {
- /* Check if creation order is tracked */
- if(!linfo.track_corder)
- /* Switch to name order for this group */
- idx_type = H5_INDEX_NAME;
- } /* end if */
- else
- HDassert(idx_type == H5_INDEX_NAME);
- } /* end if */
- else {
- /* Can only perform name lookups on groups with symbol tables */
- if(idx_type != H5_INDEX_NAME)
- /* Switch to name order for this group */
- idx_type = H5_INDEX_NAME;
- } /* end if */
-
- /* Call the link iteration routine */
- if((ret_value = H5G_obj_iterate(&(grp->oloc), idx_type, order, (hsize_t)0, NULL, H5G_visit_cb, &udata, dxpl_id)) < 0)
- HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't visit links")
-
-done:
- /* Release user data resources */
- H5MM_xfree(udata.path);
- if(udata.visited)
- H5SL_destroy(udata.visited, H5G_free_visit_visited, NULL);
-
- /* Release the group opened */
- if(gid > 0) {
- if(H5I_dec_app_ref(gid) < 0)
- HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close group")
- } /* end if */
- else if(grp && H5G_close(grp) < 0)
- HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group")
-
- FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_visit() */
-
diff --git a/src/H5Gbtree2.c b/src/H5Gbtree2.c
index 9864dd9..bee3fe4 100644
--- a/src/H5Gbtree2.c
+++ b/src/H5Gbtree2.c
@@ -167,7 +167,7 @@ H5G_dense_fh_name_cmp(const void *obj, size_t UNUSED obj_len, void *_udata)
H5O_link_t *lnk; /* Pointer to link created from heap object */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_dense_fh_name_cmp)
+ FUNC_ENTER_NOAPI_NOINIT
/* Decode link information */
if(NULL == (lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, (const unsigned char *)obj)))
@@ -209,7 +209,7 @@ H5G_dense_btree2_name_store(void *_nrecord, const void *_udata)
const H5G_bt2_ud_ins_t *udata = (const H5G_bt2_ud_ins_t *)_udata;
H5G_dense_bt2_name_rec_t *nrecord = (H5G_dense_bt2_name_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_name_store)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Copy user information info native record */
nrecord->hash = udata->common.name_hash;
@@ -240,7 +240,7 @@ H5G_dense_btree2_name_compare(const void *_bt2_udata, const void *_bt2_rec)
const H5G_dense_bt2_name_rec_t *bt2_rec = (const H5G_dense_bt2_name_rec_t *)_bt2_rec;
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_name_compare)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(bt2_udata);
@@ -310,7 +310,7 @@ H5G_dense_btree2_name_encode(uint8_t *raw, const void *_nrecord, void UNUSED *ct
{
const H5G_dense_bt2_name_rec_t *nrecord = (const H5G_dense_bt2_name_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_name_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Encode the record's fields */
UINT32ENCODE(raw, nrecord->hash)
@@ -338,7 +338,7 @@ H5G_dense_btree2_name_decode(const uint8_t *raw, void *_nrecord, void UNUSED *ct
{
H5G_dense_bt2_name_rec_t *nrecord = (H5G_dense_bt2_name_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_name_decode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Decode the record's fields */
UINT32DECODE(raw, nrecord->hash)
@@ -369,7 +369,7 @@ H5G_dense_btree2_name_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED dx
const H5G_dense_bt2_name_rec_t *nrecord = (const H5G_dense_bt2_name_rec_t *)_nrecord;
unsigned u; /* Local index variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_name_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDfprintf(stream, "%*s%-*s {%lx, ", indent, "", fwidth, "Record:",
nrecord->hash);
@@ -399,7 +399,7 @@ H5G_dense_btree2_corder_store(void *_nrecord, const void *_udata)
const H5G_bt2_ud_ins_t *udata = (const H5G_bt2_ud_ins_t *)_udata;
H5G_dense_bt2_corder_rec_t *nrecord = (H5G_dense_bt2_corder_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_corder_store)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Copy user information info native record */
nrecord->corder = udata->common.corder;
@@ -430,7 +430,7 @@ H5G_dense_btree2_corder_compare(const void *_bt2_udata, const void *_bt2_rec)
const H5G_dense_bt2_corder_rec_t *bt2_rec = (const H5G_dense_bt2_corder_rec_t *)_bt2_rec;
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_corder_compare)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(bt2_udata);
@@ -476,7 +476,7 @@ H5G_dense_btree2_corder_encode(uint8_t *raw, const void *_nrecord, void UNUSED *
{
const H5G_dense_bt2_corder_rec_t *nrecord = (const H5G_dense_bt2_corder_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_corder_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Encode the record's fields */
INT64ENCODE(raw, nrecord->corder)
@@ -504,7 +504,7 @@ H5G_dense_btree2_corder_decode(const uint8_t *raw, void *_nrecord, void UNUSED *
{
H5G_dense_bt2_corder_rec_t *nrecord = (H5G_dense_bt2_corder_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_corder_decode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Decode the record's fields */
INT64DECODE(raw, nrecord->corder)
@@ -535,7 +535,7 @@ H5G_dense_btree2_corder_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED
const H5G_dense_bt2_corder_rec_t *nrecord = (const H5G_dense_bt2_corder_rec_t *)_nrecord;
unsigned u; /* Local index variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_dense_btree2_corder_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDfprintf(stream, "%*s%-*s {%Hu, ", indent, "", fwidth, "Record:",
nrecord->corder);
diff --git a/src/H5Gcache.c b/src/H5Gcache.c
index e2d396e..e390eaa 100644
--- a/src/H5Gcache.c
+++ b/src/H5Gcache.c
@@ -129,7 +129,7 @@ H5G_node_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata)
const uint8_t *p;
H5G_node_t *ret_value; /*for error handling */
- FUNC_ENTER_NOAPI_NOINIT(H5G_node_load)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -180,7 +180,7 @@ H5G_node_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata)
UINT16DECODE(p, sym->nsyms);
/* entries */
- if(H5G_ent_decode_vec(f, &p, sym->entry, sym->nsyms) < 0)
+ if(H5G__ent_decode_vec(f, &p, sym->entry, sym->nsyms) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTLOAD, NULL, "unable to decode symbol table entries")
/* Set return value */
@@ -191,7 +191,7 @@ done:
if(wb && H5WB_unwrap(wb) < 0)
HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, NULL, "can't close wrapped buffer")
if(!ret_value)
- if(sym && H5G_node_free(sym) < 0)
+ if(sym && H5G__node_free(sym) < 0)
HDONE_ERROR(H5E_SYM, H5E_CANTFREE, NULL, "unable to destroy symbol table node")
FUNC_LEAVE_NOAPI(ret_value)
@@ -218,7 +218,7 @@ H5G_node_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5G_node_
uint8_t node_buf[H5G_NODE_BUF_SIZE]; /* Buffer for node */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_node_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -259,7 +259,7 @@ H5G_node_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5G_node_
UINT16ENCODE(p, sym->nsyms);
/* entries */
- if(H5G_ent_encode_vec(f, &p, sym->entry, sym->nsyms) < 0)
+ if(H5G__ent_encode_vec(f, &p, sym->entry, sym->nsyms) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTENCODE, FAIL, "can't serialize")
HDmemset(p, 0, sym->node_size - (size_t)(p - node));
@@ -306,7 +306,7 @@ H5G_node_dest(H5F_t *f, H5G_node_t *sym)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_node_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -329,7 +329,7 @@ H5G_node_dest(H5F_t *f, H5G_node_t *sym)
} /* end if */
/* Destroy symbol table node */
- if(H5G_node_free(sym) < 0)
+ if(H5G__node_free(sym) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to destroy symbol table node")
done:
@@ -355,7 +355,7 @@ H5G_node_clear(H5F_t *f, H5G_node_t *sym, hbool_t destroy)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5G_node_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -395,7 +395,7 @@ done:
static herr_t
H5G_node_size(const H5F_t UNUSED *f, const H5G_node_t *sym, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
diff --git a/src/H5Gcompact.c b/src/H5Gcompact.c
index 26773cb..e4de283 100644
--- a/src/H5Gcompact.c
+++ b/src/H5Gcompact.c
@@ -89,7 +89,7 @@ H5G_compact_build_table_cb(const void *_mesg, unsigned UNUSED idx, void *_udata)
H5G_iter_bt_t *udata = (H5G_iter_bt_t *)_udata; /* 'User data' passed in */
herr_t ret_value=H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_compact_build_table_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(lnk);
@@ -128,7 +128,7 @@ H5G_compact_build_table(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_compact_build_table)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(oloc);
@@ -159,7 +159,7 @@ H5G_compact_build_table(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "error iterating over link messages")
/* Sort link table in correct iteration order */
- if(H5G_link_sort_table(ltable, idx_type, order) < 0)
+ if(H5G__link_sort_table(ltable, idx_type, order) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTSORT, FAIL, "error sorting link messages")
} /* end if */
else
@@ -171,7 +171,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_compact_insert
+ * Function: H5G__compact_insert
*
* Purpose: Insert a new symbol into the table described by GRP_ENT in
* file F. The name of the new symbol is NAME and its symbol
@@ -186,12 +186,12 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_compact_insert(const H5O_loc_t *grp_oloc, H5O_link_t *obj_lnk,
+H5G__compact_insert(const H5O_loc_t *grp_oloc, H5O_link_t *obj_lnk,
hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_compact_insert, FAIL)
+ FUNC_ENTER_PACKAGE
/* check arguments */
HDassert(grp_oloc && grp_oloc->file);
@@ -203,11 +203,11 @@ H5G_compact_insert(const H5O_loc_t *grp_oloc, H5O_link_t *obj_lnk,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_compact_insert() */
+} /* end H5G__compact_insert() */
/*-------------------------------------------------------------------------
- * Function: H5G_compact_get_name_by_idx
+ * Function: H5G__compact_get_name_by_idx
*
* Purpose: Returns the name of objects in the group by giving index.
*
@@ -220,14 +220,14 @@ done:
*-------------------------------------------------------------------------
*/
ssize_t
-H5G_compact_get_name_by_idx(H5O_loc_t *oloc, hid_t dxpl_id,
+H5G__compact_get_name_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
const H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order,
hsize_t idx, char* name, size_t size)
{
H5G_link_table_t ltable = {0, NULL}; /* Link table */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5G_compact_get_name_by_idx, FAIL)
+ FUNC_ENTER_PACKAGE
/* Sanity check */
HDassert(oloc);
@@ -252,11 +252,11 @@ H5G_compact_get_name_by_idx(H5O_loc_t *oloc, hid_t dxpl_id,
done:
/* Release link table */
- if(ltable.lnks && H5G_link_release_table(&ltable) < 0)
+ if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_compact_get_name_by_idx() */
+} /* end H5G__compact_get_name_by_idx() */
/*-------------------------------------------------------------------------
@@ -280,7 +280,7 @@ H5G_compact_remove_common_cb(const void *_mesg, unsigned UNUSED idx, void *_udat
H5G_iter_rm_t *udata = (H5G_iter_rm_t *)_udata; /* 'User data' passed in */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_compact_remove_common_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(lnk);
@@ -289,7 +289,7 @@ H5G_compact_remove_common_cb(const void *_mesg, unsigned UNUSED idx, void *_udat
/* If we've found the right link, get the object type */
if(HDstrcmp(lnk->name, udata->name) == 0) {
/* Replace path names for link being removed */
- if(H5G_link_name_replace(udata->file, udata->dxpl_id, udata->grp_full_path_r, lnk) < 0)
+ if(H5G__link_name_replace(udata->file, udata->dxpl_id, udata->grp_full_path_r, lnk) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get object type")
/* Stop the iteration, we found the correct link */
@@ -302,7 +302,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_compact_remove
+ * Function: H5G__compact_remove
*
* Purpose: Remove NAME from links.
*
@@ -314,13 +314,13 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_compact_remove(const H5O_loc_t *oloc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
+H5G__compact_remove(const H5O_loc_t *oloc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
const char *name)
{
H5G_iter_rm_t udata; /* Data to pass through OH iteration */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_compact_remove, FAIL)
+ FUNC_ENTER_PACKAGE
HDassert(oloc && oloc->file);
HDassert(name && *name);
@@ -337,11 +337,11 @@ H5G_compact_remove(const H5O_loc_t *oloc, hid_t dxpl_id, H5RS_str_t *grp_full_pa
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_compact_remove() */
+} /* end H5G__compact_remove() */
/*-------------------------------------------------------------------------
- * Function: H5G_compact_remove_by_idx
+ * Function: H5G__compact_remove_by_idx
*
* Purpose: Remove link from group, according to an index order.
*
@@ -353,7 +353,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_compact_remove_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
+H5G__compact_remove_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
const H5O_linfo_t *linfo, H5RS_str_t *grp_full_path_r, H5_index_t idx_type,
H5_iter_order_t order, hsize_t n)
{
@@ -361,7 +361,7 @@ H5G_compact_remove_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
H5G_iter_rm_t udata; /* Data to pass through OH iteration */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_compact_remove_by_idx, FAIL)
+ FUNC_ENTER_PACKAGE
HDassert(oloc && oloc->file);
HDassert(linfo);
@@ -386,15 +386,15 @@ H5G_compact_remove_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
done:
/* Release link table */
- if(ltable.lnks && H5G_link_release_table(&ltable) < 0)
+ if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_compact_remove_by_idx() */
+} /* end H5G__compact_remove_by_idx() */
/*-------------------------------------------------------------------------
- * Function: H5G_compact_iterate
+ * Function: H5G__compact_iterate
*
* Purpose: Iterate over the links in a group
*
@@ -406,14 +406,14 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
+H5G__compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
H5G_lib_iterate_t op, void *op_data)
{
H5G_link_table_t ltable = {0, NULL}; /* Link table */
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5G_compact_iterate, FAIL)
+ FUNC_ENTER_PACKAGE
/* Sanity check */
HDassert(oloc);
@@ -425,16 +425,16 @@ H5G_compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *lin
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create link message table")
/* Iterate over links in table */
- if((ret_value = H5G_link_iterate_table(&ltable, skip, last_lnk, op, op_data)) < 0)
+ if((ret_value = H5G__link_iterate_table(&ltable, skip, last_lnk, op, op_data)) < 0)
HERROR(H5E_SYM, H5E_CANTNEXT, "iteration operator failed");
done:
/* Release link table */
- if(ltable.lnks && H5G_link_release_table(&ltable) < 0)
+ if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_compact_iterate() */
+} /* end H5G__compact_iterate() */
/*-------------------------------------------------------------------------
@@ -458,7 +458,7 @@ H5G_compact_lookup_cb(const void *_mesg, unsigned UNUSED idx, void *_udata)
H5G_iter_lkp_t *udata = (H5G_iter_lkp_t *)_udata; /* 'User data' passed in */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_compact_lookup_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(lnk);
@@ -485,7 +485,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_compact_lookup
+ * Function: H5G__compact_lookup
*
* Purpose: Look up an object relative to a group, using link messages.
*
@@ -498,14 +498,14 @@ done:
*-------------------------------------------------------------------------
*/
htri_t
-H5G_compact_lookup(H5O_loc_t *oloc, const char *name, H5O_link_t *lnk,
+H5G__compact_lookup(const H5O_loc_t *oloc, const char *name, H5O_link_t *lnk,
hid_t dxpl_id)
{
H5G_iter_lkp_t udata; /* User data for iteration callback */
H5O_mesg_operator_t op; /* Message operator */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5G_compact_lookup, FAIL)
+ FUNC_ENTER_PACKAGE
/* check arguments */
HDassert(lnk && oloc->file);
@@ -527,11 +527,11 @@ H5G_compact_lookup(H5O_loc_t *oloc, const char *name, H5O_link_t *lnk,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_compact_lookup() */
+} /* end H5G__compact_lookup() */
/*-------------------------------------------------------------------------
- * Function: H5G_compact_lookup_by_idx
+ * Function: H5G__compact_lookup_by_idx
*
* Purpose: Look up an object in a group using link messages,
* according to the order of an index
@@ -545,13 +545,13 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_compact_lookup_by_idx(H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
+H5G__compact_lookup_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5O_link_t *lnk)
{
H5G_link_table_t ltable = {0, NULL};/* Link table */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_compact_lookup_by_idx, FAIL)
+ FUNC_ENTER_PACKAGE
/* check arguments */
HDassert(oloc && oloc->file);
@@ -572,16 +572,16 @@ H5G_compact_lookup_by_idx(H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *lin
done:
/* Release link table */
- if(ltable.lnks && H5G_link_release_table(&ltable) < 0)
+ if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_compact_lookup_by_idx() */
+} /* end H5G__compact_lookup_by_idx() */
#ifndef H5_NO_DEPRECATED_SYMBOLS
/*-------------------------------------------------------------------------
- * Function: H5G_compact_get_type_by_idx
+ * Function: H5G__compact_get_type_by_idx
*
* Purpose: Returns the type of objects in the group by giving index.
*
@@ -594,13 +594,13 @@ done:
*-------------------------------------------------------------------------
*/
H5G_obj_t
-H5G_compact_get_type_by_idx(H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
+H5G__compact_get_type_by_idx(H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *linfo,
hsize_t idx)
{
H5G_link_table_t ltable = {0, NULL}; /* Link table */
H5G_obj_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5G_compact_get_type_by_idx, H5G_UNKNOWN)
+ FUNC_ENTER_PACKAGE
/* Sanity check */
HDassert(oloc);
@@ -639,10 +639,10 @@ H5G_compact_get_type_by_idx(H5O_loc_t *oloc, hid_t dxpl_id, const H5O_linfo_t *l
done:
/* Release link table */
- if(ltable.lnks && H5G_link_release_table(&ltable) < 0)
+ if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
HDONE_ERROR(H5E_SYM, H5E_CANTFREE, H5G_UNKNOWN, "unable to release link table")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_compact_get_type_by_idx() */
+} /* end H5G__compact_get_type_by_idx() */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
diff --git a/src/H5Gdense.c b/src/H5Gdense.c
index 0bb29d5..841b4d3 100644
--- a/src/H5Gdense.c
+++ b/src/H5Gdense.c
@@ -254,7 +254,7 @@ typedef struct {
/*-------------------------------------------------------------------------
- * Function: H5G_dense_create
+ * Function: H5G__dense_create
*
* Purpose: Creates dense link storage structures for a group
*
@@ -267,7 +267,7 @@ typedef struct {
*-------------------------------------------------------------------------
*/
herr_t
-H5G_dense_create(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
+H5G__dense_create(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
const H5O_pline_t *pline)
{
H5HF_create_t fheap_cparam; /* Fractal heap creation parameters */
@@ -278,7 +278,7 @@ H5G_dense_create(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
size_t fheap_id_len; /* Fractal heap ID length */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_dense_create, FAIL)
+ FUNC_ENTER_PACKAGE
/*
* Check arguments.
@@ -367,11 +367,11 @@ done:
HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for creation order index")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_dense_create() */
+} /* end H5G__dense_create() */
/*-------------------------------------------------------------------------
- * Function: H5G_dense_insert
+ * Function: H5G__dense_insert
*
* Purpose: Insert a link into the dense link storage structures for a group
*
@@ -384,7 +384,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
+H5G__dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
const H5O_link_t *lnk)
{
H5G_bt2_ud_ins_t udata; /* User data for v2 B-tree insertion */
@@ -397,7 +397,7 @@ H5G_dense_insert(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
void *link_ptr = NULL; /* Pointer to serialized link */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_dense_insert, FAIL)
+ FUNC_ENTER_PACKAGE
/*
* Check arguments.
@@ -480,7 +480,7 @@ done:
HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close wrapped buffer")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_dense_insert() */
+} /* end H5G__dense_insert() */
/*-------------------------------------------------------------------------
@@ -503,7 +503,7 @@ H5G_dense_lookup_cb(const void *_lnk, void *_user_lnk)
H5O_link_t *user_lnk = (H5O_link_t *)_user_lnk; /* User data from v2 B-tree link lookup */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_dense_lookup_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -521,7 +521,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_dense_lookup
+ * Function: H5G__dense_lookup
*
* Purpose: Look up a link within a group that uses dense link storage
*
@@ -534,7 +534,7 @@ done:
*-------------------------------------------------------------------------
*/
htri_t
-H5G_dense_lookup(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
+H5G__dense_lookup(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
const char *name, H5O_link_t *lnk)
{
H5G_bt2_ud_common_t udata; /* User data for v2 B-tree link lookup */
@@ -542,7 +542,7 @@ H5G_dense_lookup(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5G_dense_lookup, FAIL)
+ FUNC_ENTER_PACKAGE
/*
* Check arguments.
@@ -581,7 +581,7 @@ done:
HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for name index")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_dense_lookup() */
+} /* end H5G__dense_lookup() */
/*-------------------------------------------------------------------------
@@ -605,7 +605,7 @@ H5G_dense_lookup_by_idx_fh_cb(const void *obj, size_t UNUSED obj_len, void *_uda
H5O_link_t *tmp_lnk = NULL; /* Temporary pointer to link */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_dense_lookup_by_idx_fh_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Decode link information & keep a copy */
if(NULL == (tmp_lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, (const unsigned char *)obj)))
@@ -645,7 +645,7 @@ H5G_dense_lookup_by_idx_bt2_cb(const void *_record, void *_bt2_udata)
H5G_fh_ud_lbi_t fh_udata; /* User data for fractal heap 'op' callback */
int ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_dense_lookup_by_idx_bt2_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Prepare user data for callback */
/* down */
@@ -664,7 +664,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_dense_lookup_by_idx
+ * Function: H5G__dense_lookup_by_idx
*
* Purpose: Look up a link within a group that uses dense link storage,
* according to the order of an index
@@ -678,7 +678,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_dense_lookup_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
+H5G__dense_lookup_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
H5_index_t idx_type, H5_iter_order_t order, hsize_t n, H5O_link_t *lnk)
{
H5HF_t *fheap = NULL; /* Fractal heap handle */
@@ -687,7 +687,7 @@ H5G_dense_lookup_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
haddr_t bt2_addr; /* Address of v2 B-tree to use for lookup */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_dense_lookup_by_idx, FAIL)
+ FUNC_ENTER_PACKAGE
/*
* Check arguments.
@@ -748,7 +748,7 @@ H5G_dense_lookup_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
} /* end if */
else { /* Otherwise, we need to build a table of the links and sort it */
/* Build the table of links for this group */
- if(H5G_dense_build_table(f, dxpl_id, linfo, idx_type, order, &ltable) < 0)
+ if(H5G__dense_build_table(f, dxpl_id, linfo, idx_type, order, &ltable) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "error building table of links")
/* Check for going out of bounds */
@@ -766,11 +766,11 @@ done:
HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
if(bt2 && H5B2_close(bt2, dxpl_id) < 0)
HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for index")
- if(ltable.lnks && H5G_link_release_table(&ltable) < 0)
+ if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_dense_lookup_by_idx() */
+} /* end H5G__dense_lookup_by_idx() */
/*-------------------------------------------------------------------------
@@ -794,7 +794,7 @@ H5G_dense_build_table_cb(const H5O_link_t *lnk, void *_udata)
H5G_dense_bt_ud_t *udata = (H5G_dense_bt_ud_t *)_udata; /* 'User data' passed in */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_dense_build_table_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(lnk);
@@ -814,7 +814,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_dense_build_table
+ * Function: H5G__dense_build_table
*
* Purpose: Builds a table containing a sorted list of links for a group
*
@@ -830,12 +830,12 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
+H5G__dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
H5_index_t idx_type, H5_iter_order_t order, H5G_link_table_t *ltable)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_dense_build_table)
+ FUNC_ENTER_PACKAGE
/* Sanity check */
HDassert(f);
@@ -859,11 +859,11 @@ H5G_dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
udata.curr_lnk = 0;
/* Iterate over the links in the group, building a table of the link messages */
- if(H5G_dense_iterate(f, dxpl_id, linfo, H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)0, NULL, H5G_dense_build_table_cb, &udata) < 0)
+ if(H5G__dense_iterate(f, dxpl_id, linfo, H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)0, NULL, H5G_dense_build_table_cb, &udata) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTNEXT, FAIL, "error iterating over links")
/* Sort link table in correct iteration order */
- if(H5G_link_sort_table(ltable, idx_type, order) < 0)
+ if(H5G__link_sort_table(ltable, idx_type, order) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTSORT, FAIL, "error sorting link messages")
} /* end if */
else
@@ -871,7 +871,7 @@ H5G_dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_dense_build_table() */
+} /* end H5G__dense_build_table() */
/*-------------------------------------------------------------------------
@@ -894,7 +894,7 @@ H5G_dense_iterate_fh_cb(const void *obj, size_t UNUSED obj_len, void *_udata)
H5G_fh_ud_it_t *udata = (H5G_fh_ud_it_t *)_udata; /* User data for fractal heap 'op' callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_dense_iterate_fh_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Decode link information & keep a copy */
/* (we make a copy instead of calling the user/library callback directly in
@@ -931,7 +931,7 @@ H5G_dense_iterate_bt2_cb(const void *_record, void *_bt2_udata)
H5G_bt2_ud_it_t *bt2_udata = (H5G_bt2_ud_it_t *)_bt2_udata; /* User data for callback */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_dense_iterate_bt2_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check for skipping links */
if(bt2_udata->skip > 0)
@@ -970,7 +970,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_dense_iterate
+ * Function: H5G__dense_iterate
*
* Purpose: Iterate over the objects in a group using dense link storage
*
@@ -983,7 +983,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
+H5G__dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
H5G_lib_iterate_t op, void *op_data)
{
@@ -993,7 +993,7 @@ H5G_dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
haddr_t bt2_addr; /* Address of v2 B-tree to use for lookup */
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5G_dense_iterate, FAIL)
+ FUNC_ENTER_PACKAGE
/*
* Check arguments.
@@ -1065,11 +1065,11 @@ H5G_dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
} /* end if */
else {
/* Build the table of links for this group */
- if(H5G_dense_build_table(f, dxpl_id, linfo, idx_type, order, &ltable) < 0)
+ if(H5G__dense_build_table(f, dxpl_id, linfo, idx_type, order, &ltable) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "error building table of links")
/* Iterate over links in table */
- if((ret_value = H5G_link_iterate_table(&ltable, skip, last_lnk, op, op_data)) < 0)
+ if((ret_value = H5G__link_iterate_table(&ltable, skip, last_lnk, op, op_data)) < 0)
HERROR(H5E_SYM, H5E_CANTNEXT, "iteration operator failed");
} /* end else */
@@ -1079,11 +1079,11 @@ done:
HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
if(bt2 && H5B2_close(bt2, dxpl_id) < 0)
HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for index")
- if(ltable.lnks && H5G_link_release_table(&ltable) < 0)
+ if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_dense_iterate() */
+} /* end H5G__dense_iterate() */
/*-------------------------------------------------------------------------
@@ -1107,7 +1107,7 @@ H5G_dense_get_name_by_idx_fh_cb(const void *obj, size_t UNUSED obj_len, void *_u
H5O_link_t *lnk; /* Pointer to link created from heap object */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_dense_get_name_by_idx_fh_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Decode link information */
if(NULL == (lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, (const unsigned char *)obj)))
@@ -1152,7 +1152,7 @@ H5G_dense_get_name_by_idx_bt2_cb(const void *_record, void *_bt2_udata)
H5G_fh_ud_gnbi_t fh_udata; /* User data for fractal heap 'op' callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_dense_get_name_by_idx_bt2_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Prepare user data for callback */
/* down */
@@ -1175,7 +1175,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_dense_get_name_by_idx
+ * Function: H5G__dense_get_name_by_idx
*
* Purpose: Returns the name of objects in the group by giving index.
*
@@ -1189,7 +1189,7 @@ done:
*-------------------------------------------------------------------------
*/
ssize_t
-H5G_dense_get_name_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
+H5G__dense_get_name_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
H5_index_t idx_type, H5_iter_order_t order, hsize_t n, char *name,
size_t size)
{
@@ -1199,7 +1199,7 @@ H5G_dense_get_name_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
haddr_t bt2_addr; /* Address of v2 B-tree to use for lookup */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5G_dense_get_name_by_idx, FAIL)
+ FUNC_ENTER_PACKAGE
/*
* Check arguments.
@@ -1263,7 +1263,7 @@ H5G_dense_get_name_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
} /* end if */
else { /* Otherwise, we need to build a table of the links and sort it */
/* Build the table of links for this group */
- if(H5G_dense_build_table(f, dxpl_id, linfo, idx_type, order, &ltable) < 0)
+ if(H5G__dense_build_table(f, dxpl_id, linfo, idx_type, order, &ltable) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "error building table of links")
/* Check for going out of bounds */
@@ -1287,11 +1287,11 @@ done:
HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
if(bt2 && H5B2_close(bt2, dxpl_id) < 0)
HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for index")
- if(ltable.lnks && H5G_link_release_table(&ltable) < 0)
+ if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_dense_get_name_by_idx() */
+} /* end H5G__dense_get_name_by_idx() */
/*-------------------------------------------------------------------------
@@ -1315,7 +1315,7 @@ H5G_dense_remove_fh_cb(const void *obj, size_t UNUSED obj_len, void *_udata)
H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_dense_remove_fh_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Decode link information */
if(NULL == (lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, (const unsigned char *)obj)))
@@ -1340,7 +1340,7 @@ H5G_dense_remove_fh_cb(const void *obj, size_t UNUSED obj_len, void *_udata)
/* Replace open objects' names, if requested */
if(udata->replace_names)
- if(H5G_link_name_replace(udata->f, udata->dxpl_id, udata->grp_full_path_r, lnk) < 0)
+ if(H5G__link_name_replace(udata->f, udata->dxpl_id, udata->grp_full_path_r, lnk) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTRENAME, FAIL, "unable to rename open objects")
/* Perform the deletion action on the link, if requested */
@@ -1380,7 +1380,7 @@ H5G_dense_remove_bt2_cb(const void *_record, void *_bt2_udata)
H5G_fh_ud_rm_t fh_udata; /* User data for fractal heap 'op' callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_dense_remove_bt2_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Set up the user data for fractal heap 'op' callback */
fh_udata.f = bt2_udata->common.f;
@@ -1405,7 +1405,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_dense_remove
+ * Function: H5G__dense_remove
*
* Purpose: Remove a link from the dense storage of a group
*
@@ -1418,7 +1418,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
+H5G__dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
H5RS_str_t *grp_full_path_r, const char *name)
{
H5HF_t *fheap = NULL; /* Fractal heap handle */
@@ -1426,7 +1426,7 @@ H5G_dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_dense_remove, FAIL)
+ FUNC_ENTER_PACKAGE
/*
* Check arguments.
@@ -1468,7 +1468,7 @@ done:
HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for name index")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_dense_remove() */
+} /* end H5G__dense_remove() */
/*-------------------------------------------------------------------------
@@ -1490,7 +1490,7 @@ H5G_dense_remove_by_idx_fh_cb(const void *obj, size_t UNUSED obj_len, void *_uda
H5G_fh_ud_rmbi_t *udata = (H5G_fh_ud_rmbi_t *)_udata; /* User data for fractal heap 'op' callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_dense_remove_by_idx_fh_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Decode link information */
if(NULL == (udata->lnk = (H5O_link_t *)H5O_msg_decode(udata->f, udata->dxpl_id, NULL, H5O_LINK_ID, (const unsigned char *)obj)))
@@ -1525,7 +1525,7 @@ H5G_dense_remove_by_idx_bt2_cb(const void *_record, void *_bt2_udata)
const uint8_t *heap_id; /* Heap ID for link */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_dense_remove_by_idx_bt2_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Determine the index being used */
if(bt2_udata->idx_type == H5_INDEX_NAME) {
@@ -1588,7 +1588,7 @@ H5G_dense_remove_by_idx_bt2_cb(const void *_record, void *_bt2_udata)
} /* end if */
/* Replace open objects' names */
- if(H5G_link_name_replace(bt2_udata->f, bt2_udata->dxpl_id, bt2_udata->grp_full_path_r, fh_udata.lnk) < 0)
+ if(H5G__link_name_replace(bt2_udata->f, bt2_udata->dxpl_id, bt2_udata->grp_full_path_r, fh_udata.lnk) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTRENAME, FAIL, "unable to rename open objects")
/* Perform the deletion action on the link */
@@ -1613,7 +1613,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_dense_remove_by_idx
+ * Function: H5G__dense_remove_by_idx
*
* Purpose: Remove a link from the dense storage of a group, according to
* to the offset in an indexed order
@@ -1627,7 +1627,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
+H5G__dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
H5RS_str_t *grp_full_path_r, H5_index_t idx_type, H5_iter_order_t order,
hsize_t n)
{
@@ -1637,7 +1637,7 @@ H5G_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
haddr_t bt2_addr; /* Address of v2 B-tree to use for lookup */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_dense_remove_by_idx, FAIL)
+ FUNC_ENTER_PACKAGE
/*
* Check arguments.
@@ -1699,7 +1699,7 @@ H5G_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
} /* end if */
else { /* Otherwise, we need to build a table of the links and sort it */
/* Build the table of links for this group */
- if(H5G_dense_build_table(f, dxpl_id, linfo, idx_type, order, &ltable) < 0)
+ if(H5G__dense_build_table(f, dxpl_id, linfo, idx_type, order, &ltable) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "error building table of links")
/* Check for going out of bounds */
@@ -1707,7 +1707,7 @@ H5G_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "index out of bound")
/* Remove the appropriate link from the dense storage */
- if(H5G_dense_remove(f, dxpl_id, linfo, grp_full_path_r, ltable.lnks[n].name) < 0)
+ if(H5G__dense_remove(f, dxpl_id, linfo, grp_full_path_r, ltable.lnks[n].name) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTREMOVE, FAIL, "unable to remove link from dense storage")
} /* end else */
@@ -1717,15 +1717,15 @@ done:
HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close fractal heap")
if(bt2 && H5B2_close(bt2, dxpl_id) < 0)
HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for index")
- if(ltable.lnks && H5G_link_release_table(&ltable) < 0)
+ if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_dense_remove_by_idx() */
+} /* end H5G__dense_remove_by_idx() */
/*-------------------------------------------------------------------------
- * Function: H5G_dense_delete
+ * Function: H5G__dense_delete
*
* Purpose: Delete the dense storage for a group
*
@@ -1738,11 +1738,11 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_dense_delete(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo, hbool_t adj_link)
+H5G__dense_delete(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo, hbool_t adj_link)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_dense_delete, FAIL)
+ FUNC_ENTER_PACKAGE
/*
* Check arguments.
@@ -1808,12 +1808,12 @@ H5G_dense_delete(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo, hbool_t adj_link)
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_dense_delete() */
+} /* end H5G__dense_delete() */
#ifndef H5_NO_DEPRECATED_SYMBOLS
/*-------------------------------------------------------------------------
- * Function: H5G_dense_get_type_by_idx
+ * Function: H5G__dense_get_type_by_idx
*
* Purpose: Returns the type of objects in the group by giving index.
*
@@ -1833,13 +1833,13 @@ done:
*-------------------------------------------------------------------------
*/
H5G_obj_t
-H5G_dense_get_type_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
+H5G__dense_get_type_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
hsize_t idx)
{
H5G_link_table_t ltable = {0, NULL}; /* Table of links */
H5G_obj_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5G_dense_get_type_by_idx, H5G_UNKNOWN)
+ FUNC_ENTER_PACKAGE
/*
* Check arguments.
@@ -1848,7 +1848,7 @@ H5G_dense_get_type_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
HDassert(linfo);
/* Build the table of links for this group */
- if(H5G_dense_build_table(f, dxpl_id, linfo, H5_INDEX_NAME, H5_ITER_INC, &ltable) < 0)
+ if(H5G__dense_build_table(f, dxpl_id, linfo, H5_INDEX_NAME, H5_ITER_INC, &ltable) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5G_UNKNOWN, "error building table of links")
/* Check for going out of bounds */
@@ -1881,10 +1881,10 @@ H5G_dense_get_type_by_idx(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
done:
/* Release link table */
- if(ltable.lnks && H5G_link_release_table(&ltable) < 0)
+ if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
HDONE_ERROR(H5E_SYM, H5E_CANTFREE, H5G_UNKNOWN, "unable to release link table")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_dense_get_type_by_idx() */
+} /* end H5G__dense_get_type_by_idx() */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c
index 966410f..708b01b 100644
--- a/src/H5Gdeprec.c
+++ b/src/H5Gdeprec.c
@@ -116,15 +116,15 @@ RETURNS
Non-negative on success/Negative on failure
DESCRIPTION
Initializes any interface-specific data or routines. (Just calls
- H5G_init() currently).
+ H5G__init() currently).
--------------------------------------------------------------------------*/
static herr_t
H5G_init_deprec_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_init_deprec_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
- FUNC_LEAVE_NOAPI(H5G_init())
+ FUNC_LEAVE_NOAPI(H5G__init())
} /* H5G_init_deprec_interface() */
#ifndef H5_NO_DEPRECATED_SYMBOLS
@@ -146,8 +146,8 @@ H5G_map_obj_type(H5O_type_t obj_type)
{
H5G_obj_t ret_value; /* Return value */
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_map_obj_type)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Map object type to older "group" object type */
switch(obj_type) {
@@ -206,7 +206,7 @@ H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint)
hid_t tmp_gcpl = (-1); /* Temporary group creation property list */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Gcreate1, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("i", "i*sz", loc_id, name, size_hint);
/* Check arguments */
@@ -245,7 +245,7 @@ H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint)
tmp_gcpl = H5P_GROUP_CREATE_DEFAULT;
/* Create the new group & get its ID */
- if(NULL == (grp = H5G_create_named(&loc, name, H5P_LINK_CREATE_DEFAULT,
+ if(NULL == (grp = H5G__create_named(&loc, name, H5P_LINK_CREATE_DEFAULT,
tmp_gcpl, H5P_GROUP_ACCESS_DEFAULT, H5AC_dxpl_id)))
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group")
if((ret_value = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
@@ -288,7 +288,7 @@ H5Gopen1(hid_t loc_id, const char *name)
H5G_loc_t loc; /* Location of parent for group */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Gopen1, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("i", "i*s", loc_id, name);
/* Check args */
@@ -298,7 +298,7 @@ H5Gopen1(hid_t loc_id, const char *name)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name")
/* Open the group */
- if((grp = H5G_open_name(&loc, name, H5P_DEFAULT, H5AC_dxpl_id)) == NULL)
+ if((grp = H5G__open_name(&loc, name, H5P_DEFAULT, H5AC_dxpl_id)) == NULL)
HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
/* Register an atom for the group */
@@ -328,7 +328,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Glink, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "iLl*s*s", cur_loc_id, type, cur_name, new_name);
/* Check arguments */
@@ -374,7 +374,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Glink2, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "i*sLli*s", cur_loc_id, cur_name, type, new_loc_id, new_name);
/* Check arguments */
@@ -435,7 +435,7 @@ H5G_link_hard(hid_t cur_loc_id, const char *cur_name, hid_t new_loc_id,
H5G_loc_t new_loc, *new_loc_p; /* Information about new link's group */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_link_hard)
+ FUNC_ENTER_NOAPI_NOINIT
/* Finish checking arguments */
if(cur_loc_id == H5L_SAME_LOC && new_loc_id == H5L_SAME_LOC)
@@ -477,7 +477,7 @@ H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Gmove, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*s*s", src_loc_id, src_name, dst_name);
/* Call common routine to move the link */
@@ -502,7 +502,7 @@ H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Gmove2, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*si*s", src_loc_id, src_name, dst_loc_id, dst_name);
/* Call common routine to move the link */
@@ -539,7 +539,7 @@ H5G_move(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
H5G_loc_t dst_loc, *dst_loc_p; /* Group info for destination location */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_move)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(src_loc_id == H5L_SAME_LOC && dst_loc_id == H5L_SAME_LOC)
@@ -584,7 +584,7 @@ H5Gunlink(hid_t loc_id, const char *name)
H5G_loc_t loc; /* Group's location */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Gunlink, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*s", loc_id, name);
/* Check arguments */
@@ -616,7 +616,7 @@ H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf/*out*/)
H5G_loc_t loc; /* Group's location */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Gget_linkval, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*szx", loc_id, name, size, buf);
/* Check arguments */
@@ -657,7 +657,7 @@ H5Gset_comment(hid_t loc_id, const char *name, const char *comment)
H5G_loc_t loc;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Gset_comment, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*s*s", loc_id, name, comment);
if(H5G_loc(loc_id, &loc) < 0)
@@ -702,7 +702,7 @@ H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf)
H5G_loc_t loc;
int ret_value;
- FUNC_ENTER_API(H5Gget_comment, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("Is", "i*sz*s", loc_id, name, bufsize, buf);
if(H5G_loc(loc_id, &loc) < 0)
@@ -756,7 +756,7 @@ H5Giterate(hid_t loc_id, const char *name, int *idx_p, H5G_iterate_t op,
hsize_t idx; /* Internal location to hold index */
herr_t ret_value;
- FUNC_ENTER_API(H5Giterate, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "i*s*Isx*x", loc_id, name, idx_p, op, op_data);
/* Check args */
@@ -812,7 +812,7 @@ H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs)
H5O_type_t obj_type; /* Type of object at location */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_API(H5Gget_num_objs, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*h", loc_id, num_objs);
/* Check args */
@@ -826,7 +826,7 @@ H5Gget_num_objs(hid_t loc_id, hsize_t *num_objs)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "bad pointer to # of objects")
/* Retrieve information about the group */
- if(H5G_obj_info(loc.oloc, &grp_info, H5AC_ind_dxpl_id) < 0)
+ if(H5G__obj_info(loc.oloc, &grp_info, H5AC_ind_dxpl_id) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "can't determine")
/* Set the number of objects [sic: links] in the group */
@@ -861,7 +861,7 @@ H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link,
H5G_loc_t loc;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Gget_objinfo, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*sbx", loc_id, name, follow_link, statbuf);
/* Check arguments */
@@ -899,7 +899,7 @@ H5G_get_objinfo_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char *name, const H5O_
H5G_trav_goi_t *udata = (H5G_trav_goi_t *)_udata; /* User data passed in */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_get_objinfo_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check if the name in this group resolved to a valid link */
if(lnk == NULL && obj_loc == NULL)
@@ -981,7 +981,7 @@ H5G_get_objinfo(const H5G_loc_t *loc, const char *name, hbool_t follow_link,
H5G_trav_goi_t udata; /* User data for callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_get_objinfo)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(loc);
HDassert(name && *name);
@@ -1058,7 +1058,7 @@ H5Gget_objname_by_idx(hid_t loc_id, hsize_t idx, char *name, size_t size)
H5O_type_t obj_type; /* Type of object at location */
ssize_t ret_value;
- FUNC_ENTER_API(H5Gget_objname_by_idx, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("Zs", "ih*sz", loc_id, idx, name, size);
/* Check args */
@@ -1100,7 +1100,7 @@ H5Gget_objtype_by_idx(hid_t loc_id, hsize_t idx)
H5O_type_t obj_type; /* Type of object at location */
H5G_obj_t ret_value;
- FUNC_ENTER_API(H5Gget_objtype_by_idx, H5G_UNKNOWN)
+ FUNC_ENTER_API(H5G_UNKNOWN)
H5TRACE2("Go", "ih", loc_id, idx);
/* Check args */
@@ -1142,29 +1142,29 @@ H5G_obj_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx, hid_t dxpl_id)
htri_t linfo_exists; /* Whether the link info message exists */
H5G_obj_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5G_obj_get_type_by_idx, H5G_UNKNOWN)
+ FUNC_ENTER_NOAPI(H5G_UNKNOWN)
/* Sanity check */
HDassert(oloc);
/* Attempt to get the link info for this group */
- if((linfo_exists = H5G_obj_get_linfo(oloc, &linfo, dxpl_id)) < 0)
+ if((linfo_exists = H5G__obj_get_linfo(oloc, &linfo, dxpl_id)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5G_UNKNOWN, "can't check for link info message")
if(linfo_exists) {
if(H5F_addr_defined(linfo.fheap_addr)) {
/* Get the object's name from the dense link storage */
- if((ret_value = H5G_dense_get_type_by_idx(oloc->file, dxpl_id, &linfo, idx)) < 0)
+ if((ret_value = H5G__dense_get_type_by_idx(oloc->file, dxpl_id, &linfo, idx)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5G_UNKNOWN, "can't locate type")
} /* end if */
else {
/* Get the object's type from the link messages */
- if((ret_value = H5G_compact_get_type_by_idx(oloc, dxpl_id, &linfo, idx)) < 0)
+ if((ret_value = H5G__compact_get_type_by_idx(oloc, dxpl_id, &linfo, idx)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5G_UNKNOWN, "can't locate type")
} /* end else */
} /* end if */
else {
/* Get the object's type from the symbol table */
- if((ret_value = H5G_stab_get_type_by_idx(oloc, idx, dxpl_id)) < 0)
+ if((ret_value = H5G__stab_get_type_by_idx(oloc, idx, dxpl_id)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5G_UNKNOWN, "can't locate type")
} /* end else */
diff --git a/src/H5Gent.c b/src/H5Gent.c
index ad4c058..17893fa 100644
--- a/src/H5Gent.c
+++ b/src/H5Gent.c
@@ -76,7 +76,7 @@ H5FL_BLK_EXTERN(str_buf);
/*-------------------------------------------------------------------------
- * Function: H5G_ent_decode_vec
+ * Function: H5G__ent_decode_vec
*
* Purpose: Same as H5G_ent_decode() except it does it for an array of
* symbol table entries.
@@ -93,12 +93,12 @@ H5FL_BLK_EXTERN(str_buf);
*-------------------------------------------------------------------------
*/
herr_t
-H5G_ent_decode_vec(const H5F_t *f, const uint8_t **pp, H5G_entry_t *ent, unsigned n)
+H5G__ent_decode_vec(const H5F_t *f, const uint8_t **pp, H5G_entry_t *ent, unsigned n)
{
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_ent_decode_vec, FAIL)
+ FUNC_ENTER_PACKAGE
/* check arguments */
HDassert(f);
@@ -112,7 +112,7 @@ H5G_ent_decode_vec(const H5F_t *f, const uint8_t **pp, H5G_entry_t *ent, unsigne
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_ent_decode_vec() */
+} /* end H5G__ent_decode_vec() */
/*-------------------------------------------------------------------------
@@ -138,7 +138,7 @@ H5G_ent_decode(const H5F_t *f, const uint8_t **pp, H5G_entry_t *ent)
uint32_t tmp;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_ent_decode, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
@@ -181,7 +181,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_ent_encode_vec
+ * Function: H5G__ent_encode_vec
*
* Purpose: Same as H5G_ent_encode() except it does it for an array of
* symbol table entries.
@@ -198,12 +198,12 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_ent_encode_vec(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent, unsigned n)
+H5G__ent_encode_vec(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent, unsigned n)
{
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_ent_encode_vec, FAIL)
+ FUNC_ENTER_PACKAGE
/* check arguments */
HDassert(f);
@@ -217,7 +217,7 @@ H5G_ent_encode_vec(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent, unsigne
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5G_ent_encode_vec() */
+} /* H5G__ent_encode_vec() */
/*-------------------------------------------------------------------------
@@ -243,7 +243,7 @@ H5G_ent_encode(const H5F_t *f, uint8_t **pp, const H5G_entry_t *ent)
uint8_t *p_ret = *pp + H5G_SIZEOF_ENTRY(f);
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_ent_encode, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
@@ -296,7 +296,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_ent_copy
+ * Function: H5G__ent_copy
*
* Purpose: Do a deep copy of symbol table entries
*
@@ -319,10 +319,10 @@ done:
*
*-------------------------------------------------------------------------
*/
-herr_t
-H5G_ent_copy(H5G_entry_t *dst, const H5G_entry_t *src, H5_copy_depth_t depth)
+void
+H5G__ent_copy(H5G_entry_t *dst, const H5G_entry_t *src, H5_copy_depth_t depth)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5G_ent_copy)
+ FUNC_ENTER_PACKAGE_NOERR
/* Check arguments */
HDassert(src);
@@ -338,15 +338,15 @@ H5G_ent_copy(H5G_entry_t *dst, const H5G_entry_t *src, H5_copy_depth_t depth)
;
} else if(depth == H5_COPY_SHALLOW) {
/* Discarding 'const' qualifier OK - QAK */
- H5G_ent_reset((H5G_entry_t *)src);
+ H5G__ent_reset((H5G_entry_t *)src);
} /* end if */
- FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5G_ent_copy() */
+ FUNC_LEAVE_NOAPI_VOID
+} /* end H5G__ent_copy() */
/*-------------------------------------------------------------------------
- * Function: H5G_ent_reset
+ * Function: H5G__ent_reset
*
* Purpose: Reset a symbol table entry to an empty state
*
@@ -358,10 +358,10 @@ H5G_ent_copy(H5G_entry_t *dst, const H5G_entry_t *src, H5_copy_depth_t depth)
*
*-------------------------------------------------------------------------
*/
-herr_t
-H5G_ent_reset(H5G_entry_t *ent)
+void
+H5G__ent_reset(H5G_entry_t *ent)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5G_ent_reset)
+ FUNC_ENTER_PACKAGE
/* Check arguments */
HDassert(ent);
@@ -370,12 +370,12 @@ H5G_ent_reset(H5G_entry_t *ent)
HDmemset(ent, 0, sizeof(H5G_entry_t));
ent->header = HADDR_UNDEF;
- FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5G_ent_reset() */
+ FUNC_LEAVE_NOAPI_VOID
+} /* end H5G__ent_reset() */
/*-------------------------------------------------------------------------
- * Function: H5G_ent_convert
+ * Function: H5G__ent_convert
*
* Purpose: Convert a link to a symbol table entry
*
@@ -389,14 +389,14 @@ H5G_ent_reset(H5G_entry_t *ent)
*-------------------------------------------------------------------------
*/
herr_t
-H5G_ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, const char *name,
+H5G__ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, const char *name,
const H5O_link_t *lnk, H5O_type_t obj_type, const void *crt_info,
H5G_entry_t *ent)
{
size_t name_offset; /* Offset of name in heap */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_ent_convert, FAIL)
+ FUNC_ENTER_PACKAGE
/* check arguments */
HDassert(f);
@@ -405,7 +405,7 @@ H5G_ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, const char *name,
HDassert(lnk);
/* Reset the new entry */
- H5G_ent_reset(ent);
+ H5G__ent_reset(ent);
/*
* Add the new name to the heap.
@@ -523,11 +523,11 @@ H5G_ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, const char *name,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_ent_convert() */
+} /* end H5G__ent_convert() */
/*-------------------------------------------------------------------------
- * Function: H5G_ent_debug
+ * Function: H5G__ent_debug
*
* Purpose: Prints debugging information about a symbol table entry.
*
@@ -540,13 +540,13 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth,
+H5G__ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth,
const H5HL_t *heap)
{
const char *lval = NULL;
int nested_indent, nested_fwidth;
- FUNC_ENTER_NOAPI_NOFUNC(H5G_ent_debug)
+ FUNC_ENTER_PACKAGE_NOERR
/* Calculate the indent & field width values for nested information */
nested_indent = indent + 3;
@@ -603,5 +603,5 @@ H5G_ent_debug(const H5G_entry_t *ent, FILE *stream, int indent, int fwidth,
} /* end switch */
FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5G_ent_debug() */
+} /* end H5G__ent_debug() */
diff --git a/src/H5Gint.c b/src/H5Gint.c
index 0dc9c03..ad2e57e 100644
--- a/src/H5Gint.c
+++ b/src/H5Gint.c
@@ -39,7 +39,10 @@
/***********/
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
+#include "H5FOprivate.h" /* File objects */
#include "H5Gpkg.h" /* Groups */
+#include "H5Iprivate.h" /* IDs */
+#include "H5Lprivate.h" /* Links */
#include "H5MMprivate.h" /* Memory management */
@@ -52,6 +55,34 @@
/* Local Typedefs */
/******************/
+/* User data for path traversal routine for "insertion file" routine */
+typedef struct {
+ H5G_loc_t *loc; /* Pointer to the location for insertion */
+} H5G_trav_ins_t;
+
+/* User data for application-style iteration over links in a group */
+typedef struct {
+ hid_t gid; /* The group ID for the application callback */
+ H5G_link_iterate_t lnk_op; /* Application callback */
+ void *op_data; /* Application's op data */
+} H5G_iter_appcall_ud_t;
+
+/* User data for recursive traversal over links from a group */
+typedef struct {
+ hid_t gid; /* The group ID for the starting group */
+ H5G_loc_t *curr_loc; /* Location of starting group */
+ hid_t lapl_id; /* LAPL for walking across links */
+ hid_t dxpl_id; /* DXPL for operations */
+ H5_index_t idx_type; /* Index to use */
+ H5_iter_order_t order; /* Iteration order within index */
+ H5SL_t *visited; /* Skip list for tracking visited nodes */
+ char *path; /* Path name of the link */
+ size_t curr_path_len; /* Current length of the path in the buffer */
+ size_t path_buf_size; /* Size of path buffer */
+ H5L_iterate_t op; /* Application callback */
+ void *op_data; /* Application's op data */
+} H5G_iter_visit_ud_t;
+
/********************/
/* Package Typedefs */
@@ -62,11 +93,20 @@
/* Local Prototypes */
/********************/
+static herr_t H5G_open_oid(H5G_t *grp, hid_t dxpl_id);
+
/*********************/
/* Package Variables */
/*********************/
+/* Declare a free list to manage the H5G_t struct */
+H5FL_DEFINE(H5G_t);
+H5FL_DEFINE(H5G_shared_t);
+
+/* Declare the free list to manage H5_obj_t's */
+H5FL_DEFINE(H5_obj_t);
+
/*****************************/
/* Library Private Variables */
@@ -88,7 +128,7 @@ RETURNS
Non-negative on success/Negative on failure
DESCRIPTION
Initializes any interface-specific data or routines. (Just calls
- H5G_init() currently).
+ H5G__init() currently).
--------------------------------------------------------------------------*/
static herr_t
@@ -96,10 +136,10 @@ H5G_init_int_interface(void)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_init_int_interface, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
- /* Funnel all work to H5G_init() */
- if(H5G_init() < 0)
+ /* Funnel all work to H5G__init() */
+ if(H5G__init() < 0)
HGOTO_ERROR(H5E_FUNC, H5E_CANTINIT, FAIL, "interface initialization failed")
done:
@@ -108,16 +148,71 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_component
+ * Function: H5G__create_named
+ *
+ * Purpose: Internal routine to create a new "named" group.
+ *
+ * Return: Success: Non-NULL, pointer to new group object.
+ *
+ * Failure: NULL
+ *
+ * Programmer: Quincey Koziol
+ * April 5, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+H5G_t *
+H5G__create_named(const H5G_loc_t *loc, const char *name, hid_t lcpl_id,
+ hid_t gcpl_id, hid_t gapl_id, hid_t dxpl_id)
+{
+ H5O_obj_create_t ocrt_info; /* Information for object creation */
+ H5G_obj_create_t gcrt_info; /* Information for group creation */
+ H5G_t *ret_value; /* Return value */
+
+ FUNC_ENTER_PACKAGE
+
+ /* Check arguments */
+ HDassert(loc);
+ HDassert(name && *name);
+ HDassert(lcpl_id != H5P_DEFAULT);
+ HDassert(gcpl_id != H5P_DEFAULT);
+ HDassert(gapl_id != H5P_DEFAULT);
+ HDassert(dxpl_id != H5P_DEFAULT);
+
+ /* Set up group creation info */
+ gcrt_info.gcpl_id = gcpl_id;
+ gcrt_info.cache_type = H5G_NOTHING_CACHED;
+ HDmemset(&gcrt_info.cache, 0, sizeof(gcrt_info.cache));
+
+ /* Set up object creation information */
+ ocrt_info.obj_type = H5O_TYPE_GROUP;
+ ocrt_info.crt_info = &gcrt_info;
+ ocrt_info.new_obj = NULL;
+
+ /* Create the new group and link it to its parent group */
+ if(H5L_link_object(loc, name, &ocrt_info, lcpl_id, gapl_id, dxpl_id) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "unable to create and link to group")
+ HDassert(ocrt_info.new_obj);
+
+ /* Set the return value */
+ ret_value = (H5G_t *)ocrt_info.new_obj;
+
+done:
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5G__create_named() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G__create
*
- * Purpose: Returns the pointer to the first component of the
- * specified name by skipping leading slashes. Returns
- * the size in characters of the component through SIZE_P not
- * counting leading slashes or the null terminator.
+ * Purpose: Creates a new empty group with the specified name. The name
+ * is either an absolute name or is relative to LOC.
*
- * Return: Success: Ptr into NAME.
+ * Return: Success: A handle for the group. The group is opened
+ * and should eventually be close by calling
+ * H5G_close().
*
- * Failure: Ptr to the null terminator of NAME.
+ * Failure: NULL
*
* Programmer: Robb Matzke
* matzke@llnl.gov
@@ -125,83 +220,974 @@ done:
*
*-------------------------------------------------------------------------
*/
-const char *
-H5G_component(const char *name, size_t *size_p)
+H5G_t *
+H5G__create(H5F_t *file, H5G_obj_create_t *gcrt_info, hid_t dxpl_id)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_component)
+ H5G_t *grp = NULL; /*new group */
+ unsigned oloc_init = 0; /* Flag to indicate that the group object location was created successfully */
+ H5G_t *ret_value; /* Return value */
+
+ FUNC_ENTER_PACKAGE
+
+ /* check args */
+ HDassert(file);
+ HDassert(gcrt_info->gcpl_id != H5P_DEFAULT);
+ HDassert(dxpl_id != H5P_DEFAULT);
+
+ /* create an open group */
+ if(NULL == (grp = H5FL_CALLOC(H5G_t)))
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+ if(NULL == (grp->shared = H5FL_CALLOC(H5G_shared_t)))
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+
+ /* Create the group object header */
+ if(H5G__obj_create(file, dxpl_id, gcrt_info, &(grp->oloc)/*out*/) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "unable to create group object header")
+ oloc_init = 1; /* Indicate that the object location information is valid */
+
+ /* Add group to list of open objects in file */
+ if(H5FO_top_incr(grp->oloc.file, grp->oloc.addr) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTINC, NULL, "can't incr object ref. count")
+ if(H5FO_insert(grp->oloc.file, grp->oloc.addr, grp->shared, TRUE) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, NULL, "can't insert group into list of open objects")
- assert(name);
+ /* Set the count of times the object is opened */
+ grp->shared->fo_count = 1;
- while ('/' == *name)
- name++;
- if (size_p)
- *size_p = HDstrcspn(name, "/");
+ /* Set return value */
+ ret_value = grp;
+
+done:
+ if(ret_value == NULL) {
+ /* Check if we need to release the file-oriented symbol table info */
+ if(oloc_init) {
+ if(H5O_dec_rc_by_loc(&(grp->oloc), dxpl_id) < 0)
+ HDONE_ERROR(H5E_SYM, H5E_CANTDEC, NULL, "unable to decrement refcount on newly created object")
+ if(H5O_close(&(grp->oloc)) < 0)
+ HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, NULL, "unable to release object header")
+ if(H5O_delete(file, dxpl_id, grp->oloc.addr) < 0)
+ HDONE_ERROR(H5E_SYM, H5E_CANTDELETE, NULL, "unable to delete object header")
+ } /* end if */
+ if(grp != NULL) {
+ if(grp->shared != NULL)
+ grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
+ grp = H5FL_FREE(H5G_t, grp);
+ } /* end if */
+ } /* end if */
- FUNC_LEAVE_NOAPI(name)
-} /* end H5G_component() */
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5G__create() */
/*-------------------------------------------------------------------------
- * Function: H5G_normalize
+ * Function: H5G__open_name
*
- * Purpose: Returns a pointer to a new string which has duplicate and
- * trailing slashes removed from it.
+ * Purpose: Opens an existing group by name.
*
- * Return: Success: Ptr to normalized name.
+ * Return: Success: Ptr to a new group.
* Failure: NULL
*
* Programmer: Quincey Koziol
- * Saturday, August 16, 2003
+ * Monday, August 27, 2007
*
*-------------------------------------------------------------------------
*/
-char *
-H5G_normalize(const char *name)
+H5G_t *
+H5G__open_name(const H5G_loc_t *loc, const char *name, hid_t gapl_id,
+ hid_t dxpl_id)
{
- char *norm; /* Pointer to the normalized string */
- size_t s,d; /* Positions within the strings */
- unsigned last_slash; /* Flag to indicate last character was a slash */
- char *ret_value; /* Return value */
+ H5G_t *grp = NULL; /* Group to open */
+ H5G_loc_t grp_loc; /* Location used to open group */
+ H5G_name_t grp_path; /* Opened object group hier. path */
+ H5O_loc_t grp_oloc; /* Opened object object location */
+ hbool_t loc_found = FALSE; /* Location at 'name' found */
+ H5O_type_t obj_type; /* Type of object at location */
+ H5G_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_normalize)
+ FUNC_ENTER_PACKAGE
- /* Sanity check */
+ /* Check args */
+ HDassert(loc);
HDassert(name);
- /* Duplicate the name, to return */
- if(NULL == (norm = H5MM_strdup(name)))
- HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for normalized string")
-
- /* Walk through the characters, omitting duplicated '/'s */
- s = d = 0;
- last_slash = 0;
- while(name[s] != '\0') {
- if(name[s] == '/')
- if(last_slash)
- ;
- else {
- norm[d++] = name[s];
- last_slash = 1;
- } /* end else */
- else {
- norm[d++] = name[s];
- last_slash = 0;
- } /* end else */
- s++;
- } /* end while */
-
- /* Terminate normalized string */
- norm[d] = '\0';
-
- /* Check for final '/' on normalized name & eliminate it */
- if(d > 1 && last_slash)
- norm[d - 1] = '\0';
+ /* Set up opened group location to fill in */
+ grp_loc.oloc = &grp_oloc;
+ grp_loc.path = &grp_path;
+ H5G_loc_reset(&grp_loc);
+
+ /* Find the group object using the gapl passed in */
+ if(H5G_loc_find(loc, name, &grp_loc/*out*/, gapl_id, dxpl_id) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "group not found")
+ loc_found = TRUE;
+
+ /* Check that the object found is the correct type */
+ if(H5O_obj_type(&grp_oloc, &obj_type, dxpl_id) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTGET, NULL, "can't get object type")
+ if(obj_type != H5O_TYPE_GROUP)
+ HGOTO_ERROR(H5E_SYM, H5E_BADTYPE, NULL, "not a group")
+
+ /* Open the group */
+ if((grp = H5G_open(&grp_loc, dxpl_id)) == NULL)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, NULL, "unable to open group")
+
+ /* Set return value */
+ ret_value = grp;
+
+done:
+ if(!ret_value) {
+ if(loc_found && H5G_loc_free(&grp_loc) < 0)
+ HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, NULL, "can't free location")
+ } /* end if */
+
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5G__open_name() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G_open
+ *
+ * Purpose: Opens an existing group. The group should eventually be
+ * closed by calling H5G_close().
+ *
+ * Return: Success: Ptr to a new group.
+ *
+ * Failure: NULL
+ *
+ * Programmer: Robb Matzke
+ * Monday, January 5, 1998
+ *
+ *-------------------------------------------------------------------------
+ */
+H5G_t *
+H5G_open(const H5G_loc_t *loc, hid_t dxpl_id)
+{
+ H5G_t *grp = NULL; /* Group opened */
+ H5G_shared_t *shared_fo; /* Shared group object */
+ H5G_t *ret_value; /* Return value */
+
+ FUNC_ENTER_NOAPI(NULL)
+
+ /* Check args */
+ HDassert(loc);
+
+ /* Allocate the group structure */
+ if(NULL == (grp = H5FL_CALLOC(H5G_t)))
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "can't allocate space for group")
+
+ /* Shallow copy (take ownership) of the group location object */
+ if(H5O_loc_copy(&(grp->oloc), loc->oloc, H5_COPY_SHALLOW) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, NULL, "can't copy object location")
+ if(H5G_name_copy(&(grp->path), loc->path, H5_COPY_SHALLOW) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, NULL, "can't copy path")
+
+ /* Check if group was already open */
+ if((shared_fo = (H5G_shared_t *)H5FO_opened(grp->oloc.file, grp->oloc.addr)) == NULL) {
+
+ /* Clear any errors from H5FO_opened() */
+ H5E_clear_stack(NULL);
+
+ /* Open the group object */
+ if(H5G_open_oid(grp, dxpl_id) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, NULL, "not found")
+
+ /* Add group to list of open objects in file */
+ if(H5FO_insert(grp->oloc.file, grp->oloc.addr, grp->shared, FALSE) < 0) {
+ grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
+ HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, NULL, "can't insert group into list of open objects")
+ } /* end if */
+
+ /* Increment object count for the object in the top file */
+ if(H5FO_top_incr(grp->oloc.file, grp->oloc.addr) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTINC, NULL, "can't increment object count")
+
+ /* Set open object count */
+ grp->shared->fo_count = 1;
+ } /* end if */
+ else {
+ /* Point to shared group info */
+ grp->shared = shared_fo;
+
+ /* Increment shared reference count */
+ shared_fo->fo_count++;
+
+ /* Check if the object has been opened through the top file yet */
+ if(H5FO_top_count(grp->oloc.file, grp->oloc.addr) == 0) {
+ /* Open the object through this top file */
+ if(H5O_open(&(grp->oloc)) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, NULL, "unable to open object header")
+ } /* end if */
+
+ /* Increment object count for the object in the top file */
+ if(H5FO_top_incr(grp->oloc.file, grp->oloc.addr) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTINC, NULL, "can't increment object count")
+ } /* end else */
/* Set return value */
- ret_value = norm;
+ ret_value = grp;
done:
+ if(!ret_value && grp) {
+ H5O_loc_free(&(grp->oloc));
+ H5G_name_free(&(grp->path));
+ grp = H5FL_FREE(H5G_t, grp);
+ } /* end if */
+
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5G_open() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G_open_oid
+ *
+ * Purpose: Opens an existing group. The group should eventually be
+ * closed by calling H5G_close().
+ *
+ * Return: Success: Ptr to a new group.
+ *
+ * Failure: NULL
+ *
+ * Programmer: Quincey Koziol
+ * Wednesday, March 17, 1999
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5G_open_oid(H5G_t *grp, hid_t dxpl_id)
+{
+ hbool_t obj_opened = FALSE;
+ herr_t ret_value = SUCCEED;
+
+ FUNC_ENTER_NOAPI_NOINIT
+
+ /* Check args */
+ HDassert(grp);
+
+ /* Allocate the shared information for the group */
+ if(NULL == (grp->shared = H5FL_CALLOC(H5G_shared_t)))
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+
+ /* Grab the object header */
+ if(H5O_open(&(grp->oloc)) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
+ obj_opened = TRUE;
+
+ /* Check if this object has the right message(s) to be treated as a group */
+ if((H5O_msg_exists(&(grp->oloc), H5O_STAB_ID, dxpl_id) <= 0)
+ && (H5O_msg_exists(&(grp->oloc), H5O_LINFO_ID, dxpl_id) <= 0))
+ HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "not a group")
+
+done:
+ if(ret_value < 0) {
+ if(obj_opened)
+ H5O_close(&(grp->oloc));
+ if(grp->shared)
+ grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
+ } /* end if */
+
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5G_open_oid() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G_close
+ *
+ * Purpose: Closes the specified group.
+ *
+ * Return: Non-negative on success/Negative on failure
+ *
+ * Programmer: Robb Matzke
+ * Monday, January 5, 1998
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5G_close(H5G_t *grp)
+{
+ herr_t ret_value = SUCCEED; /* Return value */
+
+ FUNC_ENTER_NOAPI(FAIL)
+
+ /* Check args */
+ HDassert(grp && grp->shared);
+ HDassert(grp->shared->fo_count > 0);
+
+ --grp->shared->fo_count;
+
+ if(0 == grp->shared->fo_count) {
+ HDassert(grp != H5G_rootof(H5G_fileof(grp)));
+
+ /* Remove the group from the list of opened objects in the file */
+ if(H5FO_top_decr(grp->oloc.file, grp->oloc.addr) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't decrement count for object")
+ if(H5FO_delete(grp->oloc.file, H5AC_dxpl_id, grp->oloc.addr) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't remove group from list of open objects")
+ if(H5O_close(&(grp->oloc)) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close")
+ grp->shared = H5FL_FREE(H5G_shared_t, grp->shared);
+ } else {
+ /* Decrement the ref. count for this object in the top file */
+ if(H5FO_top_decr(grp->oloc.file, grp->oloc.addr) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "can't decrement count for object")
+
+ /* Check reference count for this object in the top file */
+ if(H5FO_top_count(grp->oloc.file, grp->oloc.addr) == 0) {
+ if(H5O_close(&(grp->oloc)) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close")
+ } /* end if */
+ else
+ /* Free object location (i.e. "unhold" the file if appropriate) */
+ if(H5O_loc_free(&(grp->oloc)) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "problem attempting to free location")
+
+ /* If this group is a mount point and the mount point is the last open
+ * reference to the group, then attempt to close down the file hierarchy
+ */
+ if(grp->shared->mounted && grp->shared->fo_count == 1) {
+ /* Attempt to close down the file hierarchy */
+ if(H5F_try_close(grp->oloc.file) < 0)
+ HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "problem attempting file close")
+ } /* end if */
+ } /* end else */
+
+ if(H5G_name_free(&(grp->path)) < 0) {
+ grp = H5FL_FREE(H5G_t, grp);
+ HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't free group entry name")
+ } /* end if */
+
+ grp = H5FL_FREE(H5G_t, grp);
+
+done:
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5G_close() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G_oloc
+ *
+ * Purpose: Returns a pointer to the object location for a group.
+ *
+ * Return: Success: Ptr to group entry
+ * Failure: NULL
+ *
+ * Programmer: Robb Matzke
+ * Tuesday, March 24, 1998
+ *
+ *-------------------------------------------------------------------------
+ */
+H5O_loc_t *
+H5G_oloc(H5G_t *grp)
+{
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
+
+ FUNC_LEAVE_NOAPI(grp ? &(grp->oloc) : NULL)
+} /* end H5G_oloc() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G_nameof
+ *
+ * Purpose: Returns a pointer to the hier. name for a group.
+ *
+ * Return: Success: Ptr to hier. name
+ * Failure: NULL
+ *
+ * Programmer: Quincey Koziol
+ * Monday, September 12, 2005
+ *
+ *-------------------------------------------------------------------------
+ */
+H5G_name_t *
+H5G_nameof(H5G_t *grp)
+{
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
+
+ FUNC_LEAVE_NOAPI(grp ? &(grp->path) : NULL)
+} /* end H5G_nameof() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G_fileof
+ *
+ * Purpose: Returns the file to which the specified group belongs.
+ *
+ * Return: Success: File pointer.
+ *
+ * Failure: NULL
+ *
+ * Programmer: Robb Matzke
+ * Tuesday, March 24, 1998
+ *
+ *-------------------------------------------------------------------------
+ */
+H5F_t *
+H5G_fileof(H5G_t *grp)
+{
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
+
+ HDassert(grp);
+
+ FUNC_LEAVE_NOAPI(grp->oloc.file)
+} /* end H5G_fileof() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G_get_shared_count
+ *
+ * Purpose: Queries the group object's "shared count"
+ *
+ * Return: Non-negative on success/Negative on failure
+ *
+ * Programmer: Quincey Koziol
+ * Tuesday, July 5, 2005
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5G_get_shared_count(H5G_t *grp)
+{
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
+
+ /* Check args */
+ HDassert(grp && grp->shared);
+
+ FUNC_LEAVE_NOAPI(grp->shared->fo_count)
+} /* end H5G_get_shared_count() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G_mount
+ *
+ * Purpose: Sets the 'mounted' flag for a group
+ *
+ * Return: Non-negative on success/Negative on failure
+ *
+ * Programmer: Quincey Koziol
+ * Tuesday, July 19, 2005
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5G_mount(H5G_t *grp)
+{
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
+
+ /* Check args */
+ HDassert(grp && grp->shared);
+ HDassert(grp->shared->mounted == FALSE);
+
+ /* Set the 'mounted' flag */
+ grp->shared->mounted = TRUE;
+
+ FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5G_mount() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G_mounted
+ *
+ * Purpose: Retrieves the 'mounted' flag for a group
+ *
+ * Return: Non-negative on success/Negative on failure
+ *
+ * Programmer: Quincey Koziol
+ * Tuesday, July 15, 2008
+ *
+ *-------------------------------------------------------------------------
+ */
+hbool_t
+H5G_mounted(H5G_t *grp)
+{
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
+
+ /* Check args */
+ HDassert(grp && grp->shared);
+
+ FUNC_LEAVE_NOAPI(grp->shared->mounted)
+} /* end H5G_mounted() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G_unmount
+ *
+ * Purpose: Resets the 'mounted' flag for a group
+ *
+ * Return: Non-negative on success/Negative on failure
+ *
+ * Programmer: Quincey Koziol
+ * Tuesday, July 19, 2005
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5G_unmount(H5G_t *grp)
+{
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
+
+ /* Check args */
+ HDassert(grp && grp->shared);
+ HDassert(grp->shared->mounted == TRUE);
+
+ /* Reset the 'mounted' flag */
+ grp->shared->mounted = FALSE;
+
+ FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5G_unmount() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G_iterate_cb
+ *
+ * Purpose: Callback function for iterating over links in a group
+ *
+ * Return: Success: Non-negative
+ * Failure: Negative
+ *
+ * Programmer: Quincey Koziol
+ * Oct 3, 2005
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5G_iterate_cb(const H5O_link_t *lnk, void *_udata)
+{
+ H5G_iter_appcall_ud_t *udata = (H5G_iter_appcall_ud_t *)_udata; /* User data for callback */
+ herr_t ret_value = H5_ITER_ERROR; /* Return value */
+
+ FUNC_ENTER_NOAPI_NOINIT
+
+ /* Sanity check */
+ HDassert(lnk);
+ HDassert(udata);
+
+ switch(udata->lnk_op.op_type) {
+#ifndef H5_NO_DEPRECATED_SYMBOLS
+ case H5G_LINK_OP_OLD:
+ /* Make the old-type application callback */
+ ret_value = (udata->lnk_op.op_func.op_old)(udata->gid, lnk->name, udata->op_data);
+ break;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
+
+ case H5G_LINK_OP_NEW:
+ {
+ H5L_info_t info; /* Link info */
+
+ /* Retrieve the info for the link */
+ if(H5G_link_to_info(lnk, &info) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get info for link")
+
+ /* Make the application callback */
+ ret_value = (udata->lnk_op.op_func.op_new)(udata->gid, lnk->name, &info, udata->op_data);
+ }
+ break;
+
+ default:
+ HDassert(0 && "Unknown link op type?!?");
+ } /* end switch */
+
+done:
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5G_iterate_cb() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G_iterate
+ *
+ * Purpose: Private function for iterating over links in a group
+ *
+ * Return: Success: Non-negative
+ * Failure: Negative
+ *
+ * Programmer: Quincey Koziol
+ * Oct 3, 2005
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5G_iterate(hid_t loc_id, const char *group_name,
+ H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
+ const H5G_link_iterate_t *lnk_op, void *op_data, hid_t lapl_id, hid_t dxpl_id)
+{
+ H5G_loc_t loc; /* Location of parent for group */
+ hid_t gid = -1; /* ID of group to iterate over */
+ H5G_t *grp = NULL; /* Pointer to group data structure to iterate over */
+ H5G_iter_appcall_ud_t udata; /* User data for callback */
+ herr_t ret_value; /* Return value */
+
+ FUNC_ENTER_NOAPI(FAIL)
+
+ /* Sanity check */
+ HDassert(group_name);
+ HDassert(last_lnk);
+ HDassert(lnk_op && lnk_op->op_func.op_new);
+
+ /*
+ * Open the group on which to operate. We also create a group ID which
+ * we can pass to the application-defined operator.
+ */
+ if(H5G_loc(loc_id, &loc) < 0)
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+ if(NULL == (grp = H5G__open_name(&loc, group_name, lapl_id, dxpl_id)))
+ HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
+ if((gid = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
+ HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
+
+ /* Set up user data for callback */
+ udata.gid = gid;
+ udata.lnk_op = *lnk_op;
+ udata.op_data = op_data;
+
+ /* Call the real group iteration routine */
+ if((ret_value = H5G__obj_iterate(&(grp->oloc), idx_type, order, skip, last_lnk, H5G_iterate_cb, &udata, dxpl_id)) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "error iterating over links")
+
+done:
+ /* Release the group opened */
+ if(gid > 0) {
+ if(H5I_dec_app_ref(gid) < 0)
+ HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close group")
+ } /* end if */
+ else if(grp && H5G_close(grp) < 0)
+ HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group")
+
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5G_iterate() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G_free_visit_visited
+ *
+ * Purpose: Free the key for an object visited during a group traversal
+ *
+ * Return: Non-negative on success, negative on failure
+ *
+ * Programmer: Quincey Koziol
+ * Nov 4, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5G_free_visit_visited(void *item, void UNUSED *key, void UNUSED *operator_data/*in,out*/)
+{
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
+
+ item = H5FL_FREE(H5_obj_t, item);
+
+ FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5G_free_visit_visited() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G_visit_cb
+ *
+ * Purpose: Callback function for recursively visiting links from a group
+ *
+ * Return: Success: Non-negative
+ * Failure: Negative
+ *
+ * Programmer: Quincey Koziol
+ * Nov 4, 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5G_visit_cb(const H5O_link_t *lnk, void *_udata)
+{
+ H5G_iter_visit_ud_t *udata = (H5G_iter_visit_ud_t *)_udata; /* User data for callback */
+ H5L_info_t info; /* Link info */
+ H5G_loc_t obj_loc; /* Location of object */
+ H5G_name_t obj_path; /* Object's group hier. path */
+ H5O_loc_t obj_oloc; /* Object's object location */
+ hbool_t obj_found = FALSE; /* Object at 'name' found */
+ size_t old_path_len = udata->curr_path_len; /* Length of path before appending this link's name */
+ size_t link_name_len; /* Length of link's name */
+ size_t len_needed; /* Length of path string needed */
+ herr_t ret_value = H5_ITER_CONT; /* Return value */
+
+ FUNC_ENTER_NOAPI_NOINIT
+
+ /* Sanity check */
+ HDassert(lnk);
+ HDassert(udata);
+
+ /* Check if we will need more space to store this link's relative path */
+ /* ("+2" is for string terminator and possible '/' for group separator later) */
+ link_name_len = HDstrlen(lnk->name);
+ len_needed = udata->curr_path_len + link_name_len + 2;
+ if(len_needed > udata->path_buf_size) {
+ void *new_path; /* Pointer to new path buffer */
+
+ /* Attempt to allocate larger buffer for path */
+ if(NULL == (new_path = H5MM_realloc(udata->path, len_needed)))
+ HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, H5_ITER_ERROR, "can't allocate path string")
+ udata->path = (char *)new_path;
+ udata->path_buf_size = len_needed;
+ } /* end if */
+
+ /* Build the link's relative path name */
+ HDassert(udata->path[old_path_len] == '\0');
+ HDstrcpy(&(udata->path[old_path_len]), lnk->name);
+ udata->curr_path_len += link_name_len;
+
+ /* Construct the link info from the link message */
+ if(H5G_link_to_info(lnk, &info) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get info for link")
+
+ /* Make the application callback */
+ ret_value = (udata->op)(udata->gid, udata->path, &info, udata->op_data);
+
+ /* Check for doing more work */
+ if(ret_value == H5_ITER_CONT && lnk->type == H5L_TYPE_HARD) {
+ H5_obj_t obj_pos; /* Object "position" for this object */
+
+ /* Set up opened group location to fill in */
+ obj_loc.oloc = &obj_oloc;
+ obj_loc.path = &obj_path;
+ H5G_loc_reset(&obj_loc);
+
+ /* Find the object using the LAPL passed in */
+ /* (Correctly handles mounted files) */
+ if(H5G_loc_find(udata->curr_loc, lnk->name, &obj_loc/*out*/, udata->lapl_id, udata->dxpl_id) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, H5_ITER_ERROR, "object not found")
+ obj_found = TRUE;
+
+ /* Construct unique "position" for this object */
+ H5F_GET_FILENO(obj_oloc.file, obj_pos.fileno);
+ obj_pos.addr = obj_oloc.addr;
+
+ /* Check if we've seen the object the link references before */
+ if(NULL == H5SL_search(udata->visited, &obj_pos)) {
+ H5O_type_t otype; /* Basic object type (group, dataset, etc.) */
+ unsigned rc; /* Reference count of object */
+
+ /* Get the object's reference count and type */
+ if(H5O_get_rc_and_type(&obj_oloc, udata->dxpl_id, &rc, &otype) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "unable to get object info")
+
+ /* If its ref count is > 1, we add it to the list of visited objects */
+ /* (because it could come up again during traversal) */
+ if(rc > 1) {
+ H5_obj_t *new_node; /* New object node for visited list */
+
+ /* Allocate new object "position" node */
+ if((new_node = H5FL_MALLOC(H5_obj_t)) == NULL)
+ HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, H5_ITER_ERROR, "can't allocate object node")
+
+ /* Set node information */
+ *new_node = obj_pos;
+
+ /* Add to list of visited objects */
+ if(H5SL_insert(udata->visited, new_node, new_node) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, H5_ITER_ERROR, "can't insert object node into visited list")
+ } /* end if */
+
+ /* If it's a group, we recurse into it */
+ if(otype == H5O_TYPE_GROUP) {
+ H5G_loc_t *old_loc = udata->curr_loc; /* Pointer to previous group location info */
+ H5_index_t idx_type = udata->idx_type; /* Type of index to use */
+ H5O_linfo_t linfo; /* Link info message */
+ htri_t linfo_exists; /* Whether the link info message exists */
+
+ /* Add the path separator to the current path */
+ HDassert(udata->path[udata->curr_path_len] == '\0');
+ HDstrcpy(&(udata->path[udata->curr_path_len]), "/");
+ udata->curr_path_len++;
+
+ /* Attempt to get the link info for this group */
+ if((linfo_exists = H5G__obj_get_linfo(&obj_oloc, &linfo, udata->dxpl_id)) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5_ITER_ERROR, "can't check for link info message")
+ if(linfo_exists) {
+ /* Check for creation order tracking, if creation order index lookup requested */
+ if(idx_type == H5_INDEX_CRT_ORDER) {
+ /* Check if creation order is tracked */
+ if(!linfo.track_corder)
+ /* Switch to name order for this group */
+ idx_type = H5_INDEX_NAME;
+ } /* end if */
+ else
+ HDassert(idx_type == H5_INDEX_NAME);
+ } /* end if */
+ else {
+ /* Can only perform name lookups on groups with symbol tables */
+ if(idx_type != H5_INDEX_NAME)
+ /* Switch to name order for this group */
+ idx_type = H5_INDEX_NAME;
+ } /* end if */
+
+ /* Point to this group's location info */
+ udata->curr_loc = &obj_loc;
+
+ /* Iterate over links in group */
+ ret_value = H5G__obj_iterate(&obj_oloc, idx_type, udata->order, (hsize_t)0, NULL, H5G_visit_cb, udata, udata->dxpl_id);
+
+ /* Restore location */
+ udata->curr_loc = old_loc;
+ } /* end if */
+ } /* end if */
+ } /* end if */
+
+done:
+ /* Reset path back to incoming path */
+ udata->path[old_path_len] = '\0';
+ udata->curr_path_len = old_path_len;
+
+ /* Release resources */
+ if(obj_found && H5G_loc_free(&obj_loc) < 0)
+ HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, H5_ITER_ERROR, "can't free location")
+
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5G_visit_cb() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G_visit
+ *
+ * Purpose: Recursively visit all the links in a group and all
+ * the groups that are linked to from that group. Links within
+ * each group are visited according to the order within the
+ * specified index (unless the specified index does not exist for
+ * a particular group, then the "name" index is used).
+ *
+ * NOTE: Each _link_ reachable from the initial group will only be
+ * visited once. However, because an object may be reached from
+ * more than one link, the visitation may call the application's
+ * callback with more than one link that points to a particular
+ * _object_.
+ *
+ * Return: Success: The return value of the first operator that
+ * returns non-zero, or zero if all members were
+ * processed with no operator returning non-zero.
+ *
+ * Failure: Negative if something goes wrong within the
+ * library, or the negative value returned by one
+ * of the operators.
+ *
+ *
+ *
+ * Programmer: Quincey Koziol
+ * November 4 2007
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5G_visit(hid_t loc_id, const char *group_name, H5_index_t idx_type,
+ H5_iter_order_t order, H5L_iterate_t op, void *op_data, hid_t lapl_id,
+ hid_t dxpl_id)
+{
+ H5G_iter_visit_ud_t udata; /* User data for callback */
+ H5O_linfo_t linfo; /* Link info message */
+ htri_t linfo_exists; /* Whether the link info message exists */
+ hid_t gid = (-1); /* Group ID */
+ H5G_t *grp = NULL; /* Group opened */
+ H5G_loc_t loc; /* Location of group passed in */
+ H5G_loc_t start_loc; /* Location of starting group */
+ unsigned rc; /* Reference count of object */
+ herr_t ret_value; /* Return value */
+
+ /* Portably clear udata struct (before FUNC_ENTER) */
+ HDmemset(&udata, 0, sizeof(udata));
+
+ FUNC_ENTER_NOAPI(FAIL)
+
+ /* Check args */
+ if(H5G_loc(loc_id, &loc) < 0)
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+
+ /* Open the group to begin visiting within */
+ if((grp = H5G__open_name(&loc, group_name, lapl_id, dxpl_id)) == NULL)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to open group")
+
+ /* Register an ID for the starting group */
+ if((gid = H5I_register(H5I_GROUP, grp, TRUE)) < 0)
+ HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register group")
+
+ /* Get the location of the starting group */
+ if(H5G_loc(gid, &start_loc) < 0)
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location")
+
+ /* Set up user data */
+ udata.gid = gid;
+ udata.curr_loc = &start_loc;
+ udata.lapl_id = lapl_id;
+ udata.dxpl_id = dxpl_id;
+ udata.idx_type = idx_type;
+ udata.order = order;
+ udata.op = op;
+ udata.op_data = op_data;
+
+ /* Allocate space for the path name */
+ if(NULL == (udata.path = H5MM_strdup("")))
+ HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate path name buffer")
+ udata.path_buf_size = 1;
+ udata.curr_path_len = 0;
+
+ /* Create skip list to store visited object information */
+ if((udata.visited = H5SL_create(H5SL_TYPE_OBJ, NULL)) == NULL)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTCREATE, FAIL, "can't create skip list for visited objects")
+
+ /* Get the group's reference count */
+ if(H5O_get_rc_and_type(&grp->oloc, dxpl_id, &rc, NULL) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to get object info")
+
+ /* If its ref count is > 1, we add it to the list of visited objects */
+ /* (because it could come up again during traversal) */
+ if(rc > 1) {
+ H5_obj_t *obj_pos; /* New object node for visited list */
+
+ /* Allocate new object "position" node */
+ if((obj_pos = H5FL_MALLOC(H5_obj_t)) == NULL)
+ HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, FAIL, "can't allocate object node")
+
+ /* Construct unique "position" for this object */
+ H5F_GET_FILENO(grp->oloc.file, obj_pos->fileno);
+ obj_pos->addr = grp->oloc.addr;
+
+ /* Add to list of visited objects */
+ if(H5SL_insert(udata.visited, obj_pos, obj_pos) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "can't insert object node into visited list")
+ } /* end if */
+
+ /* Attempt to get the link info for this group */
+ if((linfo_exists = H5G__obj_get_linfo(&(grp->oloc), &linfo, dxpl_id)) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
+ if(linfo_exists) {
+ /* Check for creation order tracking, if creation order index lookup requested */
+ if(idx_type == H5_INDEX_CRT_ORDER) {
+ /* Check if creation order is tracked */
+ if(!linfo.track_corder)
+ /* Switch to name order for this group */
+ idx_type = H5_INDEX_NAME;
+ } /* end if */
+ else
+ HDassert(idx_type == H5_INDEX_NAME);
+ } /* end if */
+ else {
+ /* Can only perform name lookups on groups with symbol tables */
+ if(idx_type != H5_INDEX_NAME)
+ /* Switch to name order for this group */
+ idx_type = H5_INDEX_NAME;
+ } /* end if */
+
+ /* Call the link iteration routine */
+ if((ret_value = H5G__obj_iterate(&(grp->oloc), idx_type, order, (hsize_t)0, NULL, H5G_visit_cb, &udata, dxpl_id)) < 0)
+ HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't visit links")
+
+done:
+ /* Release user data resources */
+ H5MM_xfree(udata.path);
+ if(udata.visited)
+ H5SL_destroy(udata.visited, H5G_free_visit_visited, NULL);
+
+ /* Release the group opened */
+ if(gid > 0) {
+ if(H5I_dec_app_ref(gid) < 0)
+ HDONE_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close group")
+ } /* end if */
+ else if(grp && H5G_close(grp) < 0)
+ HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group")
+
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_normalize() */
+} /* end H5G_visit() */
diff --git a/src/H5Glink.c b/src/H5Glink.c
index 0049bfd..f934052 100644
--- a/src/H5Glink.c
+++ b/src/H5Glink.c
@@ -63,6 +63,11 @@
/* Local Prototypes */
/********************/
+static int H5G_link_cmp_name_inc(const void *lnk1, const void *lnk2);
+static int H5G_link_cmp_name_dec(const void *lnk1, const void *lnk2);
+static int H5G_link_cmp_corder_inc(const void *lnk1, const void *lnk2);
+static int H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2);
+
/*********************/
/* Package Variables */
@@ -98,10 +103,10 @@
*
*-------------------------------------------------------------------------
*/
-int
+static int
H5G_link_cmp_name_inc(const void *lnk1, const void *lnk2)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_link_cmp_name_inc)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(HDstrcmp(((const H5O_link_t *)lnk1)->name, ((const H5O_link_t *)lnk2)->name))
} /* end H5G_link_cmp_name_inc() */
@@ -125,10 +130,10 @@ H5G_link_cmp_name_inc(const void *lnk1, const void *lnk2)
*
*-------------------------------------------------------------------------
*/
-int
+static int
H5G_link_cmp_name_dec(const void *lnk1, const void *lnk2)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_link_cmp_name_dec)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(HDstrcmp(((const H5O_link_t *)lnk2)->name, ((const H5O_link_t *)lnk1)->name))
} /* end H5G_link_cmp_name_dec() */
@@ -151,12 +156,12 @@ H5G_link_cmp_name_dec(const void *lnk1, const void *lnk2)
*
*-------------------------------------------------------------------------
*/
-int
+static int
H5G_link_cmp_corder_inc(const void *lnk1, const void *lnk2)
{
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_link_cmp_corder_inc)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(((const H5O_link_t *)lnk1)->corder < ((const H5O_link_t *)lnk2)->corder)
ret_value = -1;
@@ -186,12 +191,12 @@ H5G_link_cmp_corder_inc(const void *lnk1, const void *lnk2)
*
*-------------------------------------------------------------------------
*/
-int
+static int
H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2)
{
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_link_cmp_corder_dec)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(((const H5O_link_t *)lnk1)->corder < ((const H5O_link_t *)lnk2)->corder)
ret_value = 1;
@@ -205,7 +210,7 @@ H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2)
/*-------------------------------------------------------------------------
- * Function: H5G_ent_to_link
+ * Function: H5G__ent_to_link
*
* Purpose: Convert a symbol table entry to a link
*
@@ -218,10 +223,10 @@ H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2)
*-------------------------------------------------------------------------
*/
herr_t
-H5G_ent_to_link(H5O_link_t *lnk, const H5HL_t *heap,
+H5G__ent_to_link(H5O_link_t *lnk, const H5HL_t *heap,
const H5G_entry_t *ent, const char *name)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5G_ent_to_link)
+ FUNC_ENTER_PACKAGE_NOERR
/* check arguments */
HDassert(lnk);
@@ -258,7 +263,7 @@ H5G_ent_to_link(H5O_link_t *lnk, const H5HL_t *heap,
} /* end else */
FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5G_ent_to_link() */
+} /* end H5G__ent_to_link() */
/*-------------------------------------------------------------------------
@@ -278,7 +283,7 @@ H5G_link_to_info(const H5O_link_t *lnk, H5L_info_t *info)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_link_to_info, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(lnk);
@@ -338,7 +343,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_link_to_loc
+ * Function: H5G__link_to_loc
*
* Purpose: Build group location from group and link object
*
@@ -350,12 +355,12 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_link_to_loc(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
+H5G__link_to_loc(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
H5G_loc_t *obj_loc)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_link_to_loc, FAIL)
+ FUNC_ENTER_PACKAGE
/* Sanity check */
HDassert(grp_loc);
@@ -382,145 +387,11 @@ H5G_link_to_loc(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_link_to_loc() */
-
-
-/*-------------------------------------------------------------------------
- * Function: H5G_link_copy_file
- *
- * Purpose: Copy a link and the object it points to from one file to
- * another.
- *
- * Return: Non-negative on success/Negative on failure
- *
- * Programmer: Quincey Koziol
- * koziol@hdfgroup.org
- * Sep 29 2006
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5G_link_copy_file(H5F_t *dst_file, hid_t dxpl_id, const H5O_link_t *_src_lnk,
- const H5O_loc_t *src_oloc, H5O_link_t *dst_lnk, H5O_copy_t *cpy_info)
-{
- H5O_link_t tmp_src_lnk; /* Temporary copy of src link, when needed */
- const H5O_link_t *src_lnk = _src_lnk; /* Source link */
- hbool_t dst_lnk_init = FALSE; /* Whether the destination link is initialized */
- hbool_t expanded_link_open = FALSE; /* Whether the target location has been opened */
- H5G_loc_t tmp_src_loc; /* Group location holding target object */
- H5G_name_t tmp_src_path; /* Path for target object */
- H5O_loc_t tmp_src_oloc; /* Object location for target object */
- herr_t ret_value = SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5G_link_copy_file, FAIL)
-
- /* check arguments */
- HDassert(dst_file);
- HDassert(src_lnk);
- HDassert(dst_lnk);
- HDassert(cpy_info);
-
- /* Expand soft or external link, if requested */
- if((H5L_TYPE_SOFT == src_lnk->type && cpy_info->expand_soft_link)
- || (H5L_TYPE_EXTERNAL == src_lnk->type
- && cpy_info->expand_ext_link)) {
- H5G_loc_t lnk_grp_loc; /* Group location holding link */
- H5G_name_t lnk_grp_path; /* Path for link */
- htri_t tar_exists; /* Whether the target object exists */
-
- /* Set up group location for link */
- H5G_name_reset(&lnk_grp_path);
- lnk_grp_loc.path = &lnk_grp_path;
- lnk_grp_loc.oloc = (H5O_loc_t *)src_oloc; /* Casting away const OK -QAK */
-
- /* Check if the target object exists */
- if((tar_exists = H5G_loc_exists(&lnk_grp_loc, src_lnk->name, H5P_DEFAULT,
- dxpl_id)) < 0)
- HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to check if target object exists")
-
- if(tar_exists) {
- /* Make a temporary copy of the link, so that it will not change the
- * info in the cache when we change it to a hard link */
- if(NULL == H5O_msg_copy(H5O_LINK_ID, src_lnk, &tmp_src_lnk))
- HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy message")
-
- /* Set up group location for target object. Let H5G_traverse expand
- * the link. */
- tmp_src_loc.path = &tmp_src_path;
- tmp_src_loc.oloc = &tmp_src_oloc;
- if(H5G_loc_reset(&tmp_src_loc) < 0)
- HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to reset location")
-
- /* Find the target object */
- if(H5G_loc_find(&lnk_grp_loc, src_lnk->name, &tmp_src_loc,
- H5P_DEFAULT, dxpl_id) < 0)
- HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to find target object")
- expanded_link_open = TRUE;
-
- /* Convert symbolic link to hard link */
- if(tmp_src_lnk.type == H5L_TYPE_SOFT)
- tmp_src_lnk.u.soft.name =
- (char *)H5MM_xfree(tmp_src_lnk.u.soft.name);
- else if(tmp_src_lnk.u.ud.size > 0)
- tmp_src_lnk.u.ud.udata = H5MM_xfree(tmp_src_lnk.u.ud.udata);
- tmp_src_lnk.type = H5L_TYPE_HARD;
- tmp_src_lnk.u.hard.addr = tmp_src_oloc.addr;
- src_lnk = &tmp_src_lnk;
- } /* end if */
- } /* end if */
-
- /* Copy src link information to dst link information */
- if(NULL == H5O_msg_copy(H5O_LINK_ID, src_lnk, dst_lnk))
- HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy message")
- dst_lnk_init = TRUE;
-
- /* Check if object in source group is a hard link & copy it */
- if(H5L_TYPE_HARD == src_lnk->type) {
- H5O_loc_t new_dst_oloc; /* Copied object location in destination */
-
- /* Set up copied object location to fill in */
- H5O_loc_reset(&new_dst_oloc);
- new_dst_oloc.file = dst_file;
-
- if(!expanded_link_open) {
- /* Build temporary object location for source */
- H5O_loc_reset(&tmp_src_oloc);
- tmp_src_oloc.file = src_oloc->file;
- tmp_src_oloc.addr = src_lnk->u.hard.addr;
- } /* end if */
- HDassert(H5F_addr_defined(tmp_src_oloc.addr));
-
- /* Copy the shared object from source to destination */
- /* Don't care about obj_type or udata because those are only important
- * for old style groups */
- if(H5O_copy_header_map(&tmp_src_oloc, &new_dst_oloc, dxpl_id, cpy_info,
- TRUE, NULL, NULL) < 0)
- HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object")
-
- /* Copy new destination object's information for eventual insertion */
- dst_lnk->u.hard.addr = new_dst_oloc.addr;
- } /* end if */
-
-done:
- /* Check if we used a temporary src link */
- if(src_lnk != _src_lnk) {
- HDassert(src_lnk == &tmp_src_lnk);
- H5O_msg_reset(H5O_LINK_ID, &tmp_src_lnk);
- } /* end if */
- if(ret_value < 0)
- if(dst_lnk_init)
- H5O_msg_reset(H5O_LINK_ID, dst_lnk);
- /* Check if we need to free the temp source oloc */
- if(expanded_link_open)
- if(H5G_loc_free(&tmp_src_loc) < 0)
- HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to free object")
-
- FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_link_copy_file() */
+} /* end H5G__link_to_loc() */
/*-------------------------------------------------------------------------
- * Function: H5G_link_sort_table
+ * Function: H5G__link_sort_table
*
* Purpose: Sort table containing a list of links for a group
*
@@ -533,10 +404,10 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_link_sort_table(H5G_link_table_t *ltable, H5_index_t idx_type,
+H5G__link_sort_table(H5G_link_table_t *ltable, H5_index_t idx_type,
H5_iter_order_t order)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_link_sort_table)
+ FUNC_ENTER_PACKAGE_NOERR
/* Sanity check */
HDassert(ltable);
@@ -561,11 +432,11 @@ H5G_link_sort_table(H5G_link_table_t *ltable, H5_index_t idx_type,
} /* end else */
FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5G_link_sort_table() */
+} /* end H5G__link_sort_table() */
/*-------------------------------------------------------------------------
- * Function: H5G_link_iterate_table
+ * Function: H5G__link_iterate_table
*
* Purpose: Iterate over table containing a list of links for a group,
* making appropriate callbacks
@@ -579,13 +450,13 @@ H5G_link_sort_table(H5G_link_table_t *ltable, H5_index_t idx_type,
*-------------------------------------------------------------------------
*/
herr_t
-H5G_link_iterate_table(const H5G_link_table_t *ltable, hsize_t skip,
+H5G__link_iterate_table(const H5G_link_table_t *ltable, hsize_t skip,
hsize_t *last_lnk, const H5G_lib_iterate_t op, void *op_data)
{
size_t u; /* Local index variable */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOERR(H5G_link_iterate_table, -)
+ FUNC_ENTER_PACKAGE_NOERR
/* Sanity check */
HDassert(ltable);
@@ -611,11 +482,11 @@ H5G_link_iterate_table(const H5G_link_table_t *ltable, hsize_t skip,
HERROR(H5E_SYM, H5E_CANTNEXT, "iteration operator failed");
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_link_iterate_table() */
+} /* end H5G__link_iterate_table() */
/*-------------------------------------------------------------------------
- * Function: H5G_link_release_table
+ * Function: H5G__link_release_table
*
* Purpose: Release table containing a list of links for a group
*
@@ -628,12 +499,12 @@ H5G_link_iterate_table(const H5G_link_table_t *ltable, hsize_t skip,
*-------------------------------------------------------------------------
*/
herr_t
-H5G_link_release_table(H5G_link_table_t *ltable)
+H5G__link_release_table(H5G_link_table_t *ltable)
{
size_t u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_link_release_table)
+ FUNC_ENTER_PACKAGE
/* Sanity check */
HDassert(ltable);
@@ -653,11 +524,11 @@ H5G_link_release_table(H5G_link_table_t *ltable)
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_link_release_table() */
+} /* end H5G__link_release_table() */
/*-------------------------------------------------------------------------
- * Function: H5G_link_name_replace
+ * Function: H5G__link_name_replace
*
* Purpose: Determine the type of object referred to (for hard links) or
* the link type (for soft links and user-defined links).
@@ -671,13 +542,13 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_link_name_replace(H5F_t *file, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
+H5G__link_name_replace(H5F_t *file, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
const H5O_link_t *lnk)
{
H5RS_str_t *obj_path_r = NULL; /* Full path for link being removed */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_link_name_replace, FAIL)
+ FUNC_ENTER_PACKAGE
/* check arguments */
HDassert(file);
@@ -694,5 +565,5 @@ done:
H5RS_decr(obj_path_r);
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_link_name_replace() */
+} /* end H5G__link_name_replace() */
diff --git a/src/H5Gloc.c b/src/H5Gloc.c
index 23db587..9f0095a 100644
--- a/src/H5Gloc.c
+++ b/src/H5Gloc.c
@@ -161,7 +161,7 @@ H5G_loc(hid_t loc_id, H5G_loc_t *loc)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_loc, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
switch(H5I_get_type(loc_id)) {
case H5I_FILE:
@@ -259,7 +259,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_loc_copy
+ * Function: H5G__loc_copy
*
* Purpose: Copy over information for a location
*
@@ -271,11 +271,11 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_loc_copy(H5G_loc_t *dst, const H5G_loc_t *src, H5_copy_depth_t depth)
+H5G__loc_copy(H5G_loc_t *dst, const H5G_loc_t *src, H5_copy_depth_t depth)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_loc_copy, FAIL)
+ FUNC_ENTER_PACKAGE
/* Check args. */
HDassert(dst);
@@ -289,7 +289,7 @@ H5G_loc_copy(H5G_loc_t *dst, const H5G_loc_t *src, H5_copy_depth_t depth)
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_loc_copy() */
+} /* end H5G__loc_copy() */
/*-------------------------------------------------------------------------
@@ -309,7 +309,7 @@ H5G_loc_reset(H5G_loc_t *loc)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_loc_reset, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args. */
HDassert(loc);
@@ -342,7 +342,7 @@ H5G_loc_free(H5G_loc_t *loc)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_loc_free, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args. */
HDassert(loc);
@@ -378,7 +378,7 @@ H5G_loc_find_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char *name,
H5G_loc_fnd_t *udata = (H5G_loc_fnd_t *)_udata; /* User data passed in */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_loc_find_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check if the name in this group resolved to a valid object */
if(obj_loc == NULL)
@@ -388,7 +388,7 @@ H5G_loc_find_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char *name,
/* (Group traversal callbacks are responsible for either taking ownership
* of the group location for the object, or freeing it. - QAK)
*/
- H5G_loc_copy(udata->loc, obj_loc, H5_COPY_SHALLOW);
+ H5G__loc_copy(udata->loc, obj_loc, H5_COPY_SHALLOW);
*own_loc = H5G_OWN_OBJ_LOC;
done:
@@ -415,7 +415,7 @@ H5G_loc_find(const H5G_loc_t *loc, const char *name, H5G_loc_t *obj_loc/*out*/,
H5G_loc_fnd_t udata; /* User data for traversal callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_loc_find, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args. */
HDassert(loc);
@@ -460,7 +460,7 @@ H5G_loc_find_by_idx_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
hbool_t obj_exists = FALSE; /* Whether the object exists (unused) */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_loc_find_by_idx_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check if the name in this group resolved to a valid link */
if(obj_loc == NULL)
@@ -473,14 +473,14 @@ H5G_loc_find_by_idx_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
lnk_copied = TRUE;
/* Build the initial object location for the link */
- if(H5G_link_to_loc(obj_loc, &fnd_lnk, udata->loc) < 0)
+ if(H5G__link_to_loc(obj_loc, &fnd_lnk, udata->loc) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "cannot initialize object location")
obj_loc_valid = TRUE;
/* Perform any special traversals that the link needs */
/* (soft links, user-defined links, file mounting, etc.) */
/* (may modify the object location) */
- if(H5G_traverse_special(obj_loc, &fnd_lnk, H5G_TARGET_NORMAL, &links_left, TRUE, udata->loc, &obj_exists, udata->lapl_id, udata->dxpl_id) < 0)
+ if(H5G__traverse_special(obj_loc, &fnd_lnk, H5G_TARGET_NORMAL, &links_left, TRUE, udata->loc, &obj_exists, udata->lapl_id, udata->dxpl_id) < 0)
HGOTO_ERROR(H5E_LINK, H5E_TRAVERSE, FAIL, "special link traversal failed")
done:
@@ -521,7 +521,7 @@ H5G_loc_find_by_idx(H5G_loc_t *loc, const char *group_name, H5_index_t idx_type,
H5G_loc_fbi_t udata; /* User data for traversal callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_loc_find_by_idx, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args. */
HDassert(loc);
@@ -546,7 +546,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_loc_insert
+ * Function: H5G__loc_insert
*
* Purpose: Insert an object at a location
*
@@ -558,13 +558,13 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_loc_insert(H5G_loc_t *grp_loc, const char *name, H5G_loc_t *obj_loc,
+H5G__loc_insert(H5G_loc_t *grp_loc, const char *name, H5G_loc_t *obj_loc,
H5O_type_t obj_type, const void *crt_info, hid_t dxpl_id)
{
H5O_link_t lnk; /* Link for object to insert */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_loc_insert, FAIL)
+ FUNC_ENTER_PACKAGE
/* Check args. */
HDassert(grp_loc);
@@ -591,7 +591,7 @@ H5G_loc_insert(H5G_loc_t *grp_loc, const char *name, H5G_loc_t *obj_loc,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_loc_insert() */
+} /* end H5G__loc_insert() */
/*-------------------------------------------------------------------------
@@ -613,7 +613,7 @@ H5G_loc_exists_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
{
H5G_loc_exists_t *udata = (H5G_loc_exists_t *)_udata; /* User data passed in */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_loc_exists_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check if the name in this group resolved to a valid object */
if(obj_loc == NULL)
@@ -651,7 +651,7 @@ H5G_loc_exists(const H5G_loc_t *loc, const char *name, hid_t lapl_id, hid_t dxpl
H5G_loc_exists_t udata; /* User data for traversal callback */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5G_loc_exists, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args. */
HDassert(loc);
@@ -691,7 +691,7 @@ H5G_loc_info_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name, const
H5G_loc_info_t *udata = (H5G_loc_info_t *)_udata; /* User data passed in */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_loc_info_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check if the name in this group resolved to a valid link */
if(obj_loc == NULL)
@@ -730,7 +730,7 @@ H5G_loc_info(H5G_loc_t *loc, const char *name, hbool_t want_ih_info, H5O_info_t
H5G_loc_info_t udata; /* User data for traversal callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_loc_info, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args. */
HDassert(loc);
@@ -772,7 +772,7 @@ H5G_loc_set_comment_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
htri_t exists; /* Whether a "comment" message already exists */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_loc_set_comment_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check if the name in this group resolved to a valid link */
if(obj_loc == NULL)
@@ -824,7 +824,7 @@ H5G_loc_set_comment(H5G_loc_t *loc, const char *name, const char *comment,
H5G_loc_sc_t udata; /* User data for traversal callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_loc_set_comment, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args. */
HDassert(loc);
@@ -863,7 +863,7 @@ H5G_loc_get_comment_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
H5O_name_t comment; /* Object header "comment" message */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_loc_get_comment_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check if the name in this group resolved to a valid link */
if(obj_loc == NULL)
@@ -915,7 +915,7 @@ H5G_loc_get_comment(H5G_loc_t *loc, const char *name, char *comment/*out*/,
H5G_loc_gc_t udata; /* User data for traversal callback */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5G_loc_get_comment, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args. */
HDassert(loc);
diff --git a/src/H5Gname.c b/src/H5Gname.c
index 18723a9..25639f2d 100644
--- a/src/H5Gname.c
+++ b/src/H5Gname.c
@@ -113,6 +113,104 @@ H5FL_BLK_EXTERN(str_buf);
/*-------------------------------------------------------------------------
+ * Function: H5G__component
+ *
+ * Purpose: Returns the pointer to the first component of the
+ * specified name by skipping leading slashes. Returns
+ * the size in characters of the component through SIZE_P not
+ * counting leading slashes or the null terminator.
+ *
+ * Return: Success: Ptr into NAME.
+ *
+ * Failure: Ptr to the null terminator of NAME.
+ *
+ * Programmer: Robb Matzke
+ * matzke@llnl.gov
+ * Aug 11 1997
+ *
+ *-------------------------------------------------------------------------
+ */
+const char *
+H5G__component(const char *name, size_t *size_p)
+{
+ FUNC_ENTER_PACKAGE_NOERR
+
+ assert(name);
+
+ while ('/' == *name)
+ name++;
+ if (size_p)
+ *size_p = HDstrcspn(name, "/");
+
+ FUNC_LEAVE_NOAPI(name)
+} /* end H5G__component() */
+
+
+/*-------------------------------------------------------------------------
+ * Function: H5G_normalize
+ *
+ * Purpose: Returns a pointer to a new string which has duplicate and
+ * trailing slashes removed from it.
+ *
+ * Return: Success: Ptr to normalized name.
+ * Failure: NULL
+ *
+ * Programmer: Quincey Koziol
+ * Saturday, August 16, 2003
+ *
+ *-------------------------------------------------------------------------
+ */
+char *
+H5G_normalize(const char *name)
+{
+ char *norm; /* Pointer to the normalized string */
+ size_t s,d; /* Positions within the strings */
+ unsigned last_slash; /* Flag to indicate last character was a slash */
+ char *ret_value; /* Return value */
+
+ FUNC_ENTER_NOAPI_NOINIT
+
+ /* Sanity check */
+ HDassert(name);
+
+ /* Duplicate the name, to return */
+ if(NULL == (norm = H5MM_strdup(name)))
+ HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for normalized string")
+
+ /* Walk through the characters, omitting duplicated '/'s */
+ s = d = 0;
+ last_slash = 0;
+ while(name[s] != '\0') {
+ if(name[s] == '/')
+ if(last_slash)
+ ;
+ else {
+ norm[d++] = name[s];
+ last_slash = 1;
+ } /* end else */
+ else {
+ norm[d++] = name[s];
+ last_slash = 0;
+ } /* end else */
+ s++;
+ } /* end while */
+
+ /* Terminate normalized string */
+ norm[d] = '\0';
+
+ /* Check for final '/' on normalized name & eliminate it */
+ if(d > 1 && last_slash)
+ norm[d - 1] = '\0';
+
+ /* Set return value */
+ ret_value = norm;
+
+done:
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5G_normalize() */
+
+
+/*-------------------------------------------------------------------------
* Function: H5G_common_path
*
* Purpose: Determine if one path is a valid prefix of another path
@@ -134,16 +232,16 @@ H5G_common_path(const H5RS_str_t *fullpath_r, const H5RS_str_t *prefix_r)
size_t nchars1,nchars2; /* Number of characters in components */
htri_t ret_value=FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_common_path)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Get component of each name */
fullpath=H5RS_get_str(fullpath_r);
assert(fullpath);
- fullpath=H5G_component(fullpath,&nchars1);
+ fullpath=H5G__component(fullpath,&nchars1);
assert(fullpath);
prefix=H5RS_get_str(prefix_r);
assert(prefix);
- prefix=H5G_component(prefix,&nchars2);
+ prefix=H5G__component(prefix,&nchars2);
assert(prefix);
/* Check if we have a real string for each component */
@@ -157,9 +255,9 @@ H5G_common_path(const H5RS_str_t *fullpath_r, const H5RS_str_t *prefix_r)
prefix+=nchars2;
/* Get next component of each name */
- fullpath=H5G_component(fullpath,&nchars1);
+ fullpath=H5G__component(fullpath,&nchars1);
assert(fullpath);
- prefix=H5G_component(prefix,&nchars2);
+ prefix=H5G__component(prefix,&nchars2);
assert(prefix);
} /* end if */
else
@@ -199,7 +297,7 @@ H5G_build_fullpath(const char *prefix, const char *name)
unsigned need_sep; /* Flag to indicate if separator is needed */
H5RS_str_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_build_fullpath)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(prefix);
@@ -255,7 +353,7 @@ H5G_build_fullpath_refstr_str(H5RS_str_t *prefix_r, const char *name)
const char *prefix; /* Pointer to raw string for path */
H5RS_str_t *ret_value;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_build_fullpath_refstr_str)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(prefix_r);
HDassert(name);
@@ -293,7 +391,7 @@ H5G_build_fullpath_refstr_refstr(const H5RS_str_t *prefix_r, const H5RS_str_t *n
const char *name; /* Pointer to raw string of name */
H5RS_str_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_build_fullpath_refstr_refstr)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Get the pointer to the prefix */
prefix = H5RS_get_str(prefix_r);
@@ -310,7 +408,7 @@ H5G_build_fullpath_refstr_refstr(const H5RS_str_t *prefix_r, const H5RS_str_t *n
/*-------------------------------------------------------------------------
- * Function: H5G_name_init
+ * Function: H5G__name_init
*
* Purpose: Set the initial path for a group hierarchy name
*
@@ -323,9 +421,9 @@ H5G_build_fullpath_refstr_refstr(const H5RS_str_t *prefix_r, const H5RS_str_t *n
*-------------------------------------------------------------------------
*/
herr_t
-H5G_name_init(H5G_name_t *name, const char *path)
+H5G__name_init(H5G_name_t *name, const char *path)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5G_name_init)
+ FUNC_ENTER_PACKAGE
/* Check arguments */
HDassert(name);
@@ -338,7 +436,7 @@ H5G_name_init(H5G_name_t *name, const char *path)
name->obj_hidden = 0;
FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5G_name_init() */
+} /* end H5G__name_init() */
/*-------------------------------------------------------------------------
@@ -355,11 +453,11 @@ H5G_name_init(H5G_name_t *name, const char *path)
*-------------------------------------------------------------------------
*/
herr_t
-H5G_name_set(H5G_name_t *loc, H5G_name_t *obj, const char *name)
+H5G_name_set(const H5G_name_t *loc, H5G_name_t *obj, const char *name)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5G_name_set, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(loc);
HDassert(obj);
@@ -413,7 +511,7 @@ done:
herr_t
H5G_name_copy(H5G_name_t *dst, const H5G_name_t *src, H5_copy_depth_t depth)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5G_name_copy)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(src);
@@ -466,7 +564,7 @@ H5G_get_name(const H5G_loc_t *loc, char *name/*out*/, size_t size,
ssize_t len = 0; /* Length of object's name */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5G_get_name, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(loc);
@@ -533,7 +631,7 @@ done:
herr_t
H5G_name_reset(H5G_name_t *name)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5G_name_reset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(name);
@@ -561,7 +659,7 @@ H5G_name_reset(H5G_name_t *name)
herr_t
H5G_name_free(H5G_name_t *name)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5G_name_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(name);
@@ -602,7 +700,7 @@ H5G_name_move_path(H5RS_str_t **path_r_ptr, const char *full_suffix, const char
size_t full_suffix_len; /* Length of full suffix */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_name_move_path)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(path_r_ptr && *path_r_ptr);
@@ -704,7 +802,7 @@ H5G_name_replace_cb(void *obj_ptr, hid_t obj_id, void *key)
hbool_t obj_in_child = FALSE; /* Flag to indicate that the object is in the child mount hier. */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_name_replace_cb)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(obj_ptr);
@@ -972,7 +1070,7 @@ H5G_name_replace(const H5O_link_t *lnk, H5G_names_op_t op, H5F_t *src_file,
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5G_name_replace, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments */
HDassert(src_file);
@@ -1110,7 +1208,7 @@ H5G_get_name_by_addr_cb(hid_t gid, const char *path, const H5L_info_t *linfo,
hbool_t obj_found = FALSE; /* Object at 'path' found */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_get_name_by_addr_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(path);
@@ -1183,7 +1281,7 @@ H5G_get_name_by_addr(hid_t file, hid_t lapl_id, hid_t dxpl_id, const H5O_loc_t *
/* Portably clear udata struct (before FUNC_ENTER) */
HDmemset(&udata, 0, sizeof(udata));
- FUNC_ENTER_NOAPI(H5G_get_name_by_addr, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Construct the link info for the file's root group */
if(H5G_loc(file, &root_loc) < 0)
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index 611694b..be339c4 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -159,7 +159,7 @@ H5FL_SEQ_DEFINE(H5G_entry_t);
static H5RC_t *
H5G_node_get_shared(const H5F_t *f, const void UNUSED *_udata)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_get_shared)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
@@ -186,7 +186,7 @@ H5G_node_decode_key(const H5B_shared_t *shared, const uint8_t *raw, void *_key)
{
H5G_node_key_t *key = (H5G_node_key_t *) _key;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_decode_key)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(shared);
HDassert(raw);
@@ -216,7 +216,7 @@ H5G_node_encode_key(const H5B_shared_t *shared, uint8_t *raw, const void *_key)
{
const H5G_node_key_t *key = (const H5G_node_key_t *) _key;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_encode_key)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(shared);
HDassert(raw);
@@ -247,7 +247,7 @@ H5G_node_debug_key(FILE *stream, int indent, int fwidth, const void *_key,
const H5G_node_key_t *key = (const H5G_node_key_t *) _key;
const H5G_bt_common_t *udata = (const H5G_bt_common_t *) _udata;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_debug_key)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(key);
@@ -270,7 +270,7 @@ H5G_node_debug_key(FILE *stream, int indent, int fwidth, const void *_key,
/*-------------------------------------------------------------------------
- * Function: H5G_node_free
+ * Function: H5G__node_free
*
* Purpose: Destroy a symbol table node in memory.
*
@@ -283,9 +283,9 @@ H5G_node_debug_key(FILE *stream, int indent, int fwidth, const void *_key,
*-------------------------------------------------------------------------
*/
herr_t
-H5G_node_free(H5G_node_t *sym)
+H5G__node_free(H5G_node_t *sym)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_free)
+ FUNC_ENTER_PACKAGE_NOERR
/*
* Check arguments.
@@ -300,7 +300,7 @@ H5G_node_free(H5G_node_t *sym)
sym = H5FL_FREE(H5G_node_t, sym);
FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5G_node_free() */
+} /* end H5G__node_free() */
/*-------------------------------------------------------------------------
@@ -331,7 +331,7 @@ H5G_node_create(H5F_t *f, hid_t dxpl_id, H5B_ins_t UNUSED op, void *_lt_key,
H5G_node_t *sym = NULL;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_node_create)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -406,7 +406,7 @@ H5G_node_cmp2(void *_lt_key, void *_udata, void *_rt_key)
const char *base; /* Base of heap */
int ret_value;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_cmp2)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity checks */
HDassert(udata && udata->heap);
@@ -465,7 +465,7 @@ H5G_node_cmp3(void *_lt_key, void *_udata, void *_rt_key)
const char *base; /* Base of heap */
int ret_value = 0; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_cmp3)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity checks */
HDassert(udata && udata->heap);
@@ -529,7 +529,7 @@ H5G_node_found(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED *_lt_key
const char *base; /* Base of heap */
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_node_found)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -632,7 +632,7 @@ H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr,
H5G_entry_t ent; /* Entry to insert in node */
H5B_ins_t ret_value = H5B_INS_ERROR;
- FUNC_ENTER_NOAPI_NOINIT(H5G_node_insert)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -674,7 +674,7 @@ H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr,
idx += cmp > 0 ? 1 : 0;
/* Convert link information & name to symbol table entry */
- if(H5G_ent_convert(f, dxpl_id, udata->common.heap, udata->common.name,
+ if(H5G__ent_convert(f, dxpl_id, udata->common.heap, udata->common.name,
udata->lnk, udata->obj_type, udata->crt_info, &ent) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTCONVERT, H5B_INS_ERROR, "unable to convert link")
@@ -740,7 +740,7 @@ H5G_node_insert(H5F_t *f, hid_t dxpl_id, haddr_t addr,
(insert_into->nsyms - (unsigned)idx) * sizeof(H5G_entry_t));
/* Copy new entry into table */
- H5G_ent_copy(&(insert_into->entry[idx]), &ent, H5_COPY_SHALLOW);
+ H5G__ent_copy(&(insert_into->entry[idx]), &ent, H5_COPY_SHALLOW);
/* Increment # of symbols in table */
insert_into->nsyms += 1;
@@ -798,7 +798,7 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/,
int cmp = 1;
H5B_ins_t ret_value = H5B_INS_ERROR;
- FUNC_ENTER_NOAPI_NOINIT(H5G_node_remove)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -857,7 +857,7 @@ H5G_node_remove(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_lt_key/*in,out*/,
} /* end else */
/* Replace any object names */
- if(H5G_link_name_replace(f, dxpl_id, udata->grp_full_path_r, &lnk) < 0)
+ if(H5G__link_name_replace(f, dxpl_id, udata->grp_full_path_r, &lnk) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, H5B_INS_ERROR, "unable to get object type")
/* Decrement the ref. count for hard links */
@@ -969,7 +969,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_node_iterate
+ * Function: H5G__node_iterate
*
* Purpose: This function gets called during a group iterate operation.
*
@@ -982,7 +982,7 @@ done:
*-------------------------------------------------------------------------
*/
int
-H5G_node_iterate(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t addr,
+H5G__node_iterate(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t addr,
const void UNUSED *_rt_key, void *_udata)
{
H5G_bt_it_it_t *udata = (H5G_bt_it_it_t *)_udata;
@@ -991,7 +991,7 @@ H5G_node_iterate(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t ad
unsigned u; /* Local index variable */
int ret_value = H5_ITER_CONT;
- FUNC_ENTER_NOAPI(H5G_node_iterate, H5_ITER_ERROR)
+ FUNC_ENTER_PACKAGE
/*
* Check arguments.
@@ -1019,7 +1019,7 @@ H5G_node_iterate(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t ad
HDassert(name);
/* Convert the entry to a link */
- if(H5G_ent_to_link(&lnk, udata->heap, &ents[u], name) < 0)
+ if(H5G__ent_to_link(&lnk, udata->heap, &ents[u], name) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTCONVERT, H5_ITER_ERROR, "unable to convert symbol table entry to link")
/* Make the callback */
@@ -1044,11 +1044,11 @@ done:
HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5_ITER_ERROR, "unable to release object header")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_node_iterate() */
+} /* end H5G__node_iterate() */
/*-------------------------------------------------------------------------
- * Function: H5G_node_sumup
+ * Function: H5G__node_sumup
*
* Purpose: This function gets called during a group iterate operation
* to return total number of members in the group.
@@ -1061,14 +1061,14 @@ done:
*-------------------------------------------------------------------------
*/
int
-H5G_node_sumup(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t addr,
+H5G__node_sumup(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t addr,
const void UNUSED *_rt_key, void *_udata)
{
hsize_t *num_objs = (hsize_t *)_udata;
H5G_node_t *sn = NULL;
int ret_value = H5_ITER_CONT;
- FUNC_ENTER_NOAPI(H5G_node_sumup, H5_ITER_ERROR)
+ FUNC_ENTER_PACKAGE
/*
* Check arguments.
@@ -1088,11 +1088,11 @@ done:
HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5_ITER_ERROR, "unable to release object header")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_node_sumup() */
+} /* end H5G__node_sumup() */
/*-------------------------------------------------------------------------
- * Function: H5G_node_name
+ * Function: H5G__node_by_idx
*
* Purpose: This function gets called during a group iterate operation
* to return object name by giving idx.
@@ -1106,14 +1106,14 @@ done:
*-------------------------------------------------------------------------
*/
int
-H5G_node_by_idx(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t addr,
+H5G__node_by_idx(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t addr,
const void UNUSED *_rt_key, void *_udata)
{
H5G_bt_it_idx_common_t *udata = (H5G_bt_it_idx_common_t *)_udata;
H5G_node_t *sn = NULL;
int ret_value = H5_ITER_CONT;
- FUNC_ENTER_NOAPI(H5G_node_by_idx, H5_ITER_ERROR)
+ FUNC_ENTER_PACKAGE
/*
* Check arguments.
@@ -1149,11 +1149,11 @@ done:
HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5_ITER_ERROR, "unable to release object header")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_node_by_idx() */
+} /* end H5G__node_by_idx() */
/*-------------------------------------------------------------------------
- * Function: H5G_node_init
+ * Function: H5G__node_init
*
* Purpose: This function gets called during a file opening to initialize
* global information about group B-tree nodes for file.
@@ -1167,13 +1167,13 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_node_init(H5F_t *f)
+H5G__node_init(H5F_t *f)
{
H5B_shared_t *shared; /* Shared B-tree node info */
size_t sizeof_rkey; /* Size of raw (disk) key */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_node_init, FAIL)
+ FUNC_ENTER_PACKAGE
/* Check arguments. */
HDassert(f);
@@ -1194,7 +1194,7 @@ H5G_node_init(H5F_t *f)
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_node_init() */
+} /* end H5G__node_init() */
/*-------------------------------------------------------------------------
@@ -1215,7 +1215,7 @@ done:
herr_t
H5G_node_close(const H5F_t *f)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_node_close)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(f);
@@ -1229,7 +1229,7 @@ H5G_node_close(const H5F_t *f)
/*-------------------------------------------------------------------------
- * Function: H5G_node_copy
+ * Function: H5G__node_copy
*
* Purpose: This function gets called during a group iterate operation
* to copy objects of this node into a new location.
@@ -1242,7 +1242,7 @@ H5G_node_close(const H5F_t *f)
*-------------------------------------------------------------------------
*/
int
-H5G_node_copy(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t addr,
+H5G__node_copy(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t addr,
const void UNUSED *_rt_key, void *_udata)
{
H5G_bt_it_cpy_t *udata = (H5G_bt_it_cpy_t *)_udata;
@@ -1253,7 +1253,7 @@ H5G_node_copy(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t addr,
unsigned int i; /* Local index variable */
int ret_value = H5_ITER_CONT;
- FUNC_ENTER_NOAPI(H5G_node_copy, H5_ITER_ERROR)
+ FUNC_ENTER_PACKAGE
/* Check arguments. */
HDassert(f);
@@ -1361,7 +1361,7 @@ H5G_node_copy(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t addr,
/* Insert the new object in the destination file's group */
/* (Don't increment the link count - that's already done above for hard links) */
- if(H5G_stab_insert_real(udata->dst_file, udata->dst_stab, name, &lnk,
+ if(H5G__stab_insert_real(udata->dst_file, udata->dst_stab, name, &lnk,
obj_type, (obj_type == H5O_TYPE_GROUP ? &gcrt_info : NULL),
dxpl_id) < 0)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, H5_ITER_ERROR, "unable to insert the name")
@@ -1375,11 +1375,11 @@ done:
HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5_ITER_ERROR, "unable to release object header")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_node_copy() */
+} /* end H5G__node_copy() */
/*-------------------------------------------------------------------------
- * Function: H5G_node_build_table
+ * Function: H5G__node_build_table
*
* Purpose: B-link tree callback for building table of links
*
@@ -1392,7 +1392,7 @@ done:
*-------------------------------------------------------------------------
*/
int
-H5G_node_build_table(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t addr,
+H5G__node_build_table(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_t addr,
const void UNUSED *_rt_key, void *_udata)
{
H5G_bt_it_bt_t *udata = (H5G_bt_it_bt_t *)_udata;
@@ -1400,7 +1400,7 @@ H5G_node_build_table(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_
unsigned u; /* Local index variable */
int ret_value = H5_ITER_CONT;
- FUNC_ENTER_NOAPI(H5G_node_build_table, H5_ITER_ERROR)
+ FUNC_ENTER_PACKAGE
/*
* Check arguments.
@@ -1440,7 +1440,7 @@ H5G_node_build_table(H5F_t *f, hid_t dxpl_id, const void UNUSED *_lt_key, haddr_
linkno = udata->ltable->nlinks++;
/* Convert the entry to a link */
- if(H5G_ent_to_link(&udata->ltable->lnks[linkno], udata->heap, &sn->entry[u], name) < 0)
+ if(H5G__ent_to_link(&udata->ltable->lnks[linkno], udata->heap, &sn->entry[u], name) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTCONVERT, H5_ITER_ERROR, "unable to convert symbol table entry to link")
} /* end for */
@@ -1450,11 +1450,11 @@ done:
HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5_ITER_ERROR, "unable to release object header")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_node_build_table() */
+} /* end H5G__node_build_table() */
/*-------------------------------------------------------------------------
- * Function: H5G_node_iterate_size
+ * Function: H5G__node_iterate_size
*
* Purpose: This function gets called by H5B_iterate_helper()
* to gather storage info for SNODs.
@@ -1467,12 +1467,12 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_node_iterate_size(H5F_t *f, hid_t UNUSED dxpl_id, const void UNUSED *_lt_key, haddr_t UNUSED addr,
+H5G__node_iterate_size(H5F_t *f, hid_t UNUSED dxpl_id, const void UNUSED *_lt_key, haddr_t UNUSED addr,
const void UNUSED *_rt_key, void *_udata)
{
hsize_t *stab_size = (hsize_t *)_udata; /* User data */
- FUNC_ENTER_NOAPI_NOFUNC(H5G_node_iterate_size)
+ FUNC_ENTER_PACKAGE_NOERR
/* Check arguments */
HDassert(f);
@@ -1481,7 +1481,7 @@ H5G_node_iterate_size(H5F_t *f, hid_t UNUSED dxpl_id, const void UNUSED *_lt_key
*stab_size += H5G_NODE_SIZE(f);
FUNC_LEAVE_NOAPI(SUCCEED)
-} /* end H5G_node_iterate_size() */
+} /* end H5G__node_iterate_size() */
/*-------------------------------------------------------------------------
@@ -1507,7 +1507,7 @@ H5G_node_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent,
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_node_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -1560,7 +1560,7 @@ H5G_node_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent,
else
fprintf(stream, "%*s%-*s\n", indent, "", fwidth, "Warning: Invalid heap address given, name not displayed!");
- H5G_ent_debug(sn->entry + u, stream, indent, fwidth, heap);
+ H5G__ent_debug(sn->entry + u, stream, indent, fwidth, heap);
} /* end for */
} /* end if */
diff --git a/src/H5Gobj.c b/src/H5Gobj.c
index 8580508..e183a9b 100644
--- a/src/H5Gobj.c
+++ b/src/H5Gobj.c
@@ -91,7 +91,7 @@ typedef struct {
/********************/
static herr_t H5G_obj_compact_to_dense_cb(const void *_mesg, unsigned idx,
void *_udata);
-static herr_t H5G_obj_remove_update_linfo(H5O_loc_t *oloc, H5O_linfo_t *linfo,
+static herr_t H5G_obj_remove_update_linfo(const H5O_loc_t *oloc, H5O_linfo_t *linfo,
hid_t dxpl_id);
@@ -112,7 +112,7 @@ static herr_t H5G_obj_remove_update_linfo(H5O_loc_t *oloc, H5O_linfo_t *linfo,
/*-------------------------------------------------------------------------
- * Function: H5G_obj_create
+ * Function: H5G__obj_create
*
* Purpose: Create an object header for a group and update object location info
*
@@ -125,7 +125,7 @@ static herr_t H5G_obj_remove_update_linfo(H5O_loc_t *oloc, H5O_linfo_t *linfo,
*-------------------------------------------------------------------------
*/
herr_t
-H5G_obj_create(H5F_t *f, hid_t dxpl_id, H5G_obj_create_t *gcrt_info,
+H5G__obj_create(H5F_t *f, hid_t dxpl_id, H5G_obj_create_t *gcrt_info,
H5O_loc_t *oloc/*out*/)
{
H5P_genplist_t *gc_plist; /* Group creation property list */
@@ -134,7 +134,7 @@ H5G_obj_create(H5F_t *f, hid_t dxpl_id, H5G_obj_create_t *gcrt_info,
H5O_pline_t pline; /* Pipeline */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_obj_create, FAIL)
+ FUNC_ENTER_PACKAGE
/*
* Check arguments.
@@ -159,16 +159,16 @@ H5G_obj_create(H5F_t *f, hid_t dxpl_id, H5G_obj_create_t *gcrt_info,
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get group info")
/* Call the "real" group creation routine now */
- if(H5G_obj_create_real(f, dxpl_id, &ginfo, &linfo, &pline, gcrt_info, oloc) < 0)
+ if(H5G__obj_create_real(f, dxpl_id, &ginfo, &linfo, &pline, gcrt_info, oloc) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTCREATE, FAIL, "unable to create group")
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_obj_create() */
+} /* end H5G__obj_create() */
/*-------------------------------------------------------------------------
- * Function: H5G_obj_create_real
+ * Function: H5G__obj_create_real
*
* Purpose: Create an object header for a group and update object location info
*
@@ -181,7 +181,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_obj_create_real(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
+H5G__obj_create_real(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
const H5O_linfo_t *linfo, const H5O_pline_t *pline,
H5G_obj_create_t *gcrt_info, H5O_loc_t *oloc/*out*/)
{
@@ -190,7 +190,7 @@ H5G_obj_create_real(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
hid_t gcpl_id = gcrt_info->gcpl_id; /* Group creation property list ID */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_obj_create_real, FAIL)
+ FUNC_ENTER_PACKAGE
/*
* Check arguments.
@@ -287,7 +287,7 @@ H5G_obj_create_real(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
H5O_stab_t stab; /* Symbol table message */
/* The group doesn't currently have a 'stab' message, go create one */
- if(H5G_stab_create(oloc, dxpl_id, ginfo, &stab) < 0)
+ if(H5G__stab_create(oloc, dxpl_id, ginfo, &stab) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create symbol table")
/* Cache the symbol table information */
@@ -298,11 +298,11 @@ H5G_obj_create_real(H5F_t *f, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_obj_create_real() */
+} /* end H5G__obj_create_real() */
/*-------------------------------------------------------------------------
- * Function: H5G_obj_get_linfo
+ * Function: H5G__obj_get_linfo
*
* Purpose: Retrieves the "link info" message for an object. Also
* sets the number of links correctly, if it isn't set up yet.
@@ -317,12 +317,12 @@ done:
*-------------------------------------------------------------------------
*/
htri_t
-H5G_obj_get_linfo(const H5O_loc_t *grp_oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
+H5G__obj_get_linfo(const H5O_loc_t *grp_oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
{
H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5G_obj_get_linfo, FAIL)
+ FUNC_ENTER_PACKAGE
/* check arguments */
HDassert(grp_oloc);
@@ -363,7 +363,7 @@ done:
HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "can't close v2 B-tree for name index")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_obj_get_linfo() */
+} /* end H5G__obj_get_linfo() */
/*-------------------------------------------------------------------------
@@ -387,14 +387,14 @@ H5G_obj_compact_to_dense_cb(const void *_mesg, unsigned UNUSED idx, void *_udata
H5G_obj_oh_it_ud1_t *udata = (H5G_obj_oh_it_ud1_t *)_udata; /* 'User data' passed in */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_obj_compact_to_dense_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(lnk);
HDassert(udata);
/* Insert link into dense link storage */
- if(H5G_dense_insert(udata->f, udata->dxpl_id, udata->linfo, lnk) < 0)
+ if(H5G__dense_insert(udata->f, udata->dxpl_id, udata->linfo, lnk) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert link into dense storage")
done:
@@ -422,7 +422,7 @@ H5G_obj_stab_to_new_cb(const H5O_link_t *lnk, void *_udata)
H5G_obj_stab_it_ud1_t *udata = (H5G_obj_stab_it_ud1_t *)_udata; /* 'User data' passed in */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_obj_stab_to_new_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(lnk);
@@ -468,7 +468,7 @@ H5G_obj_insert(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *obj_lnk,
hbool_t use_new_dense = FALSE; /* Whether to use "dense" form of 'new format' group */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_obj_insert, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(grp_oloc && grp_oloc->file);
@@ -477,7 +477,7 @@ H5G_obj_insert(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *obj_lnk,
/* Check if we have information about the number of objects in this group */
/* (by attempting to get the link info message for this group) */
- if((linfo_exists = H5G_obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
+ if((linfo_exists = H5G__obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
if(linfo_exists) {
H5O_ginfo_t ginfo; /* Group info message */
@@ -527,7 +527,7 @@ H5G_obj_insert(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *obj_lnk,
} /* end if */
/* The group doesn't currently have "dense" storage for links */
- if(H5G_dense_create(grp_oloc->file, dxpl_id, &linfo, pline) < 0)
+ if(H5G__dense_create(grp_oloc->file, dxpl_id, &linfo, pline) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create 'dense' form of new format group")
/* Set up user data for object header message iteration */
@@ -570,7 +570,7 @@ H5G_obj_insert(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *obj_lnk,
udata.dxpl_id = dxpl_id;
/* Iterate through all links in "old format" group and insert them into new format */
- if(H5G_stab_iterate(grp_oloc, dxpl_id, H5_ITER_NATIVE, (hsize_t)0, NULL, H5G_obj_stab_to_new_cb, &udata) < 0)
+ if(H5G__stab_iterate(grp_oloc, dxpl_id, H5_ITER_NATIVE, (hsize_t)0, NULL, H5G_obj_stab_to_new_cb, &udata) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTNEXT, FAIL, "error iterating over old format links")
/* Remove the symbol table message from the group */
@@ -595,19 +595,19 @@ H5G_obj_insert(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *obj_lnk,
/* Insert into symbol table or "dense" storage */
if(use_old_format) {
/* Insert into symbol table */
- if(H5G_stab_insert(grp_oloc, name, obj_lnk, obj_type, crt_info, dxpl_id)
+ if(H5G__stab_insert(grp_oloc, name, obj_lnk, obj_type, crt_info, dxpl_id)
< 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert entry into symbol table")
} /* end if */
else {
if(use_new_dense) {
/* Insert into dense link storage */
- if(H5G_dense_insert(grp_oloc->file, dxpl_id, &linfo, obj_lnk) < 0)
+ if(H5G__dense_insert(grp_oloc->file, dxpl_id, &linfo, obj_lnk) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert link into dense storage")
} /* end if */
else {
/* Insert with link message */
- if(H5G_compact_insert(grp_oloc, obj_lnk, dxpl_id) < 0)
+ if(H5G__compact_insert(grp_oloc, obj_lnk, dxpl_id) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert link as link message")
} /* end else */
} /* end else */
@@ -643,7 +643,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_obj_iterate
+ * Function: H5G__obj_iterate
*
* Purpose: Private function for H5Giterate.
* Iterates over objects in a group
@@ -658,7 +658,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_obj_iterate(const H5O_loc_t *grp_oloc,
+H5G__obj_iterate(const H5O_loc_t *grp_oloc,
H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
H5G_lib_iterate_t op, void *op_data, hid_t dxpl_id)
{
@@ -666,14 +666,14 @@ H5G_obj_iterate(const H5O_loc_t *grp_oloc,
htri_t linfo_exists; /* Whether the link info message exists */
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5G_obj_iterate, FAIL)
+ FUNC_ENTER_PACKAGE
/* Sanity check */
HDassert(grp_oloc);
HDassert(op);
/* Attempt to get the link info for this group */
- if((linfo_exists = H5G_obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
+ if((linfo_exists = H5G__obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
if(linfo_exists) {
/* Check for going out of bounds */
@@ -689,12 +689,12 @@ H5G_obj_iterate(const H5O_loc_t *grp_oloc,
if(H5F_addr_defined(linfo.fheap_addr)) {
/* Iterate over the links in the group, building a table of the link messages */
- if((ret_value = H5G_dense_iterate(grp_oloc->file, dxpl_id, &linfo, idx_type, order, skip, last_lnk, op, op_data)) < 0)
+ if((ret_value = H5G__dense_iterate(grp_oloc->file, dxpl_id, &linfo, idx_type, order, skip, last_lnk, op, op_data)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't iterate over dense links")
} /* end if */
else {
/* Get the object's name from the link messages */
- if((ret_value = H5G_compact_iterate(grp_oloc, dxpl_id, &linfo, idx_type, order, skip, last_lnk, op, op_data)) < 0)
+ if((ret_value = H5G__compact_iterate(grp_oloc, dxpl_id, &linfo, idx_type, order, skip, last_lnk, op, op_data)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't iterate over compact links")
} /* end else */
} /* end if */
@@ -704,17 +704,17 @@ H5G_obj_iterate(const H5O_loc_t *grp_oloc,
HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "no creation order index to query")
/* Iterate over symbol table */
- if((ret_value = H5G_stab_iterate(grp_oloc, dxpl_id, order, skip, last_lnk, op, op_data)) < 0)
+ if((ret_value = H5G__stab_iterate(grp_oloc, dxpl_id, order, skip, last_lnk, op, op_data)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_BADITER, FAIL, "can't iterate over symbol table")
} /* end else */
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_obj_iterate() */
+} /* end H5G__obj_iterate() */
/*-------------------------------------------------------------------------
- * Function: H5G_obj_info
+ * Function: H5G__obj_info
*
* Purpose: Retrieve information about a group
*
@@ -727,7 +727,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_obj_info(H5O_loc_t *oloc, H5G_info_t *grp_info, hid_t dxpl_id)
+H5G__obj_info(H5O_loc_t *oloc, H5G_info_t *grp_info, hid_t dxpl_id)
{
H5G_t *grp = NULL; /* Group to query */
H5G_loc_t grp_loc; /* Entry of group to be queried */
@@ -737,7 +737,7 @@ H5G_obj_info(H5O_loc_t *oloc, H5G_info_t *grp_info, hid_t dxpl_id)
htri_t linfo_exists; /* Whether the link info message exists */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_obj_info, FAIL)
+ FUNC_ENTER_PACKAGE
/* Sanity check */
HDassert(oloc);
@@ -760,7 +760,7 @@ H5G_obj_info(H5O_loc_t *oloc, H5G_info_t *grp_info, hid_t dxpl_id)
grp_info->mounted = H5G_MOUNTED(grp);
/* Attempt to get the link info for this group */
- if((linfo_exists = H5G_obj_get_linfo(oloc, &linfo, dxpl_id)) < 0)
+ if((linfo_exists = H5G__obj_get_linfo(oloc, &linfo, dxpl_id)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
if(linfo_exists) {
/* Retrieve the information about the links */
@@ -775,7 +775,7 @@ H5G_obj_info(H5O_loc_t *oloc, H5G_info_t *grp_info, hid_t dxpl_id)
} /* end if */
else {
/* Get the number of objects in this group by iterating over symbol table */
- if(H5G_stab_count(oloc, &grp_info->nlinks, dxpl_id) < 0)
+ if(H5G__stab_count(oloc, &grp_info->nlinks, dxpl_id) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTCOUNT, FAIL, "can't count objects")
/* Set the other information about the group */
@@ -789,7 +789,7 @@ done:
HDONE_ERROR(H5E_SYM, H5E_CANTCLOSEOBJ, FAIL, "unable to close queried group")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_obj_info() */
+} /* end H5G__obj_info() */
/*-------------------------------------------------------------------------
@@ -806,20 +806,20 @@ done:
*-------------------------------------------------------------------------
*/
ssize_t
-H5G_obj_get_name_by_idx(H5O_loc_t *oloc, H5_index_t idx_type,
+H5G_obj_get_name_by_idx(const H5O_loc_t *oloc, H5_index_t idx_type,
H5_iter_order_t order, hsize_t n, char* name, size_t size, hid_t dxpl_id)
{
H5O_linfo_t linfo; /* Link info message */
htri_t linfo_exists; /* Whether the link info message exists */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5G_obj_get_name_by_idx, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(oloc && oloc->file);
/* Attempt to get the link info for this group */
- if((linfo_exists = H5G_obj_get_linfo(oloc, &linfo, dxpl_id)) < 0)
+ if((linfo_exists = H5G__obj_get_linfo(oloc, &linfo, dxpl_id)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
if(linfo_exists) {
/* Check for creation order tracking, if creation order index lookup requested */
@@ -832,12 +832,12 @@ H5G_obj_get_name_by_idx(H5O_loc_t *oloc, H5_index_t idx_type,
/* Check for dense link storage */
if(H5F_addr_defined(linfo.fheap_addr)) {
/* Get the object's name from the dense link storage */
- if((ret_value = H5G_dense_get_name_by_idx(oloc->file, dxpl_id, &linfo, idx_type, order, n, name, size)) < 0)
+ if((ret_value = H5G__dense_get_name_by_idx(oloc->file, dxpl_id, &linfo, idx_type, order, n, name, size)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate name")
} /* end if */
else {
/* Get the object's name from the link messages */
- if((ret_value = H5G_compact_get_name_by_idx(oloc, dxpl_id, &linfo, idx_type, order, n, name, size)) < 0)
+ if((ret_value = H5G__compact_get_name_by_idx(oloc, dxpl_id, &linfo, idx_type, order, n, name, size)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate name")
} /* end else */
} /* end if */
@@ -847,7 +847,7 @@ H5G_obj_get_name_by_idx(H5O_loc_t *oloc, H5_index_t idx_type,
HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "no creation order index to query")
/* Get the object's name from the symbol table */
- if((ret_value = H5G_stab_get_name_by_idx(oloc, order, n, name, size, dxpl_id)) < 0)
+ if((ret_value = H5G__stab_get_name_by_idx(oloc, order, n, name, size, dxpl_id)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate name")
} /* end else */
@@ -870,11 +870,11 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5G_obj_remove_update_linfo(H5O_loc_t *oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
+H5G_obj_remove_update_linfo(const H5O_loc_t *oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_obj_remove_update_linfo)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(oloc);
@@ -892,7 +892,7 @@ H5G_obj_remove_update_linfo(H5O_loc_t *oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
/* Check if there's no more links */
if(linfo->nlinks == 0) {
/* Delete the dense storage */
- if(H5G_dense_delete(oloc->file, dxpl_id, linfo, FALSE) < 0)
+ if(H5G__dense_delete(oloc->file, dxpl_id, linfo, FALSE) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete dense link storage")
} /* end if */
/* Check for switching back to compact storage */
@@ -911,7 +911,7 @@ H5G_obj_remove_update_linfo(H5O_loc_t *oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
size_t u; /* Local index */
/* Build the table of links for this group */
- if(H5G_dense_build_table(oloc->file, dxpl_id, linfo, H5_INDEX_NAME, H5_ITER_NATIVE, &ltable) < 0)
+ if(H5G__dense_build_table(oloc->file, dxpl_id, linfo, H5_INDEX_NAME, H5_ITER_NATIVE, &ltable) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTNEXT, FAIL, "error iterating over links")
/* Pin the object header */
@@ -941,7 +941,7 @@ H5G_obj_remove_update_linfo(H5O_loc_t *oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
} /* end if */
/* Remove the dense storage */
- if(H5G_dense_delete(oloc->file, dxpl_id, linfo, FALSE) < 0)
+ if(H5G__dense_delete(oloc->file, dxpl_id, linfo, FALSE) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete dense link storage")
} /* end if */
@@ -950,7 +950,7 @@ H5G_obj_remove_update_linfo(H5O_loc_t *oloc, H5O_linfo_t *linfo, hid_t dxpl_id)
HGOTO_ERROR(H5E_SYM, H5E_CANTUNPIN, FAIL, "unable to unpin group object header")
/* Free link table information */
- if(H5G_link_release_table(&ltable) < 0)
+ if(H5G__link_release_table(&ltable) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
} /* end if */
} /* end else */
@@ -979,21 +979,21 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_obj_remove(H5O_loc_t *oloc, H5RS_str_t *grp_full_path_r, const char *name, hid_t dxpl_id)
+H5G_obj_remove(const H5O_loc_t *oloc, H5RS_str_t *grp_full_path_r, const char *name, hid_t dxpl_id)
{
H5O_linfo_t linfo; /* Link info message */
htri_t linfo_exists; /* Whether the link info message exists */
hbool_t use_old_format; /* Whether to use 'old format' (symbol table) for deletion or not */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_obj_remove, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(oloc);
HDassert(name && *name);
/* Attempt to get the link info for this group */
- if((linfo_exists = H5G_obj_get_linfo(oloc, &linfo, dxpl_id)) < 0)
+ if((linfo_exists = H5G__obj_get_linfo(oloc, &linfo, dxpl_id)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
if(linfo_exists) {
/* Using the new format for groups */
@@ -1002,12 +1002,12 @@ H5G_obj_remove(H5O_loc_t *oloc, H5RS_str_t *grp_full_path_r, const char *name, h
/* Check for dense or compact storage */
if(H5F_addr_defined(linfo.fheap_addr)) {
/* Remove object from the dense link storage */
- if(H5G_dense_remove(oloc->file, dxpl_id, &linfo, grp_full_path_r, name) < 0)
+ if(H5G__dense_remove(oloc->file, dxpl_id, &linfo, grp_full_path_r, name) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't remove object")
} /* end if */
else {
/* Remove object from the link messages */
- if(H5G_compact_remove(oloc, dxpl_id, grp_full_path_r, name) < 0)
+ if(H5G__compact_remove(oloc, dxpl_id, grp_full_path_r, name) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't remove object")
} /* end else */
} /* end if */
@@ -1016,7 +1016,7 @@ H5G_obj_remove(H5O_loc_t *oloc, H5RS_str_t *grp_full_path_r, const char *name, h
use_old_format = TRUE;
/* Remove object from the symbol table */
- if(H5G_stab_remove(oloc, dxpl_id, grp_full_path_r, name) < 0)
+ if(H5G__stab_remove(oloc, dxpl_id, grp_full_path_r, name) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't remove object")
} /* end else */
@@ -1044,7 +1044,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_obj_remove_by_idx(H5O_loc_t *grp_oloc, H5RS_str_t *grp_full_path_r,
+H5G_obj_remove_by_idx(const H5O_loc_t *grp_oloc, H5RS_str_t *grp_full_path_r,
H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t dxpl_id)
{
H5O_linfo_t linfo; /* Link info message */
@@ -1052,13 +1052,13 @@ H5G_obj_remove_by_idx(H5O_loc_t *grp_oloc, H5RS_str_t *grp_full_path_r,
hbool_t use_old_format; /* Whether to use 'old format' (symbol table) for deletion or not */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_obj_remove_by_idx, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(grp_oloc && grp_oloc->file);
/* Attempt to get the link info for this group */
- if((linfo_exists = H5G_obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
+ if((linfo_exists = H5G__obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
if(linfo_exists) {
/* Check for creation order tracking, if creation order index lookup requested */
@@ -1074,12 +1074,12 @@ H5G_obj_remove_by_idx(H5O_loc_t *grp_oloc, H5RS_str_t *grp_full_path_r,
/* Check for dense or compact storage */
if(H5F_addr_defined(linfo.fheap_addr)) {
/* Remove object from the dense link storage */
- if(H5G_dense_remove_by_idx(grp_oloc->file, dxpl_id, &linfo, grp_full_path_r, idx_type, order, n) < 0)
+ if(H5G__dense_remove_by_idx(grp_oloc->file, dxpl_id, &linfo, grp_full_path_r, idx_type, order, n) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't remove object")
} /* end if */
else {
/* Remove object from compact link storage */
- if(H5G_compact_remove_by_idx(grp_oloc, dxpl_id, &linfo, grp_full_path_r, idx_type, order, n) < 0)
+ if(H5G__compact_remove_by_idx(grp_oloc, dxpl_id, &linfo, grp_full_path_r, idx_type, order, n) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't remove object")
} /* end else */
} /* end if */
@@ -1092,7 +1092,7 @@ H5G_obj_remove_by_idx(H5O_loc_t *grp_oloc, H5RS_str_t *grp_full_path_r,
use_old_format = TRUE;
/* Remove object from the symbol table */
- if(H5G_stab_remove_by_idx(grp_oloc, dxpl_id, grp_full_path_r, order, n) < 0)
+ if(H5G__stab_remove_by_idx(grp_oloc, dxpl_id, grp_full_path_r, order, n) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't remove object")
} /* end else */
@@ -1108,7 +1108,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_obj_lookup
+ * Function: H5G__obj_lookup
*
* Purpose: Look up a link in a group, using the name as the key.
*
@@ -1121,44 +1121,44 @@ done:
*-------------------------------------------------------------------------
*/
htri_t
-H5G_obj_lookup(H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk,
+H5G__obj_lookup(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk,
hid_t dxpl_id)
{
H5O_linfo_t linfo; /* Link info message */
htri_t linfo_exists; /* Whether the link info message exists */
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI(H5G_obj_lookup, FAIL)
+ FUNC_ENTER_PACKAGE
/* check arguments */
HDassert(grp_oloc && grp_oloc->file);
HDassert(name && *name);
/* Attempt to get the link info message for this group */
- if((linfo_exists = H5G_obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
+ if((linfo_exists = H5G__obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
if(linfo_exists) {
/* Check for dense link storage */
if(H5F_addr_defined(linfo.fheap_addr)) {
/* Get the object's info from the dense link storage */
- if((ret_value = H5G_dense_lookup(grp_oloc->file, dxpl_id, &linfo, name, lnk)) < 0)
+ if((ret_value = H5G__dense_lookup(grp_oloc->file, dxpl_id, &linfo, name, lnk)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate object")
} /* end if */
else {
/* Get the object's info from the link messages */
- if((ret_value = H5G_compact_lookup(grp_oloc, name, lnk, dxpl_id)) < 0)
+ if((ret_value = H5G__compact_lookup(grp_oloc, name, lnk, dxpl_id)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate object")
} /* end else */
} /* end if */
else {
/* Get the object's info from the symbol table */
- if((ret_value = H5G_stab_lookup(grp_oloc, name, lnk, dxpl_id)) < 0)
+ if((ret_value = H5G__stab_lookup(grp_oloc, name, lnk, dxpl_id)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate object")
} /* end else */
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_obj_lookup() */
+} /* end H5G__obj_lookup() */
/*-------------------------------------------------------------------------
@@ -1176,20 +1176,20 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_obj_lookup_by_idx(H5O_loc_t *grp_oloc, H5_index_t idx_type,
+H5G_obj_lookup_by_idx(const H5O_loc_t *grp_oloc, H5_index_t idx_type,
H5_iter_order_t order, hsize_t n, H5O_link_t *lnk, hid_t dxpl_id)
{
H5O_linfo_t linfo; /* Link info message */
htri_t linfo_exists; /* Whether the link info message exists */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_obj_lookup_by_idx, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(grp_oloc && grp_oloc->file);
/* Attempt to get the link info message for this group */
- if((linfo_exists = H5G_obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
+ if((linfo_exists = H5G__obj_get_linfo(grp_oloc, &linfo, dxpl_id)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't check for link info message")
if(linfo_exists) {
/* Check for creation order tracking, if creation order index lookup requested */
@@ -1202,12 +1202,12 @@ H5G_obj_lookup_by_idx(H5O_loc_t *grp_oloc, H5_index_t idx_type,
/* Check for dense link storage */
if(H5F_addr_defined(linfo.fheap_addr)) {
/* Get the link from the dense storage */
- if(H5G_dense_lookup_by_idx(grp_oloc->file, dxpl_id, &linfo, idx_type, order, n, lnk) < 0)
+ if(H5G__dense_lookup_by_idx(grp_oloc->file, dxpl_id, &linfo, idx_type, order, n, lnk) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate object")
} /* end if */
else {
/* Get the link from the link messages */
- if(H5G_compact_lookup_by_idx(grp_oloc, dxpl_id, &linfo, idx_type, order, n, lnk) < 0)
+ if(H5G__compact_lookup_by_idx(grp_oloc, dxpl_id, &linfo, idx_type, order, n, lnk) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate object")
} /* end else */
} /* end if */
@@ -1217,7 +1217,7 @@ H5G_obj_lookup_by_idx(H5O_loc_t *grp_oloc, H5_index_t idx_type,
HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "no creation order index to query")
/* Get the object's info from the symbol table */
- if(H5G_stab_lookup_by_idx(grp_oloc, order, n, lnk, dxpl_id) < 0)
+ if(H5G__stab_lookup_by_idx(grp_oloc, order, n, lnk, dxpl_id) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't locate object")
} /* end else */
diff --git a/src/H5Goh.c b/src/H5Goh.c
index e64a4ac..27c88f5 100644
--- a/src/H5Goh.c
+++ b/src/H5Goh.c
@@ -108,7 +108,7 @@ H5O_group_get_copy_file_udata(void)
{
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_group_get_copy_file_udata)
+ FUNC_ENTER_NOAPI_NOINIT
/* Allocate space for the 'copy file' user data for copying groups.
* Currently this is only a ginfo, so there is no specific struct type for
@@ -139,7 +139,7 @@ H5O_group_free_copy_file_udata(void *_udata)
{
H5G_copy_file_ud_t *udata = (H5G_copy_file_ud_t *)_udata;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_group_free_copy_file_udata)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(udata);
@@ -178,7 +178,7 @@ H5O_group_isa(struct H5O_t *oh)
htri_t linfo_exists; /* Whether the 'linfo' message is in the object header */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_group_isa)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(oh);
@@ -214,7 +214,7 @@ H5O_group_open(const H5G_loc_t *obj_loc, hid_t UNUSED lapl_id, hid_t dxpl_id, hb
H5G_t *grp = NULL; /* Group opened */
hid_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_group_open)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(obj_loc);
@@ -255,7 +255,7 @@ H5O_group_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id)
H5G_t *grp = NULL; /* New group created */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_group_create)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(f);
@@ -263,7 +263,7 @@ H5O_group_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id)
HDassert(obj_loc);
/* Create the the group */
- if(NULL == (grp = H5G_create(f, crt_info, dxpl_id)))
+ if(NULL == (grp = H5G__create(f, crt_info, dxpl_id)))
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "unable to create group")
/* Set up the new group's location */
@@ -303,7 +303,7 @@ H5O_group_get_oloc(hid_t obj_id)
H5G_t *grp; /* Group opened */
H5O_loc_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_group_get_oloc)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get the group */
if(NULL == (grp = (H5G_t *)H5I_object(obj_id)))
@@ -340,7 +340,7 @@ H5O_group_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info)
H5B2_t *bt2_corder = NULL; /* v2 B-tree handle for creation order index */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_group_bh_info)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -398,7 +398,7 @@ H5O_group_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't find LINFO nor STAB messages")
/* Get symbol table size info */
- if(H5G_stab_bh_size(f, dxpl_id, &stab, bh_info) < 0)
+ if(H5G__stab_bh_size(f, dxpl_id, &stab, bh_info) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't retrieve symbol table size info")
} /* end else */
diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h
index b8f5f42..e2180c0 100644
--- a/src/H5Gpkg.h
+++ b/src/H5Gpkg.h
@@ -46,18 +46,6 @@
/* Standard length of fractal heap ID for link */
#define H5G_DENSE_FHEAP_ID_LEN 7
-/*
- * During name lookups (see H5G_traverse()) we sometimes want information about
- * a symbolic link or a mount point. The normal operation is to follow the
- * symbolic link or mount point and return information about its target.
- */
-#define H5G_TARGET_NORMAL 0x0000
-#define H5G_TARGET_SLINK 0x0001
-#define H5G_TARGET_MOUNT 0x0002
-#define H5G_TARGET_UDLINK 0x0004
-#define H5G_TARGET_EXISTS 0x0008
-#define H5G_CRT_INTMD_GROUP 0x0010
-
/* Size of a symbol table node on disk */
#define H5G_NODE_SIZE(f) ( \
/* General metadata fields */ \
@@ -95,7 +83,7 @@ typedef enum H5G_cache_type_t {
* messages... The values are entered into the symbol table when an object
* header is created (by hand) and are extracted from the symbol table with a
* callback function registered in H5O_init_interface(). Be sure to update
- * H5G_ent_decode(), H5G_ent_encode(), and H5G_ent_debug() as well.
+ * H5G_ent_decode(), H5G_ent_encode(), and H5G__ent_debug() as well.
*/
typedef union H5G_cache_t {
struct {
@@ -156,24 +144,6 @@ struct H5G_t {
/* Link iteration operator for internal library callbacks */
typedef herr_t (*H5G_lib_iterate_t)(const H5O_link_t *lnk, void *op_data);
-/* Describe kind of callback to make for each link */
-typedef enum H5G_link_iterate_op_type_t {
-#ifndef H5_NO_DEPRECATED_SYMBOLS
- H5G_LINK_OP_OLD, /* "Old" application callback */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
- H5G_LINK_OP_NEW /* "New" application callback */
-} H5G_link_iterate_op_type_t;
-
-typedef struct {
- H5G_link_iterate_op_type_t op_type;
- union {
-#ifndef H5_NO_DEPRECATED_SYMBOLS
- H5G_iterate_t op_old; /* "Old" application callback for each link */
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
- H5L_iterate_t op_new; /* "New" application callback for each link */
- } op_func;
-} H5G_link_iterate_t;
-
/* Data structure to hold table of links for a group */
typedef struct {
size_t nlinks; /* # of links in table */
@@ -318,20 +288,6 @@ typedef struct H5G_bt2_ud_ins_t {
uint8_t id[H5G_DENSE_FHEAP_ID_LEN]; /* Heap ID of link to insert */
} H5G_bt2_ud_ins_t;
-/* Typedef for path traversal operations */
-/* grp_loc is the location of the group in which the targeted object is located.
- * name is the last component of the object's name
- * lnk is the link between the group and the object
- * obj_loc is the target of the traversal (or NULL if the object doesn't exist)
- * operator_data is whatever udata was supplied when H5G_traverse was called
- * own_loc should be set to H5G_OWN_OBJ_LOC if this callback takes ownership of obj_loc,
- * H5G_OWN_GRP_LOC if it takes ownership of grp_loc, and H5G_OWN_NONE if obj_loc and
- * grp_loc need to be deleted.
- */
-typedef herr_t (*H5G_traverse_t)(H5G_loc_t *grp_loc/*in*/, const char *name,
- const H5O_link_t *lnk/*in*/, H5G_loc_t *obj_loc/*out*/, void *operator_data/*in,out*/,
- H5G_own_loc_t *own_loc/*out*/);
-
/* Typedef for group creation operation */
typedef struct H5G_obj_create_t{
hid_t gcpl_id; /* Group creation property list */
@@ -378,69 +334,62 @@ H5FL_EXTERN(H5G_shared_t);
/*
* General group routines
*/
-H5_DLL H5G_t *H5G_create(H5F_t *file, H5G_obj_create_t *gcrt_info,
+H5_DLL H5G_t *H5G__create(H5F_t *file, H5G_obj_create_t *gcrt_info,
hid_t dxpl_id);
-H5_DLL H5G_t *H5G_create_named(const H5G_loc_t *loc, const char *name,
+H5_DLL H5G_t *H5G__create_named(const H5G_loc_t *loc, const char *name,
hid_t lcpl_id, hid_t gcpl_id, hid_t gapl_id, hid_t dxpl_id);
-H5_DLL H5G_t *H5G_open_name(const H5G_loc_t *loc, const char *name,
+H5_DLL H5G_t *H5G__open_name(const H5G_loc_t *loc, const char *name,
hid_t gapl_id, hid_t dxpl_id);
-H5_DLL herr_t H5G_iterate(hid_t loc_id, const char *group_name,
- H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
- const H5G_link_iterate_t *lnk_op, void *op_data, hid_t lapl_id, hid_t dxpl_id);
/*
* Group hierarchy traversal routines
*/
-H5_DLL herr_t H5G_traverse_special(const H5G_loc_t *grp_loc,
+H5_DLL herr_t H5G__traverse_special(const H5G_loc_t *grp_loc,
const H5O_link_t *lnk, unsigned target, size_t *nlinks, hbool_t last_comp,
H5G_loc_t *obj_loc, hbool_t *obj_exists, hid_t lapl_id, hid_t dxpl_id);
-H5_DLL herr_t H5G_traverse(const H5G_loc_t *loc, const char *name,
- unsigned target, H5G_traverse_t op, void *op_data, hid_t lapl_id,
- hid_t dxpl_id);
/*
* Utility functions
*/
-H5_DLL herr_t H5G_init(void);
-H5_DLL char *H5G_normalize(const char *name);
-H5_DLL const char *H5G_component(const char *name, size_t *size_p);
+H5_DLL herr_t H5G__init(void);
+H5_DLL const char *H5G__component(const char *name, size_t *size_p);
/*
* Functions that understand symbol tables but not names. The
* functions that understand names are exported to the rest of
* the library and appear in H5Gprivate.h.
*/
-H5_DLL herr_t H5G_stab_create(H5O_loc_t *grp_oloc, hid_t dxpl_id,
+H5_DLL herr_t H5G__stab_create(H5O_loc_t *grp_oloc, hid_t dxpl_id,
const H5O_ginfo_t *ginfo, H5O_stab_t *stab);
-H5_DLL herr_t H5G_stab_create_components(H5F_t *f, H5O_stab_t *stab, size_t size_hint, hid_t dxpl_id);
-H5_DLL herr_t H5G_stab_insert(const H5O_loc_t *grp_oloc, const char *name,
+H5_DLL herr_t H5G__stab_create_components(H5F_t *f, H5O_stab_t *stab, size_t size_hint, hid_t dxpl_id);
+H5_DLL herr_t H5G__stab_insert(const H5O_loc_t *grp_oloc, const char *name,
H5O_link_t *obj_lnk, H5O_type_t obj_type, const void *crt_info,
hid_t dxpl_id);
-H5_DLL herr_t H5G_stab_insert_real(H5F_t *f, const H5O_stab_t *stab,
+H5_DLL herr_t H5G__stab_insert_real(H5F_t *f, const H5O_stab_t *stab,
const char *name, H5O_link_t *obj_lnk, H5O_type_t obj_type,
const void *crt_info, hid_t dxpl_id);
-H5_DLL herr_t H5G_stab_delete(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab);
-H5_DLL herr_t H5G_stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
+H5_DLL herr_t H5G__stab_delete(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab);
+H5_DLL herr_t H5G__stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
hsize_t skip, hsize_t *last_lnk, H5G_lib_iterate_t op, void *op_data);
-H5_DLL herr_t H5G_stab_count(struct H5O_loc_t *oloc, hsize_t *num_objs, hid_t dxpl_id);
-H5_DLL herr_t H5G_stab_bh_size(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab,
+H5_DLL herr_t H5G__stab_count(struct H5O_loc_t *oloc, hsize_t *num_objs, hid_t dxpl_id);
+H5_DLL herr_t H5G__stab_bh_size(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab,
H5_ih_info_t *bh_info);
-H5_DLL ssize_t H5G_stab_get_name_by_idx(H5O_loc_t *oloc, H5_iter_order_t order,
+H5_DLL ssize_t H5G__stab_get_name_by_idx(const H5O_loc_t *oloc, H5_iter_order_t order,
hsize_t n, char* name, size_t size, hid_t dxpl_id);
-H5_DLL herr_t H5G_stab_remove(H5O_loc_t *oloc, hid_t dxpl_id,
+H5_DLL herr_t H5G__stab_remove(const H5O_loc_t *oloc, hid_t dxpl_id,
H5RS_str_t *grp_full_path_r, const char *name);
-H5_DLL herr_t H5G_stab_remove_by_idx(H5O_loc_t *oloc, hid_t dxpl_id,
+H5_DLL herr_t H5G__stab_remove_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
H5RS_str_t *grp_full_path_r, H5_iter_order_t order, hsize_t n);
-H5_DLL herr_t H5G_stab_lookup(H5O_loc_t *grp_oloc, const char *name,
+H5_DLL herr_t H5G__stab_lookup(const H5O_loc_t *grp_oloc, const char *name,
H5O_link_t *lnk, hid_t dxpl_id);
-H5_DLL herr_t H5G_stab_lookup_by_idx(H5O_loc_t *grp_oloc, H5_iter_order_t order,
+H5_DLL herr_t H5G__stab_lookup_by_idx(const H5O_loc_t *grp_oloc, H5_iter_order_t order,
hsize_t n, H5O_link_t *lnk, hid_t dxpl_id);
#ifndef H5_STRICT_FORMAT_CHECKS
-H5_DLL herr_t H5G_stab_valid(H5O_loc_t *grp_oloc, hid_t dxpl_id,
+H5_DLL herr_t H5G__stab_valid(H5O_loc_t *grp_oloc, hid_t dxpl_id,
H5O_stab_t *alt_stab);
#endif /* H5_STRICT_FORMAT_CHECKS */
#ifndef H5_NO_DEPRECATED_SYMBOLS
-H5_DLL H5G_obj_t H5G_stab_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx,
+H5_DLL H5G_obj_t H5G__stab_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx,
hid_t dxpl_id);
#endif /* H5_NO_DEPRECATED_SYMBOLS */
@@ -448,167 +397,141 @@ H5_DLL H5G_obj_t H5G_stab_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx,
/*
* Functions that understand symbol table entries.
*/
-H5_DLL herr_t H5G_ent_copy(H5G_entry_t *dst, const H5G_entry_t *src,
+H5_DLL void H5G__ent_copy(H5G_entry_t *dst, const H5G_entry_t *src,
H5_copy_depth_t depth);
-H5_DLL herr_t H5G_ent_reset(H5G_entry_t *ent);
-H5_DLL herr_t H5G_ent_decode_vec(const H5F_t *f, const uint8_t **pp,
+H5_DLL void H5G__ent_reset(H5G_entry_t *ent);
+H5_DLL herr_t H5G__ent_decode_vec(const H5F_t *f, const uint8_t **pp,
H5G_entry_t *ent, unsigned n);
-H5_DLL herr_t H5G_ent_encode_vec(const H5F_t *f, uint8_t **pp,
+H5_DLL herr_t H5G__ent_encode_vec(const H5F_t *f, uint8_t **pp,
const H5G_entry_t *ent, unsigned n);
-H5_DLL herr_t H5G_ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap,
+H5_DLL herr_t H5G__ent_convert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap,
const char *name, const H5O_link_t *lnk, H5O_type_t obj_type,
const void *crt_info, H5G_entry_t *ent);
-H5_DLL herr_t H5G_ent_debug(const H5G_entry_t *ent, FILE * stream, int indent,
+H5_DLL herr_t H5G__ent_debug(const H5G_entry_t *ent, FILE * stream, int indent,
int fwidth, const H5HL_t *heap);
/* Functions that understand symbol table nodes */
-H5_DLL herr_t H5G_node_init(H5F_t *f);
-H5_DLL int H5G_node_iterate(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
+H5_DLL herr_t H5G__node_init(H5F_t *f);
+H5_DLL int H5G__node_iterate(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
const void *_rt_key, void *_udata);
-H5_DLL int H5G_node_sumup(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
+H5_DLL int H5G__node_sumup(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
const void *_rt_key, void *_udata);
-H5_DLL int H5G_node_by_idx(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
+H5_DLL int H5G__node_by_idx(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
const void *_rt_key, void *_udata);
-H5_DLL int H5G_node_copy(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
+H5_DLL int H5G__node_copy(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
const void *_rt_key, void *_udata);
-H5_DLL int H5G_node_build_table(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
+H5_DLL int H5G__node_build_table(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
const void *_rt_key, void *_udata);
-H5_DLL herr_t H5G_node_iterate_size(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
+H5_DLL herr_t H5G__node_iterate_size(H5F_t *f, hid_t dxpl_id, const void *_lt_key, haddr_t addr,
const void *_rt_key, void *_udata);
-H5_DLL herr_t H5G_node_free(H5G_node_t *sym);
+H5_DLL herr_t H5G__node_free(H5G_node_t *sym);
/* Functions that understand links in groups */
-H5_DLL int H5G_link_cmp_name_inc(const void *lnk1, const void *lnk2);
-H5_DLL int H5G_link_cmp_name_dec(const void *lnk1, const void *lnk2);
-H5_DLL int H5G_link_cmp_corder_inc(const void *lnk1, const void *lnk2);
-H5_DLL int H5G_link_cmp_corder_dec(const void *lnk1, const void *lnk2);
-H5_DLL herr_t H5G_ent_to_link(H5O_link_t *lnk, const H5HL_t *heap,
+H5_DLL herr_t H5G__ent_to_link(H5O_link_t *lnk, const H5HL_t *heap,
const H5G_entry_t *ent, const char *name);
-H5_DLL herr_t H5G_link_to_info(const H5O_link_t *lnk, H5L_info_t *linfo);
-H5_DLL herr_t H5G_link_to_loc(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
+H5_DLL herr_t H5G__link_to_loc(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
H5G_loc_t *obj_loc);
-H5_DLL herr_t H5G_link_copy_file(H5F_t *dst_file, hid_t dxpl_id,
- const H5O_link_t *_src_lnk, const H5O_loc_t *src_oloc, H5O_link_t *dst_lnk,
- H5O_copy_t *cpy_info);
-H5_DLL herr_t H5G_link_sort_table(H5G_link_table_t *ltable, H5_index_t idx_type,
+H5_DLL herr_t H5G__link_sort_table(H5G_link_table_t *ltable, H5_index_t idx_type,
H5_iter_order_t order);
-H5_DLL herr_t H5G_link_iterate_table(const H5G_link_table_t *ltable,
+H5_DLL herr_t H5G__link_iterate_table(const H5G_link_table_t *ltable,
hsize_t skip, hsize_t *last_lnk, const H5G_lib_iterate_t op, void *op_data);
-H5_DLL herr_t H5G_link_release_table(H5G_link_table_t *ltable);
-H5_DLL herr_t H5G_link_name_replace(H5F_t *file, hid_t dxpl_id,
+H5_DLL herr_t H5G__link_release_table(H5G_link_table_t *ltable);
+H5_DLL herr_t H5G__link_name_replace(H5F_t *file, hid_t dxpl_id,
H5RS_str_t *grp_full_path_r, const H5O_link_t *lnk);
/* Functions that understand "compact" link storage */
-H5_DLL herr_t H5G_compact_insert(const H5O_loc_t *grp_oloc, H5O_link_t *obj_lnk,
+H5_DLL herr_t H5G__compact_insert(const H5O_loc_t *grp_oloc, H5O_link_t *obj_lnk,
hid_t dxpl_id);
-H5_DLL ssize_t H5G_compact_get_name_by_idx(H5O_loc_t *oloc, hid_t dxpl_id,
+H5_DLL ssize_t H5G__compact_get_name_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
const H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order,
hsize_t idx, char *name, size_t size);
-H5_DLL herr_t H5G_compact_remove(const H5O_loc_t *oloc, hid_t dxpl_id,
+H5_DLL herr_t H5G__compact_remove(const H5O_loc_t *oloc, hid_t dxpl_id,
H5RS_str_t *grp_full_path_r, const char *name);
-H5_DLL herr_t H5G_compact_remove_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
+H5_DLL herr_t H5G__compact_remove_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
const H5O_linfo_t *linfo, H5RS_str_t *grp_full_path_r, H5_index_t idx_type,
H5_iter_order_t order, hsize_t n);
-H5_DLL herr_t H5G_compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id,
+H5_DLL herr_t H5G__compact_iterate(const H5O_loc_t *oloc, hid_t dxpl_id,
const H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order,
hsize_t skip, hsize_t *last_lnk, H5G_lib_iterate_t op, void *op_data);
-H5_DLL htri_t H5G_compact_lookup(H5O_loc_t *grp_oloc, const char *name,
+H5_DLL htri_t H5G__compact_lookup(const H5O_loc_t *grp_oloc, const char *name,
H5O_link_t *lnk, hid_t dxpl_id);
-H5_DLL herr_t H5G_compact_lookup_by_idx(H5O_loc_t *oloc, hid_t dxpl_id,
+H5_DLL herr_t H5G__compact_lookup_by_idx(const H5O_loc_t *oloc, hid_t dxpl_id,
const H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order,
hsize_t n, H5O_link_t *lnk);
#ifndef H5_NO_DEPRECATED_SYMBOLS
-H5_DLL H5G_obj_t H5G_compact_get_type_by_idx(H5O_loc_t *oloc, hid_t dxpl_id,
+H5_DLL H5G_obj_t H5G__compact_get_type_by_idx(H5O_loc_t *oloc, hid_t dxpl_id,
const H5O_linfo_t *linfo, hsize_t idx);
#endif /* H5_NO_DEPRECATED_SYMBOLS */
/* Functions that understand "dense" link storage */
-H5_DLL herr_t H5G_dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
+H5_DLL herr_t H5G__dense_build_table(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
H5_index_t idx_type, H5_iter_order_t order, H5G_link_table_t *ltable);
-H5_DLL herr_t H5G_dense_create(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
+H5_DLL herr_t H5G__dense_create(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
const H5O_pline_t *pline);
-H5_DLL herr_t H5G_dense_insert(H5F_t *f, hid_t dxpl_id,
+H5_DLL herr_t H5G__dense_insert(H5F_t *f, hid_t dxpl_id,
const H5O_linfo_t *linfo, const H5O_link_t *lnk);
-H5_DLL htri_t H5G_dense_lookup(H5F_t *f, hid_t dxpl_id,
+H5_DLL htri_t H5G__dense_lookup(H5F_t *f, hid_t dxpl_id,
const H5O_linfo_t *linfo, const char *name, H5O_link_t *lnk);
-H5_DLL herr_t H5G_dense_lookup_by_idx(H5F_t *f, hid_t dxpl_id,
+H5_DLL herr_t H5G__dense_lookup_by_idx(H5F_t *f, hid_t dxpl_id,
const H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order,
hsize_t n, H5O_link_t *lnk);
-H5_DLL herr_t H5G_dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
+H5_DLL herr_t H5G__dense_iterate(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
H5G_lib_iterate_t op, void *op_data);
-H5_DLL ssize_t H5G_dense_get_name_by_idx(H5F_t *f, hid_t dxpl_id,
+H5_DLL ssize_t H5G__dense_get_name_by_idx(H5F_t *f, hid_t dxpl_id,
H5O_linfo_t *linfo, H5_index_t idx_type, H5_iter_order_t order, hsize_t n,
char *name, size_t size);
-H5_DLL herr_t H5G_dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
+H5_DLL herr_t H5G__dense_remove(H5F_t *f, hid_t dxpl_id, const H5O_linfo_t *linfo,
H5RS_str_t *grp_full_path_r, const char *name);
-H5_DLL herr_t H5G_dense_remove_by_idx(H5F_t *f, hid_t dxpl_id,
+H5_DLL herr_t H5G__dense_remove_by_idx(H5F_t *f, hid_t dxpl_id,
const H5O_linfo_t *linfo, H5RS_str_t *grp_full_path_r, H5_index_t idx_type,
H5_iter_order_t order, hsize_t n);
-H5_DLL herr_t H5G_dense_delete(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
+H5_DLL herr_t H5G__dense_delete(H5F_t *f, hid_t dxpl_id, H5O_linfo_t *linfo,
hbool_t adj_link);
#ifndef H5_NO_DEPRECATED_SYMBOLS
-H5_DLL H5G_obj_t H5G_dense_get_type_by_idx(H5F_t *f, hid_t dxpl_id,
+H5_DLL H5G_obj_t H5G__dense_get_type_by_idx(H5F_t *f, hid_t dxpl_id,
H5O_linfo_t *linfo, hsize_t idx);
#endif /* H5_NO_DEPRECATED_SYMBOLS */
/* Functions that understand group objects */
-H5_DLL herr_t H5G_obj_create(H5F_t *f, hid_t dxpl_id,
+H5_DLL herr_t H5G__obj_create(H5F_t *f, hid_t dxpl_id,
H5G_obj_create_t *gcrt_info, H5O_loc_t *oloc/*out*/);
-H5_DLL herr_t H5G_obj_create_real(H5F_t *f, hid_t dxpl_id,
+H5_DLL herr_t H5G__obj_create_real(H5F_t *f, hid_t dxpl_id,
const H5O_ginfo_t *ginfo, const H5O_linfo_t *linfo,
const H5O_pline_t *pline, H5G_obj_create_t *gcrt_info,
H5O_loc_t *oloc/*out*/);
-H5_DLL htri_t H5G_obj_get_linfo(const H5O_loc_t *grp_oloc, H5O_linfo_t *linfo,
+H5_DLL htri_t H5G__obj_get_linfo(const H5O_loc_t *grp_oloc, H5O_linfo_t *linfo,
hid_t dxpl_id);
-H5_DLL herr_t H5G_obj_insert(const H5O_loc_t *grp_oloc, const char *name,
- H5O_link_t *obj_lnk, hbool_t adj_link, H5O_type_t obj_type,
- const void *crt_info, hid_t dxpl_id);
-H5_DLL herr_t H5G_obj_iterate(const H5O_loc_t *grp_oloc,
+H5_DLL herr_t H5G__obj_iterate(const H5O_loc_t *grp_oloc,
H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
H5G_lib_iterate_t op, void *op_data, hid_t dxpl_id);
-H5_DLL herr_t H5G_obj_info(H5O_loc_t *oloc, H5G_info_t *grp_info, hid_t dxpl_id);
-H5_DLL ssize_t H5G_obj_get_name_by_idx(H5O_loc_t *oloc, H5_index_t idx_type,
- H5_iter_order_t order, hsize_t n, char* name, size_t size, hid_t dxpl_id);
-H5_DLL herr_t H5G_obj_remove(H5O_loc_t *oloc, H5RS_str_t *grp_full_path_r,
- const char *name, hid_t dxpl_id);
-H5_DLL herr_t H5G_obj_remove_by_idx(H5O_loc_t *grp_oloc, H5RS_str_t *grp_full_path_r,
- H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t dxpl_id);
-H5_DLL htri_t H5G_obj_lookup(H5O_loc_t *grp_oloc, const char *name,
+H5_DLL herr_t H5G__obj_info(H5O_loc_t *oloc, H5G_info_t *grp_info, hid_t dxpl_id);
+H5_DLL htri_t H5G__obj_lookup(const H5O_loc_t *grp_oloc, const char *name,
H5O_link_t *lnk, hid_t dxpl_id);
-H5_DLL herr_t H5G_obj_lookup_by_idx(H5O_loc_t *grp_oloc, H5_index_t idx_type,
- H5_iter_order_t order, hsize_t n, H5O_link_t *lnk, hid_t dxpl_id);
/*
* These functions operate on group hierarchy names.
*/
-H5_DLL herr_t H5G_name_init(H5G_name_t *name, const char *path);
-H5_DLL herr_t H5G_name_set(H5G_name_t *loc, H5G_name_t *obj, const char *name);
-H5_DLL H5RS_str_t *H5G_build_fullpath_refstr_str(H5RS_str_t *path_r, const char *name);
+H5_DLL herr_t H5G__name_init(H5G_name_t *name, const char *path);
/*
* These functions operate on group "locations"
*/
-H5_DLL herr_t H5G_loc_copy(H5G_loc_t *dst, const H5G_loc_t *src, H5_copy_depth_t depth);
-H5_DLL herr_t H5G_loc_insert(H5G_loc_t *grp_loc, const char *name,
+H5_DLL herr_t H5G__loc_copy(H5G_loc_t *dst, const H5G_loc_t *src, H5_copy_depth_t depth);
+H5_DLL herr_t H5G__loc_insert(H5G_loc_t *grp_loc, const char *name,
H5G_loc_t *obj_loc, H5O_type_t obj_type, const void *crt_info, hid_t dxpl_id);
-/*
- * These functions operate on the root group
- */
-H5_DLL herr_t H5G_root_loc(H5F_t *f, H5G_loc_t *loc);
-
/* Testing functions */
#ifdef H5G_TESTING
-H5_DLL htri_t H5G_is_empty_test(hid_t gid);
-H5_DLL htri_t H5G_has_links_test(hid_t gid, unsigned *nmsgs);
-H5_DLL htri_t H5G_has_stab_test(hid_t gid);
-H5_DLL htri_t H5G_is_new_dense_test(hid_t gid);
-H5_DLL herr_t H5G_new_dense_info_test(hid_t gid, hsize_t *name_count, hsize_t *corder_count);
-H5_DLL herr_t H5G_lheap_size_test(hid_t gid, size_t *lheap_size);
-H5_DLL herr_t H5G_user_path_test(hid_t obj_id, char *user_path, size_t *user_path_len, unsigned *user_path_hidden);
-H5_DLL herr_t H5G_verify_cached_stab_test(H5O_loc_t *grp_oloc, H5G_entry_t *ent);
-H5_DLL herr_t H5G_verify_cached_stabs_test(hid_t gid);
+H5_DLL htri_t H5G__is_empty_test(hid_t gid);
+H5_DLL htri_t H5G__has_links_test(hid_t gid, unsigned *nmsgs);
+H5_DLL htri_t H5G__has_stab_test(hid_t gid);
+H5_DLL htri_t H5G__is_new_dense_test(hid_t gid);
+H5_DLL herr_t H5G__new_dense_info_test(hid_t gid, hsize_t *name_count, hsize_t *corder_count);
+H5_DLL herr_t H5G__lheap_size_test(hid_t gid, size_t *lheap_size);
+H5_DLL herr_t H5G__user_path_test(hid_t obj_id, char *user_path, size_t *user_path_len, unsigned *user_path_hidden);
+H5_DLL herr_t H5G__verify_cached_stab_test(H5O_loc_t *grp_oloc, H5G_entry_t *ent);
+H5_DLL herr_t H5G__verify_cached_stabs_test(hid_t gid);
#endif /* H5G_TESTING */
#endif /* _H5Gpkg_H */
diff --git a/src/H5Gprivate.h b/src/H5Gprivate.h
index 140e22f..f765b52 100644
--- a/src/H5Gprivate.h
+++ b/src/H5Gprivate.h
@@ -105,6 +105,18 @@
#define H5G_MOUNTED(G) (H5G_mounted(G))
#endif /* H5G_PACKAGE */
+/*
+ * During name lookups (see H5G_traverse()) we sometimes want information about
+ * a symbolic link or a mount point. The normal operation is to follow the
+ * symbolic link or mount point and return information about its target.
+ */
+#define H5G_TARGET_NORMAL 0x0000
+#define H5G_TARGET_SLINK 0x0001
+#define H5G_TARGET_MOUNT 0x0002
+#define H5G_TARGET_UDLINK 0x0004
+#define H5G_TARGET_EXISTS 0x0008
+#define H5G_CRT_INTMD_GROUP 0x0010
+
/* Type of operation being performed for call to H5G_name_replace() */
typedef enum {
H5G_NAME_MOVE = 0, /* H5*move call */
@@ -141,6 +153,38 @@ typedef struct {
H5G_name_t *path; /* Group hierarchy path */
} H5G_loc_t;
+/* Typedef for path traversal operations */
+/* grp_loc is the location of the group in which the targeted object is located.
+ * name is the last component of the object's name
+ * lnk is the link between the group and the object
+ * obj_loc is the target of the traversal (or NULL if the object doesn't exist)
+ * operator_data is whatever udata was supplied when H5G_traverse was called
+ * own_loc should be set to H5G_OWN_OBJ_LOC if this callback takes ownership of obj_loc,
+ * H5G_OWN_GRP_LOC if it takes ownership of grp_loc, and H5G_OWN_NONE if obj_loc and
+ * grp_loc need to be deleted.
+ */
+typedef herr_t (*H5G_traverse_t)(H5G_loc_t *grp_loc/*in*/, const char *name,
+ const struct H5O_link_t *lnk/*in*/, H5G_loc_t *obj_loc/*out*/, void *operator_data/*in,out*/,
+ H5G_own_loc_t *own_loc/*out*/);
+
+/* Describe kind of callback to make for each link */
+typedef enum H5G_link_iterate_op_type_t {
+#ifndef H5_NO_DEPRECATED_SYMBOLS
+ H5G_LINK_OP_OLD, /* "Old" application callback */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
+ H5G_LINK_OP_NEW /* "New" application callback */
+} H5G_link_iterate_op_type_t;
+
+typedef struct {
+ H5G_link_iterate_op_type_t op_type;
+ union {
+#ifndef H5_NO_DEPRECATED_SYMBOLS
+ H5G_iterate_t op_old; /* "Old" application callback for each link */
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
+ H5L_iterate_t op_new; /* "New" application callback for each link */
+ } op_func;
+} H5G_link_iterate_t;
+
typedef struct H5G_t H5G_t;
typedef struct H5G_shared_t H5G_shared_t;
typedef struct H5G_entry_t H5G_entry_t;
@@ -150,9 +194,6 @@ typedef struct H5G_entry_t H5G_entry_t;
* call.
*/
H5_DLL struct H5O_loc_t *H5G_oloc(H5G_t *grp);
-H5_DLL herr_t H5G_mkroot(H5F_t *f, hid_t dxpl_id, hbool_t create_root);
-H5_DLL herr_t H5G_root_free(H5G_t *grp);
-H5_DLL H5G_t *H5G_rootof(H5F_t *f);
H5_DLL H5G_name_t * H5G_nameof(H5G_t *grp);
H5_DLL H5F_t *H5G_fileof(H5G_t *grp);
H5_DLL H5G_t *H5G_open(const H5G_loc_t *loc, hid_t dxpl_id);
@@ -164,10 +205,45 @@ H5_DLL herr_t H5G_unmount(H5G_t *grp);
#ifndef H5_NO_DEPRECATED_SYMBOLS
H5_DLL H5G_obj_t H5G_map_obj_type(H5O_type_t obj_type);
#endif /* H5_NO_DEPRECATED_SYMBOLS */
+
+/*
+ * Utility functions
+ */
+H5_DLL char *H5G_normalize(const char *name);
+
+/*
+ * Group hierarchy traversal routines
+ */
+H5_DLL herr_t H5G_traverse(const H5G_loc_t *loc, const char *name,
+ unsigned target, H5G_traverse_t op, void *op_data, hid_t lapl_id,
+ hid_t dxpl_id);
+H5_DLL herr_t H5G_iterate(hid_t loc_id, const char *group_name,
+ H5_index_t idx_type, H5_iter_order_t order, hsize_t skip, hsize_t *last_lnk,
+ const H5G_link_iterate_t *lnk_op, void *op_data, hid_t lapl_id, hid_t dxpl_id);
H5_DLL herr_t H5G_visit(hid_t loc_id, const char *group_name,
H5_index_t idx_type, H5_iter_order_t order, H5L_iterate_t op, void *op_data,
hid_t lapl_id, hid_t dxpl_id);
+/*
+ * Functions that understand links in groups
+ */
+H5_DLL herr_t H5G_link_to_info(const struct H5O_link_t *lnk, H5L_info_t *linfo);
+
+/*
+ * Functions that understand group objects
+ */
+H5_DLL herr_t H5G_obj_insert(const struct H5O_loc_t *grp_oloc, const char *name,
+ struct H5O_link_t *obj_lnk, hbool_t adj_link, H5O_type_t obj_type,
+ const void *crt_info, hid_t dxpl_id);
+H5_DLL ssize_t H5G_obj_get_name_by_idx(const struct H5O_loc_t *oloc, H5_index_t idx_type,
+ H5_iter_order_t order, hsize_t n, char* name, size_t size, hid_t dxpl_id);
+H5_DLL herr_t H5G_obj_remove(const struct H5O_loc_t *oloc, H5RS_str_t *grp_full_path_r,
+ const char *name, hid_t dxpl_id);
+H5_DLL herr_t H5G_obj_remove_by_idx(const struct H5O_loc_t *grp_oloc, H5RS_str_t *grp_full_path_r,
+ H5_index_t idx_type, H5_iter_order_t order, hsize_t n, hid_t dxpl_id);
+H5_DLL herr_t H5G_obj_lookup_by_idx(const struct H5O_loc_t *grp_oloc, H5_index_t idx_type,
+ H5_iter_order_t order, hsize_t n, struct H5O_link_t *lnk, hid_t dxpl_id);
+
/*
* These functions operate on symbol table nodes.
*/
@@ -184,6 +260,7 @@ H5_DLL herr_t H5G_ent_decode(const H5F_t *f, const uint8_t **pp, H5G_entry_t *en
/*
* These functions operate on group hierarchy names.
*/
+H5_DLL herr_t H5G_name_set(const H5G_name_t *loc, H5G_name_t *obj, const char *name);
H5_DLL herr_t H5G_name_replace(const struct H5O_link_t *lnk, H5G_names_op_t op,
H5F_t *src_file, H5RS_str_t *src_full_path_r, H5F_t *dst_file,
H5RS_str_t *dst_full_path_r, hid_t dxpl_id);
@@ -194,6 +271,7 @@ H5_DLL ssize_t H5G_get_name(const H5G_loc_t *loc, char *name/*out*/, size_t size
hbool_t *cached, hid_t lapl_id, hid_t dxpl_id);
H5_DLL ssize_t H5G_get_name_by_addr(hid_t fid, hid_t lapl_id, hid_t dxpl_id,
const struct H5O_loc_t *loc, char* name, size_t size);
+H5_DLL H5RS_str_t *H5G_build_fullpath_refstr_str(H5RS_str_t *path_r, const char *name);
/*
* These functions operate on group "locations"
@@ -216,5 +294,13 @@ H5_DLL ssize_t H5G_loc_get_comment(H5G_loc_t *loc, const char *name,
H5_DLL herr_t H5G_loc_reset(H5G_loc_t *loc);
H5_DLL herr_t H5G_loc_free(H5G_loc_t *loc);
+/*
+ * These functions operate on the root group
+ */
+H5_DLL herr_t H5G_mkroot(H5F_t *f, hid_t dxpl_id, hbool_t create_root);
+H5_DLL herr_t H5G_root_loc(H5F_t *f, H5G_loc_t *loc);
+H5_DLL herr_t H5G_root_free(H5G_t *grp);
+H5_DLL H5G_t *H5G_rootof(H5F_t *f);
+
#endif /* _H5Gprivate_H */
diff --git a/src/H5Groot.c b/src/H5Groot.c
index 9a567e1..5ec9d3a 100644
--- a/src/H5Groot.c
+++ b/src/H5Groot.c
@@ -101,7 +101,7 @@
H5G_t *
H5G_rootof(H5F_t *f)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_rootof)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@@ -154,7 +154,7 @@ H5G_mkroot(H5F_t *f, hid_t dxpl_id, hbool_t create_root)
hbool_t path_init = FALSE; /* Whether path was initialized */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_mkroot, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -166,7 +166,7 @@ H5G_mkroot(H5F_t *f, hid_t dxpl_id, hbool_t create_root)
HGOTO_DONE(SUCCEED)
/* Create information needed for group nodes */
- if(H5G_node_init(f) < 0)
+ if(H5G__node_init(f) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group node info")
/*
@@ -194,7 +194,7 @@ H5G_mkroot(H5F_t *f, hid_t dxpl_id, hbool_t create_root)
/* (Pass the FCPL which is a sub-class of the group creation property class) */
gcrt_info.gcpl_id = f->shared->fcpl_id;
gcrt_info.cache_type = H5G_NOTHING_CACHED;
- if(H5G_obj_create(f, dxpl_id, &gcrt_info, root_loc.oloc/*out*/) < 0)
+ if(H5G__obj_create(f, dxpl_id, &gcrt_info, root_loc.oloc/*out*/) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group entry")
if(1 != H5O_link(root_loc.oloc, 1, dxpl_id))
HGOTO_ERROR(H5E_SYM, H5E_LINKCOUNT, FAIL, "internal error (wrong link count)")
@@ -255,7 +255,7 @@ H5G_mkroot(H5F_t *f, hid_t dxpl_id, hbool_t create_root)
/* Check if the symbol table message is valid, and replace with the
* cached symbol table if necessary */
- if(H5G_stab_valid(root_loc.oloc, dxpl_id, &cached_stab) < 0)
+ if(H5G__stab_valid(root_loc.oloc, dxpl_id, &cached_stab) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to verify symbol table")
} /* end if */
#endif /* H5_STRICT_FORMAT_CHECKS */
@@ -293,7 +293,7 @@ H5G_mkroot(H5F_t *f, hid_t dxpl_id, hbool_t create_root)
} /* end if */
/* Create the path names for the root group's entry */
- H5G_name_init(root_loc.path, "/");
+ H5G__name_init(root_loc.path, "/");
path_init = TRUE;
f->shared->root_grp->shared->fo_count = 1;
@@ -347,7 +347,7 @@ done:
herr_t
H5G_root_free(H5G_t *grp)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5G_root_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(grp && grp->shared);
@@ -383,7 +383,7 @@ H5G_root_loc(H5F_t *f, H5G_loc_t *loc)
H5G_t *root_grp; /* Pointer to root group's info */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_root_loc, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(loc);
diff --git a/src/H5Gstab.c b/src/H5Gstab.c
index 81c2d6a..446d940 100644
--- a/src/H5Gstab.c
+++ b/src/H5Gstab.c
@@ -117,7 +117,7 @@ typedef struct H5G_bt_it_lbi_t {
/*-------------------------------------------------------------------------
- * Function: H5G_stab_create_components
+ * Function: H5G__stab_create_components
*
* Purpose: Creates the components for a new, empty, symbol table (name heap
* and B-tree). The caller can specify an initial size for the
@@ -136,13 +136,13 @@ typedef struct H5G_bt_it_lbi_t {
*-------------------------------------------------------------------------
*/
herr_t
-H5G_stab_create_components(H5F_t *f, H5O_stab_t *stab, size_t size_hint, hid_t dxpl_id)
+H5G__stab_create_components(H5F_t *f, H5O_stab_t *stab, size_t size_hint, hid_t dxpl_id)
{
H5HL_t *heap = NULL; /* Pointer to local heap */
size_t name_offset; /* Offset of "" name */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_stab_create_components, FAIL)
+ FUNC_ENTER_PACKAGE
/*
* Check arguments.
@@ -179,11 +179,11 @@ done:
HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_stab_create_components() */
+} /* end H5G__stab_create_components() */
/*-------------------------------------------------------------------------
- * Function: H5G_stab_create
+ * Function: H5G__stab_create
*
* Purpose: Creates a new empty symbol table (object header, name heap,
* and B-tree). The caller can specify an initial size for the
@@ -203,14 +203,14 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_stab_create(H5O_loc_t *grp_oloc, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
+H5G__stab_create(H5O_loc_t *grp_oloc, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
H5O_stab_t *stab)
{
size_t heap_hint; /* Local heap size hint */
size_t size_hint; /* Local heap size hint */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_stab_create, FAIL)
+ FUNC_ENTER_PACKAGE
/*
* Check arguments.
@@ -228,7 +228,7 @@ H5G_stab_create(H5O_loc_t *grp_oloc, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
size_hint = MAX(heap_hint, H5HL_SIZEOF_FREE(grp_oloc->file) + 2);
/* Go create the B-tree & local heap */
- if(H5G_stab_create_components(grp_oloc->file, stab, size_hint, dxpl_id) < 0)
+ if(H5G__stab_create_components(grp_oloc->file, stab, size_hint, dxpl_id) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "can't create symbol table components")
/*
@@ -240,11 +240,11 @@ H5G_stab_create(H5O_loc_t *grp_oloc, hid_t dxpl_id, const H5O_ginfo_t *ginfo,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_stab_create() */
+} /* end H5G__stab_create() */
/*-------------------------------------------------------------------------
- * Function: H5G_stab_insert_real
+ * Function: H5G__stab_insert_real
*
* Purpose: Insert a new symbol into a table.
* The name of the new symbol is NAME and its symbol
@@ -259,7 +259,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_stab_insert_real(H5F_t *f, const H5O_stab_t *stab, const char *name,
+H5G__stab_insert_real(H5F_t *f, const H5O_stab_t *stab, const char *name,
H5O_link_t *obj_lnk, H5O_type_t obj_type, const void *crt_info,
hid_t dxpl_id)
{
@@ -267,7 +267,7 @@ H5G_stab_insert_real(H5F_t *f, const H5O_stab_t *stab, const char *name,
H5G_bt_ins_t udata; /* Data to pass through B-tree */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_stab_insert_real, FAIL)
+ FUNC_ENTER_PACKAGE
/* check arguments */
HDassert(f);
@@ -296,11 +296,11 @@ done:
HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_stab_insert_real() */
+} /* end H5G__stab_insert_real() */
/*-------------------------------------------------------------------------
- * Function: H5G_stab_insert
+ * Function: H5G__stab_insert
*
* Purpose: Insert a new symbol into the table described by GRP_ENT in
* file F. The name of the new symbol is NAME and its symbol
@@ -315,14 +315,14 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_stab_insert(const H5O_loc_t *grp_oloc, const char *name,
+H5G__stab_insert(const H5O_loc_t *grp_oloc, const char *name,
H5O_link_t *obj_lnk, H5O_type_t obj_type, const void *crt_info,
hid_t dxpl_id)
{
H5O_stab_t stab; /* Symbol table message */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_stab_insert, FAIL)
+ FUNC_ENTER_PACKAGE
/* check arguments */
HDassert(grp_oloc && grp_oloc->file);
@@ -333,17 +333,17 @@ H5G_stab_insert(const H5O_loc_t *grp_oloc, const char *name,
if(NULL == H5O_msg_read(grp_oloc, H5O_STAB_ID, &stab, dxpl_id))
HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "not a symbol table")
- if(H5G_stab_insert_real(grp_oloc->file, &stab, name, obj_lnk, obj_type,
+ if(H5G__stab_insert_real(grp_oloc->file, &stab, name, obj_lnk, obj_type,
crt_info, dxpl_id) < 0)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, H5_ITER_ERROR, "unable to insert the name")
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_stab_insert() */
+} /* end H5G__stab_insert() */
/*-------------------------------------------------------------------------
- * Function: H5G_stab_remove
+ * Function: H5G__stab_remove
*
* Purpose: Remove NAME from a symbol table.
*
@@ -355,7 +355,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_stab_remove(H5O_loc_t *loc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
+H5G__stab_remove(const H5O_loc_t *loc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
const char *name)
{
H5HL_t *heap = NULL; /* Pointer to local heap */
@@ -363,7 +363,7 @@ H5G_stab_remove(H5O_loc_t *loc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
H5G_bt_rm_t udata; /*data to pass through B-tree */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_stab_remove, FAIL)
+ FUNC_ENTER_PACKAGE
HDassert(loc && loc->file);
HDassert(name && *name);
@@ -391,11 +391,11 @@ done:
HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_stab_remove() */
+} /* end H5G__stab_remove() */
/*-------------------------------------------------------------------------
- * Function: H5G_stab_remove_by_idx
+ * Function: H5G__stab_remove_by_idx
*
* Purpose: Remove NAME from a symbol table, according to the name index.
*
@@ -407,7 +407,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_stab_remove_by_idx(H5O_loc_t *grp_oloc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
+H5G__stab_remove_by_idx(const H5O_loc_t *grp_oloc, hid_t dxpl_id, H5RS_str_t *grp_full_path_r,
H5_iter_order_t order, hsize_t n)
{
H5HL_t *heap = NULL; /* Pointer to local heap */
@@ -417,12 +417,12 @@ H5G_stab_remove_by_idx(H5O_loc_t *grp_oloc, hid_t dxpl_id, H5RS_str_t *grp_full_
hbool_t lnk_copied = FALSE; /* Whether the link was copied */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_stab_remove_by_idx, FAIL)
+ FUNC_ENTER_PACKAGE
HDassert(grp_oloc && grp_oloc->file);
/* Look up name of link to remove, by index */
- if(H5G_stab_lookup_by_idx(grp_oloc, order, n, &obj_lnk, dxpl_id) < 0)
+ if(H5G__stab_lookup_by_idx(grp_oloc, order, n, &obj_lnk, dxpl_id) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "can't get link information")
lnk_copied = TRUE;
@@ -453,11 +453,11 @@ done:
H5O_msg_reset(H5O_LINK_ID, &obj_lnk);
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_stab_remove_by_idx() */
+} /* end H5G__stab_remove_by_idx() */
/*-------------------------------------------------------------------------
- * Function: H5G_stab_delete
+ * Function: H5G__stab_delete
*
* Purpose: Delete entire symbol table information from file
*
@@ -471,13 +471,13 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_stab_delete(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab)
+H5G__stab_delete(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab)
{
H5HL_t *heap = NULL; /* Pointer to local heap */
H5G_bt_rm_t udata; /*data to pass through B-tree */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_stab_delete, FAIL)
+ FUNC_ENTER_PACKAGE
HDassert(f);
HDassert(stab);
@@ -511,11 +511,11 @@ done:
HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_stab_delete() */
+} /* end H5G__stab_delete() */
/*-------------------------------------------------------------------------
- * Function: H5G_stab_iterate
+ * Function: H5G__stab_iterate
*
* Purpose: Iterate over the objects in a group
*
@@ -527,7 +527,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
+H5G__stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
hsize_t skip, hsize_t *last_lnk, H5G_lib_iterate_t op, void *op_data)
{
H5HL_t *heap = NULL; /* Local heap for group */
@@ -535,7 +535,7 @@ H5G_stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
H5G_link_table_t ltable = {0, NULL}; /* Link table */
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5G_stab_iterate, FAIL)
+ FUNC_ENTER_PACKAGE
/* Sanity check */
HDassert(oloc);
@@ -554,7 +554,7 @@ H5G_stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
if(order != H5_ITER_DEC) {
H5G_bt_it_it_t udata; /* User data to pass to B-tree callback */
- /* Build udata to pass through H5B_iterate() to H5G_node_iterate() */
+ /* Build udata to pass through H5B_iterate() to H5G__node_iterate() */
udata.heap = heap;
udata.skip = skip;
udata.final_ent = last_lnk;
@@ -562,7 +562,7 @@ H5G_stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
udata.op_data = op_data;
/* Iterate over the group members */
- if((ret_value = H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G_node_iterate, &udata)) < 0)
+ if((ret_value = H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_iterate, &udata)) < 0)
HERROR(H5E_SYM, H5E_CANTNEXT, "iteration operator failed");
/* Check for too high of a starting index (ex post facto :-) */
@@ -573,13 +573,13 @@ H5G_stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
else {
H5G_bt_it_bt_t udata; /* User data to pass to B-tree callback */
- /* Build udata to pass through H5B_iterate() to H5G_node_build_table() */
+ /* Build udata to pass through H5B_iterate() to H5G__node_build_table() */
udata.alloc_nlinks = 0;
udata.heap = heap;
udata.ltable = &ltable;
/* Iterate over the group members */
- if(H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G_node_build_table, &udata) < 0)
+ if(H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_build_table, &udata) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to build link table")
/* Check for skipping out of bounds */
@@ -587,11 +587,11 @@ H5G_stab_iterate(const H5O_loc_t *oloc, hid_t dxpl_id, H5_iter_order_t order,
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "index out of bound")
/* Sort link table in correct iteration order */
- if(H5G_link_sort_table(&ltable, H5_INDEX_NAME, order) < 0)
+ if(H5G__link_sort_table(&ltable, H5_INDEX_NAME, order) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTSORT, FAIL, "error sorting link messages")
/* Iterate over links in table */
- if((ret_value = H5G_link_iterate_table(&ltable, skip, last_lnk, op, op_data)) < 0)
+ if((ret_value = H5G__link_iterate_table(&ltable, skip, last_lnk, op, op_data)) < 0)
HERROR(H5E_SYM, H5E_CANTNEXT, "iteration operator failed");
} /* end else */
@@ -599,15 +599,15 @@ done:
/* Release resources */
if(heap && H5HL_unprotect(heap) < 0)
HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
- if(ltable.lnks && H5G_link_release_table(&ltable) < 0)
+ if(ltable.lnks && H5G__link_release_table(&ltable) < 0)
HDONE_ERROR(H5E_SYM, H5E_CANTFREE, FAIL, "unable to release link table")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_stab_iterate() */
+} /* end H5G__stab_iterate() */
/*-------------------------------------------------------------------------
- * Function: H5G_stab_count
+ * Function: H5G__stab_count
*
* Purpose: Count the # of links in a group
*
@@ -619,12 +619,12 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_stab_count(H5O_loc_t *oloc, hsize_t *num_objs, hid_t dxpl_id)
+H5G__stab_count(H5O_loc_t *oloc, hsize_t *num_objs, hid_t dxpl_id)
{
H5O_stab_t stab; /* Info about symbol table */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5G_stab_count, FAIL)
+ FUNC_ENTER_PACKAGE
/* Sanity check */
HDassert(oloc);
@@ -638,16 +638,16 @@ H5G_stab_count(H5O_loc_t *oloc, hsize_t *num_objs, hid_t dxpl_id)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to determine local heap address")
/* Iterate over the group members */
- if(H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G_node_sumup, num_objs) < 0)
+ if(H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_sumup, num_objs) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "iteration operator failed")
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_stab_count() */
+} /* end H5G__stab_count() */
/*-------------------------------------------------------------------------
- * Function: H5G_stab_bh_size
+ * Function: H5G__stab_bh_size
*
* Purpose: Retrieve storage for btree and heap (1.6)
*
@@ -659,14 +659,14 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_stab_bh_size(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab,
+H5G__stab_bh_size(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab,
H5_ih_info_t *bh_info)
{
hsize_t snode_size; /* Symbol table node size */
H5B_info_t bt_info; /* B-tree node info */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5G_stab_bh_size, FAIL)
+ FUNC_ENTER_PACKAGE
/* Sanity check */
HDassert(f);
@@ -677,7 +677,7 @@ H5G_stab_bh_size(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab,
snode_size = 0;
/* Get the B-tree & symbol table node size info */
- if(H5B_get_info(f, dxpl_id, H5B_SNODE, stab->btree_addr, &bt_info, H5G_node_iterate_size, &snode_size) < 0)
+ if(H5B_get_info(f, dxpl_id, H5B_SNODE, stab->btree_addr, &bt_info, H5G__node_iterate_size, &snode_size) < 0)
HGOTO_ERROR(H5E_BTREE, H5E_CANTINIT, FAIL, "iteration operator failed")
/* Add symbol table & B-tree node sizes to index info */
@@ -689,7 +689,7 @@ H5G_stab_bh_size(H5F_t *f, hid_t dxpl_id, const H5O_stab_t *stab,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_stab_bh_size() */
+} /* end H5G__stab_bh_size() */
/*-------------------------------------------------------------------------
@@ -713,7 +713,7 @@ H5G_stab_get_name_by_idx_cb(const H5G_entry_t *ent, void *_udata)
size_t name_off; /* Offset of name in heap */
const char *name; /* Pointer to name string in heap */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5G_stab_get_name_by_idx_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ent);
@@ -731,7 +731,7 @@ H5G_stab_get_name_by_idx_cb(const H5G_entry_t *ent, void *_udata)
/*-------------------------------------------------------------------------
- * Function: H5G_stab_get_name_by_idx
+ * Function: H5G__stab_get_name_by_idx
*
* Purpose: Returns the name of objects in the group by giving index.
*
@@ -744,7 +744,7 @@ H5G_stab_get_name_by_idx_cb(const H5G_entry_t *ent, void *_udata)
*-------------------------------------------------------------------------
*/
ssize_t
-H5G_stab_get_name_by_idx(H5O_loc_t *oloc, H5_iter_order_t order, hsize_t n,
+H5G__stab_get_name_by_idx(const H5O_loc_t *oloc, H5_iter_order_t order, hsize_t n,
char* name, size_t size, hid_t dxpl_id)
{
H5HL_t *heap = NULL; /* Pointer to local heap */
@@ -756,7 +756,7 @@ H5G_stab_get_name_by_idx(H5O_loc_t *oloc, H5_iter_order_t order, hsize_t n,
/* Portably clear udata struct (before FUNC_ENTER) */
HDmemset(&udata, 0, sizeof(udata));
- FUNC_ENTER_NOAPI(H5G_stab_get_name_by_idx, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(oloc);
@@ -774,7 +774,7 @@ H5G_stab_get_name_by_idx(H5O_loc_t *oloc, H5_iter_order_t order, hsize_t n,
hsize_t nlinks = 0; /* Number of links in group */
/* Iterate over the symbol table nodes, to count the links */
- if(H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G_node_sumup, &nlinks) < 0)
+ if(H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_sumup, &nlinks) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "iteration operator failed")
/* Map decreasing iteration order index to increasing iteration order index */
@@ -790,7 +790,7 @@ H5G_stab_get_name_by_idx(H5O_loc_t *oloc, H5_iter_order_t order, hsize_t n,
udata_valid = TRUE;
/* Iterate over the group members */
- if(H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G_node_by_idx, &udata) < 0)
+ if(H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_by_idx, &udata) < 0)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "iteration operator failed")
/* If we don't know the name now, we almost certainly went out of bounds */
@@ -817,7 +817,7 @@ done:
H5MM_xfree(udata.name);
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_stab_get_name_by_idx() */
+} /* end H5G__stab_get_name_by_idx() */
/*-------------------------------------------------------------------------
@@ -840,12 +840,12 @@ H5G_stab_lookup_cb(const H5G_entry_t *ent, void *_udata)
H5G_stab_fnd_ud_t *udata = (H5G_stab_fnd_ud_t *)_udata; /* 'User data' passed in */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_stab_lookup_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check for setting link info */
if(udata->lnk)
/* Convert the entry to a link */
- if(H5G_ent_to_link(udata->lnk, udata->heap, ent, udata->name) < 0)
+ if(H5G__ent_to_link(udata->lnk, udata->heap, ent, udata->name) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTCONVERT, FAIL, "unable to convert symbol table entry to link")
done:
@@ -854,7 +854,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_stab_lookup
+ * Function: H5G__stab_lookup
*
* Purpose: Look up an object relative to a group, using symbol table
*
@@ -867,7 +867,7 @@ done:
*-------------------------------------------------------------------------
*/
htri_t
-H5G_stab_lookup(H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk,
+H5G__stab_lookup(const H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk,
hid_t dxpl_id)
{
H5HL_t *heap = NULL; /* Pointer to local heap */
@@ -876,7 +876,7 @@ H5G_stab_lookup(H5O_loc_t *grp_oloc, const char *name, H5O_link_t *lnk,
H5O_stab_t stab; /* Symbol table message */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5G_stab_lookup, FAIL)
+ FUNC_ENTER_PACKAGE
/* check arguments */
HDassert(grp_oloc && grp_oloc->file);
@@ -912,7 +912,7 @@ done:
HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_stab_lookup() */
+} /* end H5G__stab_lookup() */
/*-------------------------------------------------------------------------
@@ -936,7 +936,7 @@ H5G_stab_lookup_by_idx_cb(const H5G_entry_t *ent, void *_udata)
const char *name; /* Pointer to name string in heap */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_stab_lookup_by_idx_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(ent);
@@ -947,7 +947,7 @@ H5G_stab_lookup_by_idx_cb(const H5G_entry_t *ent, void *_udata)
HDassert(name);
/* Convert the entry to a link */
- if(H5G_ent_to_link(udata->lnk, udata->heap, ent, name) < 0)
+ if(H5G__ent_to_link(udata->lnk, udata->heap, ent, name) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTCONVERT, FAIL, "unable to convert symbol table entry to link")
udata->found = TRUE;
@@ -957,7 +957,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_stab_lookup_by_idx
+ * Function: H5G__stab_lookup_by_idx
*
* Purpose: Look up an object in a group, according to the name index
*
@@ -970,7 +970,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_stab_lookup_by_idx(H5O_loc_t *grp_oloc, H5_iter_order_t order, hsize_t n,
+H5G__stab_lookup_by_idx(const H5O_loc_t *grp_oloc, H5_iter_order_t order, hsize_t n,
H5O_link_t *lnk, hid_t dxpl_id)
{
H5HL_t *heap = NULL; /* Pointer to local heap */
@@ -978,7 +978,7 @@ H5G_stab_lookup_by_idx(H5O_loc_t *grp_oloc, H5_iter_order_t order, hsize_t n,
H5O_stab_t stab; /* Symbol table message */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_stab_lookup_by_idx, FAIL)
+ FUNC_ENTER_PACKAGE
/* check arguments */
HDassert(grp_oloc && grp_oloc->file);
@@ -997,7 +997,7 @@ H5G_stab_lookup_by_idx(H5O_loc_t *grp_oloc, H5_iter_order_t order, hsize_t n,
hsize_t nlinks = 0; /* Number of links in group */
/* Iterate over the symbol table nodes, to count the links */
- if(H5B_iterate(grp_oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G_node_sumup, &nlinks) < 0)
+ if(H5B_iterate(grp_oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_sumup, &nlinks) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "iteration operator failed")
/* Map decreasing iteration order index to increasing iteration order index */
@@ -1013,7 +1013,7 @@ H5G_stab_lookup_by_idx(H5O_loc_t *grp_oloc, H5_iter_order_t order, hsize_t n,
udata.found = FALSE;
/* Iterate over the group members */
- if(H5B_iterate(grp_oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G_node_by_idx, &udata) < 0)
+ if(H5B_iterate(grp_oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_by_idx, &udata) < 0)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "iteration operator failed")
/* If we didn't find the link, we almost certainly went out of bounds */
@@ -1026,12 +1026,12 @@ done:
HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_stab_lookup_by_idx() */
+} /* end H5G__stab_lookup_by_idx() */
#ifndef H5_STRICT_FORMAT_CHECKS
/*-------------------------------------------------------------------------
- * Function: H5G_stab_valid
+ * Function: H5G__stab_valid
*
* Purpose: Verify that a group's symbol table message is valid. If
* provided, the addresses in alt_stab will be tried if the
@@ -1053,14 +1053,14 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_stab_valid(H5O_loc_t *grp_oloc, hid_t dxpl_id, H5O_stab_t *alt_stab)
+H5G__stab_valid(H5O_loc_t *grp_oloc, hid_t dxpl_id, H5O_stab_t *alt_stab)
{
H5O_stab_t stab; /* Current symbol table */
H5HL_t *heap = NULL; /* Pointer to local heap */
hbool_t changed = FALSE; /* Whether stab has been modified */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_stab_valid, FAIL)
+ FUNC_ENTER_PACKAGE
/* Read the symbol table message */
if(NULL == H5O_msg_read(grp_oloc, H5O_STAB_ID, &stab, dxpl_id))
@@ -1107,7 +1107,7 @@ done:
HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_stab_valid */
+} /* end H5G__stab_valid */
#endif /* H5_STRICT_FORMAT_CHECKS */
#ifndef H5_NO_DEPRECATED_SYMBOLS
@@ -1132,7 +1132,7 @@ H5G_stab_get_type_by_idx_cb(const H5G_entry_t *ent, void *_udata)
H5G_bt_it_gtbi_t *udata = (H5G_bt_it_gtbi_t *)_udata;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_stab_get_type_by_idx_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(ent);
@@ -1172,7 +1172,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_get_objtype_by_idx
+ * Function: H5G__stab_get_type_by_idx
*
* Purpose: Private function for H5Gget_objtype_by_idx.
* Returns the type of objects in the group by giving index.
@@ -1187,13 +1187,13 @@ done:
*-------------------------------------------------------------------------
*/
H5G_obj_t
-H5G_stab_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx, hid_t dxpl_id)
+H5G__stab_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx, hid_t dxpl_id)
{
H5O_stab_t stab; /* Info about local heap & B-tree */
H5G_bt_it_gtbi_t udata; /* User data for B-tree callback */
H5G_obj_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5G_stab_get_type_by_idx, H5G_UNKNOWN)
+ FUNC_ENTER_PACKAGE
/* Sanity check */
HDassert(oloc);
@@ -1211,7 +1211,7 @@ H5G_stab_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx, hid_t dxpl_id)
udata.type = H5G_UNKNOWN;
/* Iterate over the group members */
- if(H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G_node_by_idx, &udata) < 0)
+ if(H5B_iterate(oloc->file, dxpl_id, H5B_SNODE, stab.btree_addr, H5G__node_by_idx, &udata) < 0)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5G_UNKNOWN, "iteration operator failed")
/* If we don't know the type now, we almost certainly went out of bounds */
@@ -1223,6 +1223,6 @@ H5G_stab_get_type_by_idx(H5O_loc_t *oloc, hsize_t idx, hid_t dxpl_id)
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_stab_get_type_by_idx() */
+} /* end H5G__stab_get_type_by_idx() */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
diff --git a/src/H5Gtest.c b/src/H5Gtest.c
index 9e228e7..00f5fa9 100644
--- a/src/H5Gtest.c
+++ b/src/H5Gtest.c
@@ -74,11 +74,11 @@
/*--------------------------------------------------------------------------
NAME
- H5G_is_empty_test
+ H5G__is_empty_test
PURPOSE
Determine whether a group contains no objects
USAGE
- htri_t H5G_is_empty_test(gid)
+ htri_t H5G__is_empty_test(gid)
hid_t gid; IN: group to check
RETURNS
Non-negative TRUE/FALSE on success, negative on failure
@@ -92,14 +92,14 @@
REVISION LOG
--------------------------------------------------------------------------*/
htri_t
-H5G_is_empty_test(hid_t gid)
+H5G__is_empty_test(hid_t gid)
{
H5G_t *grp = NULL; /* Pointer to group */
htri_t msg_exists = FALSE; /* Indicate that a header message is present */
htri_t linfo_exists = FALSE;/* Indicate that the 'link info' message is present */
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI(H5G_is_empty_test, FAIL)
+ FUNC_ENTER_PACKAGE
/* Get group structure */
if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
@@ -133,7 +133,7 @@ H5G_is_empty_test(hid_t gid)
HGOTO_ERROR(H5E_SYM, H5E_BADVALUE, FAIL, "both symbol table and link info messages found")
/* Get the link info */
- if(H5G_obj_get_linfo(&(grp->oloc), &linfo, H5AC_dxpl_id) < 0)
+ if(H5G__obj_get_linfo(&(grp->oloc), &linfo, H5AC_dxpl_id) < 0)
HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get link info")
/* Check for 'dense' link storage file addresses being defined */
@@ -171,7 +171,7 @@ H5G_is_empty_test(hid_t gid)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to read symbol table message")
/* Get the count of links in the group */
- if(H5G_stab_count(&(grp->oloc), &nlinks, H5AC_dxpl_id) < 0)
+ if(H5G__stab_count(&(grp->oloc), &nlinks, H5AC_dxpl_id) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "unable to count links")
/* Check for link count */
@@ -181,16 +181,16 @@ H5G_is_empty_test(hid_t gid)
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5G_is_empty_test() */
+} /* H5G__is_empty_test() */
/*--------------------------------------------------------------------------
NAME
- H5G_has_links_test
+ H5G__has_links_test
PURPOSE
Determine whether a group contains link messages
USAGE
- htri_t H5G_has_links_test(gid)
+ htri_t H5G__has_links_test(gid)
hid_t gid; IN: group to check
unsigned *nmsgs; OUT: # of link messages in header
RETURNS
@@ -204,13 +204,13 @@ done:
REVISION LOG
--------------------------------------------------------------------------*/
htri_t
-H5G_has_links_test(hid_t gid, unsigned *nmsgs)
+H5G__has_links_test(hid_t gid, unsigned *nmsgs)
{
H5G_t *grp = NULL; /* Pointer to group */
htri_t msg_exists = 0; /* Indicate that a header message is present */
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI(H5G_has_links_test, FAIL)
+ FUNC_ENTER_PACKAGE
/* Get group structure */
if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
@@ -240,16 +240,16 @@ H5G_has_links_test(hid_t gid, unsigned *nmsgs)
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5G_has_links_test() */
+} /* H5G__has_links_test() */
/*--------------------------------------------------------------------------
NAME
- H5G_has_stab_test
+ H5G__has_stab_test
PURPOSE
Determine whether a group contains a symbol table message
USAGE
- htri_t H5G_has_stab_test(gid)
+ htri_t H5G__has_stab_test(gid)
hid_t gid; IN: group to check
RETURNS
Non-negative TRUE/FALSE on success, negative on failure
@@ -262,13 +262,13 @@ done:
REVISION LOG
--------------------------------------------------------------------------*/
htri_t
-H5G_has_stab_test(hid_t gid)
+H5G__has_stab_test(hid_t gid)
{
H5G_t *grp = NULL; /* Pointer to group */
htri_t msg_exists = 0; /* Indicate that a header message is present */
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI(H5G_has_stab_test, FAIL)
+ FUNC_ENTER_PACKAGE
/* Get group structure */
if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
@@ -288,16 +288,16 @@ H5G_has_stab_test(hid_t gid)
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5G_has_stab_test() */
+} /* H5G__has_stab_test() */
/*--------------------------------------------------------------------------
NAME
- H5G_is_new_dense_test
+ H5G__is_new_dense_test
PURPOSE
Determine whether a group is in the "new" format and dense
USAGE
- htri_t H5G_is_new_dense_test(gid)
+ htri_t H5G__is_new_dense_test(gid)
hid_t gid; IN: group to check
RETURNS
Non-negative TRUE/FALSE on success, negative on failure
@@ -312,13 +312,13 @@ done:
REVISION LOG
--------------------------------------------------------------------------*/
htri_t
-H5G_is_new_dense_test(hid_t gid)
+H5G__is_new_dense_test(hid_t gid)
{
H5G_t *grp = NULL; /* Pointer to group */
htri_t msg_exists = 0; /* Indicate that a header message is present */
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI(H5G_is_new_dense_test, FAIL)
+ FUNC_ENTER_PACKAGE
/* Get group structure */
if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
@@ -343,7 +343,7 @@ H5G_is_new_dense_test(hid_t gid)
H5O_linfo_t linfo; /* Link info message */
/* Get the link info */
- if(H5G_obj_get_linfo(&(grp->oloc), &linfo, H5AC_dxpl_id) < 0)
+ if(H5G__obj_get_linfo(&(grp->oloc), &linfo, H5AC_dxpl_id) < 0)
HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get link info")
/* Check for 'dense' link storage file addresses being defined */
@@ -355,16 +355,16 @@ H5G_is_new_dense_test(hid_t gid)
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5G_is_new_dense_test() */
+} /* H5G__is_new_dense_test() */
/*--------------------------------------------------------------------------
NAME
- H5G_new_dense_info_test
+ H5G__new_dense_info_test
PURPOSE
Retrieve information about the state of the new "dense" storage for groups
USAGE
- herr_t H5G_new_dense_info_test(gid, name_count, corder_count)
+ herr_t H5G__new_dense_info_test(gid, name_count, corder_count)
hid_t gid; IN: group to check
hsize_t *name_count; OUT: Number of links in name index
hsize_t *corder_count; OUT: Number of links in creation order index
@@ -380,7 +380,7 @@ done:
REVISION LOG
--------------------------------------------------------------------------*/
herr_t
-H5G_new_dense_info_test(hid_t gid, hsize_t *name_count, hsize_t *corder_count)
+H5G__new_dense_info_test(hid_t gid, hsize_t *name_count, hsize_t *corder_count)
{
H5B2_t *bt2_name = NULL; /* v2 B-tree handle for name index */
H5B2_t *bt2_corder = NULL; /* v2 B-tree handle for creation order index */
@@ -388,14 +388,14 @@ H5G_new_dense_info_test(hid_t gid, hsize_t *name_count, hsize_t *corder_count)
H5G_t *grp = NULL; /* Pointer to group */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_new_dense_info_test, FAIL)
+ FUNC_ENTER_PACKAGE
/* Get group structure */
if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a group")
/* Get the link info */
- if(H5G_obj_get_linfo(&(grp->oloc), &linfo, H5AC_dxpl_id) < 0)
+ if(H5G__obj_get_linfo(&(grp->oloc), &linfo, H5AC_dxpl_id) < 0)
HGOTO_ERROR(H5E_SYM, H5E_BADMESG, FAIL, "can't get link info")
/* Check for 'dense' link storage file addresses being defined */
@@ -433,16 +433,16 @@ done:
HDONE_ERROR(H5E_SYM, H5E_CANTCLOSEOBJ, FAIL, "can't close v2 B-tree for creation order index")
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5G_new_dense_info_test() */
+} /* H5G__new_dense_info_test() */
/*--------------------------------------------------------------------------
NAME
- H5G_lheap_size_test
+ H5G__lheap_size_test
PURPOSE
Determine the size of a local heap for a group
USAGE
- herr_t H5G_lheap_size_test(gid, lheap_size)
+ herr_t H5G__lheap_size_test(gid, lheap_size)
hid_t gid; IN: group to check
size_t *lheap_size; OUT: Size of local heap
RETURNS
@@ -456,13 +456,13 @@ done:
REVISION LOG
--------------------------------------------------------------------------*/
herr_t
-H5G_lheap_size_test(hid_t gid, size_t *lheap_size)
+H5G__lheap_size_test(hid_t gid, size_t *lheap_size)
{
H5G_t *grp = NULL; /* Pointer to group */
H5O_stab_t stab; /* Symbol table message */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_lheap_size_test, FAIL)
+ FUNC_ENTER_PACKAGE
/* Get group structure */
if(NULL == (grp = (H5G_t *)H5I_object_verify(gid, H5I_GROUP)))
@@ -478,16 +478,16 @@ H5G_lheap_size_test(hid_t gid, size_t *lheap_size)
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5G_lheap_size_test() */
+} /* H5G__lheap_size_test() */
/*--------------------------------------------------------------------------
NAME
- H5G_user_path_test
+ H5G__user_path_test
PURPOSE
Retrieve the user path for an ID
USAGE
- herr_t H5G_user_path_test(obj_id, user_path, user_path_len)
+ herr_t H5G__user_path_test(obj_id, user_path, user_path_len)
hid_t obj_id; IN: ID to check
char *user_path; OUT: Pointer to buffer for User path
size_t *user_path_len; OUT: Size of user path
@@ -504,13 +504,13 @@ done:
REVISION LOG
--------------------------------------------------------------------------*/
herr_t
-H5G_user_path_test(hid_t obj_id, char *user_path, size_t *user_path_len, unsigned *obj_hidden)
+H5G__user_path_test(hid_t obj_id, char *user_path, size_t *user_path_len, unsigned *obj_hidden)
{
void *obj_ptr; /* Pointer to object for ID */
H5G_name_t *obj_path; /* Pointer to group hier. path for obj */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_user_path_test, FAIL)
+ FUNC_ENTER_PACKAGE
/* Sanity check */
HDassert(user_path_len);
@@ -577,11 +577,11 @@ H5G_user_path_test(hid_t obj_id, char *user_path, size_t *user_path_len, unsigne
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* H5G_user_path_test() */
+} /* H5G__user_path_test() */
/*-------------------------------------------------------------------------
- * Function: H5G_verify_cached_stab_test
+ * Function: H5G__verify_cached_stab_test
*
* Purpose: Check that a that the provided group entry contains a
* cached symbol table entry, that the entry matches that in
@@ -597,13 +597,13 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_verify_cached_stab_test(H5O_loc_t *grp_oloc, H5G_entry_t *ent)
+H5G__verify_cached_stab_test(H5O_loc_t *grp_oloc, H5G_entry_t *ent)
{
H5O_stab_t stab; /* Symbol table */
H5HL_t *heap = NULL; /* Pointer to local heap */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_verify_cached_stab_test)
+ FUNC_ENTER_PACKAGE
/* Verify that stab info is cached in ent */
if(ent->type != H5G_CACHED_STAB)
@@ -633,7 +633,7 @@ done:
HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to unprotect symbol table heap")
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_verify_cached_stab_test() */
+} /* end H5G__verify_cached_stab_test() */
/*-------------------------------------------------------------------------
@@ -664,7 +664,7 @@ H5G_verify_cached_stabs_test_cb(H5F_t *f, hid_t dxpl_id,
unsigned i;
int ret_value = H5_ITER_CONT;
- FUNC_ENTER_NOAPI(H5G_verify_cached_stabs_test_cb, H5_ITER_ERROR)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -732,7 +732,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_verify_cached_stabs_test
+ * Function: H5G__verify_cached_stabs_test
*
* Purpose: If the provided group contains a symbol table, verifies
* that all links in the group contain cached symbol table
@@ -750,7 +750,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_verify_cached_stabs_test(hid_t gid)
+H5G__verify_cached_stabs_test(hid_t gid)
{
H5G_t *grp = NULL; /* Group */
htri_t stab_exists;
@@ -758,7 +758,7 @@ H5G_verify_cached_stabs_test(hid_t gid)
H5G_bt_common_t udata = {NULL, NULL}; /* Dummy udata so H5B_iterate doesn't freak out */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_verify_cached_stabs_test, FAIL)
+ FUNC_ENTER_PACKAGE
/* check args */
HDassert(gid >= 0);
@@ -788,5 +788,5 @@ H5G_verify_cached_stabs_test(hid_t gid)
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_verify_cached_stabs_test() */
+} /* end H5G__verify_cached_stabs_test() */
diff --git a/src/H5Gtraverse.c b/src/H5Gtraverse.c
index c04d7a2..8ac6aab 100644
--- a/src/H5Gtraverse.c
+++ b/src/H5Gtraverse.c
@@ -126,7 +126,7 @@ H5G_traverse_slink_cb(H5G_loc_t UNUSED *grp_loc, const char UNUSED *name,
H5G_trav_slink_t *udata = (H5G_trav_slink_t *)_udata; /* User data passed in */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_traverse_slink_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check for dangling soft link */
if(obj_loc == NULL) {
@@ -182,7 +182,7 @@ H5G_traverse_ud(const H5G_loc_t *grp_loc/*in,out*/, const H5O_link_t *lnk,
hid_t cur_grp = (-1);
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_traverse_ud)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(grp_loc);
@@ -201,7 +201,7 @@ H5G_traverse_ud(const H5G_loc_t *grp_loc/*in,out*/, const H5O_link_t *lnk,
grp_loc_copy.path = &grp_path_copy;
grp_loc_copy.oloc = &grp_oloc_copy;
H5G_loc_reset(&grp_loc_copy);
- if(H5G_loc_copy(&grp_loc_copy, grp_loc, H5_COPY_DEEP) < 0)
+ if(H5G__loc_copy(&grp_loc_copy, grp_loc, H5_COPY_DEEP) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTCOPY, FAIL, "unable to copy object location")
/* Create a group ID to pass to the user-defined callback */
@@ -263,7 +263,7 @@ H5G_traverse_ud(const H5G_loc_t *grp_loc/*in,out*/, const H5O_link_t *lnk,
H5G_loc_free(obj_loc);
/* Copy new object's location information */
- H5G_loc_copy(obj_loc, &new_loc, H5_COPY_DEEP);
+ H5G__loc_copy(obj_loc, &new_loc, H5_COPY_DEEP);
/* Hold the file open until we free this object header (otherwise the
* object location will be invalidated when the file closes).
@@ -324,7 +324,7 @@ H5G_traverse_slink(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
hbool_t tmp_grp_loc_set = FALSE; /* Flag to indicate that tmp group location is initialized */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_traverse_slink)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(grp_loc);
@@ -344,7 +344,7 @@ H5G_traverse_slink(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
/* ("tracking the names properly" means to ignore the effects of the
* link traversal on the object's & group's paths - QAK)
*/
- H5G_loc_copy(&tmp_grp_loc, grp_loc, H5_COPY_DEEP);
+ H5G__loc_copy(&tmp_grp_loc, grp_loc, H5_COPY_DEEP);
tmp_grp_loc_set = TRUE;
/* Hold the object's group hier. path to restore later */
@@ -380,7 +380,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5G_traverse_special
+ * Function: H5G__traverse_special
*
* Purpose: Handle traversing special link situations
*
@@ -393,13 +393,13 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5G_traverse_special(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
+H5G__traverse_special(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
unsigned target, size_t *nlinks, hbool_t last_comp,
H5G_loc_t *obj_loc, hbool_t *obj_exists, hid_t lapl_id, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_traverse_special, FAIL)
+ FUNC_ENTER_PACKAGE
/* Sanity check */
HDassert(grp_loc);
@@ -460,7 +460,7 @@ H5G_traverse_special(const H5G_loc_t *grp_loc, const H5O_link_t *lnk,
done:
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5G_traverse_special() */
+} /* end H5G__traverse_special() */
/*-------------------------------------------------------------------------
@@ -502,7 +502,7 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
hbool_t last_comp = FALSE; /* Flag to indicate that a component is the last component in the name */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5G_traverse_real)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check parameters */
HDassert(_loc);
@@ -544,7 +544,7 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
#endif /* H5_USING_MEMCHECKER */
/* Deep copy of the starting location to group location */
- if(H5G_loc_copy(&grp_loc, &loc, H5_COPY_DEEP) < 0)
+ if(H5G__loc_copy(&grp_loc, &loc, H5_COPY_DEEP) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTOPENOBJ, FAIL, "unable to copy location")
group_copy = TRUE;
@@ -561,7 +561,7 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
HGOTO_ERROR(H5E_SYM, H5E_NOSPACE, FAIL, "can't get actual buffer")
/* Traverse the path */
- while((name = H5G_component(name, &nchars)) && *name) {
+ while((name = H5G__component(name, &nchars)) && *name) {
const char *s; /* Temporary string pointer */
htri_t lookup_status; /* Status from object lookup */
hbool_t obj_exists; /* Whether the object exists */
@@ -582,7 +582,7 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
} /* end if */
/* Check if this is the last component of the name */
- if(!((s = H5G_component(name + nchars, NULL)) && *s))
+ if(!((s = H5G__component(name + nchars, NULL)) && *s))
last_comp = TRUE;
/* If there's valid information in the link, reset it */
@@ -592,7 +592,7 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
} /* end if */
/* Get information for object in current group */
- if((lookup_status = H5G_obj_lookup(grp_loc.oloc, comp, &lnk/*out*/, dxpl_id)) < 0)
+ if((lookup_status = H5G__obj_lookup(grp_loc.oloc, comp, &lnk/*out*/, dxpl_id)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "can't look up component")
obj_exists = FALSE;
@@ -604,7 +604,7 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
link_valid = TRUE;
/* Build object location from the link */
- if(H5G_link_to_loc(&grp_loc, &lnk, &obj_loc) < 0)
+ if(H5G__link_to_loc(&grp_loc, &lnk, &obj_loc) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "cannot initialize object location")
obj_loc_valid = TRUE;
@@ -613,7 +613,7 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
/* Perform any special traversals that the link needs */
/* (soft links, user-defined links, file mounting, etc.) */
- if(H5G_traverse_special(&grp_loc, &lnk, target, nlinks, last_comp, &obj_loc, &obj_exists, lapl_id, dxpl_id) < 0)
+ if(H5G__traverse_special(&grp_loc, &lnk, target, nlinks, last_comp, &obj_loc, &obj_exists, lapl_id, dxpl_id) < 0)
HGOTO_ERROR(H5E_LINK, H5E_TRAVERSE, FAIL, "special link traversal failed")
} /* end if */
@@ -679,7 +679,7 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
/* Check for the parent group having a link info message */
/* (OK if not found) */
/* Get the link info for parent group */
- if((exists = H5G_obj_get_linfo(grp_loc.oloc, &par_linfo, dxpl_id)) < 0)
+ if((exists = H5G__obj_get_linfo(grp_loc.oloc, &par_linfo, dxpl_id)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTGET, FAIL, "unable to read object header")
if(exists) {
/* Only keep the creation order information from the parent
@@ -715,11 +715,11 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
gcrt_info.gcpl_id = H5P_GROUP_CREATE_DEFAULT;
gcrt_info.cache_type = H5G_NOTHING_CACHED;
HDmemset(&gcrt_info.cache, 0, sizeof(gcrt_info.cache));
- if(H5G_obj_create_real(grp_oloc.file, dxpl_id, ginfo, linfo, pline, &gcrt_info, obj_loc.oloc/*out*/) < 0)
+ if(H5G__obj_create_real(grp_oloc.file, dxpl_id, ginfo, linfo, pline, &gcrt_info, obj_loc.oloc/*out*/) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group entry")
/* Insert new group into current group's symbol table */
- if(H5G_loc_insert(&grp_loc, comp, &obj_loc, H5O_TYPE_GROUP, &gcrt_info, dxpl_id) < 0)
+ if(H5G__loc_insert(&grp_loc, comp, &obj_loc, H5O_TYPE_GROUP, &gcrt_info, dxpl_id) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINSERT, FAIL, "unable to insert intermediate group")
/* Decrement refcount on intermediate group's object header in memory */
@@ -761,7 +761,7 @@ H5G_traverse_real(const H5G_loc_t *_loc, const char *name, unsigned target,
/* Transfer "ownership" of the object's information to the group object */
H5G_loc_free(&grp_loc);
- H5G_loc_copy(&grp_loc, &obj_loc, H5_COPY_SHALLOW);
+ H5G__loc_copy(&grp_loc, &obj_loc, H5_COPY_SHALLOW);
H5G_loc_reset(&obj_loc);
obj_loc_valid = FALSE;
@@ -835,7 +835,7 @@ H5G_traverse(const H5G_loc_t *loc, const char *name, unsigned target, H5G_traver
H5P_genplist_t *lapl; /* Property list with value for nlinks */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5G_traverse, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
if(!name || !*name)
diff --git a/src/H5HF.c b/src/H5HF.c
index 9d8f01d..848cdfb 100644
--- a/src/H5HF.c
+++ b/src/H5HF.c
@@ -99,7 +99,7 @@ H5FL_DEFINE_STATIC(H5HF_t);
herr_t
H5HF_op_read(const void *obj, size_t obj_len, void *op_data)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_op_read)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Perform "read", using memcpy() */
HDmemcpy(op_data, obj, obj_len);
@@ -124,7 +124,7 @@ H5HF_op_read(const void *obj, size_t obj_len, void *op_data)
herr_t
H5HF_op_write(const void *obj, size_t obj_len, void *op_data)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_op_write)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Perform "write", using memcpy() */
HDmemcpy((void *)obj, op_data, obj_len); /* Casting away const OK -QAK */
@@ -155,7 +155,7 @@ H5HF_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam)
haddr_t fh_addr; /* Heap header address */
H5HF_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5HF_create, NULL)
+ FUNC_ENTER_NOAPI(NULL)
#ifdef QAK
HDfprintf(stderr, "%s: Called\n", FUNC);
#endif /* QAK */
@@ -225,7 +225,7 @@ H5HF_open(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr)
H5HF_hdr_t *hdr = NULL; /* The fractal heap header information */
H5HF_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5HF_open, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/*
* Check arguments.
@@ -293,7 +293,7 @@ done:
herr_t
H5HF_get_id_len(H5HF_t *fh, size_t *id_len_p)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5HF_get_id_len)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -324,7 +324,7 @@ H5HF_get_id_len(H5HF_t *fh, size_t *id_len_p)
herr_t
H5HF_get_heap_addr(const H5HF_t *fh, haddr_t *heap_addr_p)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5HF_get_heap_addr)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -360,7 +360,7 @@ H5HF_insert(H5HF_t *fh, hid_t dxpl_id, size_t size, const void *obj,
H5HF_hdr_t *hdr = NULL; /* The fractal heap header information */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5HF_insert, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
#ifdef QAK
HDfprintf(stderr, "%s: size = %Zu\n", FUNC, size);
#endif /* QAK */
@@ -433,7 +433,7 @@ H5HF_get_obj_len(H5HF_t *fh, hid_t dxpl_id, const void *_id, size_t *obj_len_p)
uint8_t id_flags; /* Heap ID flag bits */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HF_get_obj_len, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -501,7 +501,7 @@ H5HF_read(H5HF_t *fh, hid_t dxpl_id, const void *_id, void *obj/*out*/)
uint8_t id_flags; /* Heap ID flag bits */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HF_read, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -579,7 +579,7 @@ H5HF_write(H5HF_t *fh, hid_t dxpl_id, void *_id, hbool_t UNUSED *id_changed,
uint8_t id_flags; /* Heap ID flag bits */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HF_write, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
#ifdef QAK
HDfprintf(stderr, "%s: Called\n", FUNC);
#endif /* QAK */
@@ -654,7 +654,7 @@ H5HF_op(H5HF_t *fh, hid_t dxpl_id, const void *_id, H5HF_operator_t op,
uint8_t id_flags; /* Heap ID flag bits */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HF_op, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -719,7 +719,7 @@ H5HF_remove(H5HF_t *fh, hid_t dxpl_id, const void *_id)
uint8_t id_flags; /* Heap ID flag bits */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HF_remove, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
#ifdef QAK
HDfprintf(stderr, "%s: Called\n", FUNC);
#endif /* QAK */
@@ -787,7 +787,7 @@ H5HF_close(H5HF_t *fh, hid_t dxpl_id)
haddr_t heap_addr = HADDR_UNDEF; /* Address of heap (for deletion) */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HF_close, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -888,7 +888,7 @@ H5HF_delete(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr)
H5HF_hdr_t *hdr = NULL; /* The fractal heap header information */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HF_delete, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
diff --git a/src/H5HFbtree2.c b/src/H5HFbtree2.c
index bce58b7..023344c 100644
--- a/src/H5HFbtree2.c
+++ b/src/H5HFbtree2.c
@@ -211,7 +211,7 @@ H5HF_huge_bt2_crt_context(void *_f)
H5HF_huge_bt2_ctx_t *ctx; /* Callback context structure */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_bt2_crt_context)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -252,7 +252,7 @@ H5HF_huge_bt2_dst_context(void *_ctx)
{
H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_dst_context)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@@ -283,7 +283,7 @@ H5HF_huge_bt2_crt_dbg_context(H5F_t *f, hid_t UNUSED dxpl_id, haddr_t UNUSED add
H5HF_huge_bt2_ctx_t *ctx; /* Callback context structure */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_bt2_crt_dbg_context)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -321,7 +321,7 @@ done:
herr_t
H5HF_huge_bt2_indir_found(const void *nrecord, void *op_data)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_indir_found)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef QAK
HDfprintf(stderr, "%s: nrecord = {%a, %Hu, %Hu}\n", "H5HF_huge_bt2_indir_found",
@@ -355,7 +355,7 @@ H5HF_huge_bt2_indir_remove(const void *nrecord, void *_udata)
H5HF_huge_remove_ud1_t *udata = (H5HF_huge_remove_ud1_t *)_udata; /* User callback data */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_bt2_indir_remove)
+ FUNC_ENTER_NOAPI_NOINIT
/* Free the space in the file for the object being removed */
if(H5MF_xfree(udata->hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, udata->dxpl_id, ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->addr, ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->len) < 0)
@@ -385,7 +385,7 @@ done:
static herr_t
H5HF_huge_bt2_indir_store(void *nrecord, const void *udata)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_indir_store)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
*(H5HF_huge_bt2_indir_rec_t *)nrecord = *(const H5HF_huge_bt2_indir_rec_t *)udata;
@@ -410,7 +410,7 @@ H5HF_huge_bt2_indir_store(void *nrecord, const void *udata)
static herr_t
H5HF_huge_bt2_indir_compare(const void *_rec1, const void *_rec2)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_indir_compare)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef QAK
{
@@ -444,7 +444,7 @@ H5HF_huge_bt2_indir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
const H5HF_huge_bt2_indir_rec_t *nrecord = (const H5HF_huge_bt2_indir_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_indir_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@@ -477,7 +477,7 @@ H5HF_huge_bt2_indir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
H5HF_huge_bt2_indir_rec_t *nrecord = (H5HF_huge_bt2_indir_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_indir_decode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@@ -511,7 +511,7 @@ H5HF_huge_bt2_indir_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED dxpl
{
const H5HF_huge_bt2_indir_rec_t *nrecord = (const H5HF_huge_bt2_indir_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_indir_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDfprintf(stream, "%*s%-*s {%a, %Hu, %Hu}\n", indent, "", fwidth, "Record:",
nrecord->addr, nrecord->len, nrecord->id);
@@ -537,7 +537,7 @@ H5HF_huge_bt2_indir_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED dxpl
herr_t
H5HF_huge_bt2_filt_indir_found(const void *nrecord, void *op_data)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_indir_found)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef QAK
HDfprintf(stderr, "%s: nrecord = {%a, %Hu, %x, %Hu, %Hu}\n", "H5HF_huge_bt2_filt_indir_found",
@@ -573,7 +573,7 @@ H5HF_huge_bt2_filt_indir_remove(const void *nrecord, void *_udata)
H5HF_huge_remove_ud1_t *udata = (H5HF_huge_remove_ud1_t *)_udata; /* User callback data */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_bt2_filt_indir_remove)
+ FUNC_ENTER_NOAPI_NOINIT
/* Free the space in the file for the object being removed */
if(H5MF_xfree(udata->hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, udata->dxpl_id, ((const H5HF_huge_bt2_filt_indir_rec_t *)nrecord)->addr, ((const H5HF_huge_bt2_filt_indir_rec_t *)nrecord)->len) < 0)
@@ -603,7 +603,7 @@ done:
static herr_t
H5HF_huge_bt2_filt_indir_store(void *nrecord, const void *udata)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_indir_store)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
*(H5HF_huge_bt2_filt_indir_rec_t *)nrecord = *(const H5HF_huge_bt2_filt_indir_rec_t *)udata;
@@ -628,7 +628,7 @@ H5HF_huge_bt2_filt_indir_store(void *nrecord, const void *udata)
static herr_t
H5HF_huge_bt2_filt_indir_compare(const void *_rec1, const void *_rec2)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_indir_compare)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef QAK
{
@@ -662,7 +662,7 @@ H5HF_huge_bt2_filt_indir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
const H5HF_huge_bt2_filt_indir_rec_t *nrecord = (const H5HF_huge_bt2_filt_indir_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_indir_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@@ -697,7 +697,7 @@ H5HF_huge_bt2_filt_indir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
H5HF_huge_bt2_filt_indir_rec_t *nrecord = (H5HF_huge_bt2_filt_indir_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_indir_decode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@@ -733,7 +733,7 @@ H5HF_huge_bt2_filt_indir_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED
{
const H5HF_huge_bt2_filt_indir_rec_t *nrecord = (const H5HF_huge_bt2_filt_indir_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_indir_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDfprintf(stream, "%*s%-*s {%a, %Hu, %x, %Hu, %Hu}\n", indent, "", fwidth, "Record:",
nrecord->addr, nrecord->len, nrecord->filter_mask, nrecord->obj_size, nrecord->id);
@@ -762,7 +762,7 @@ H5HF_huge_bt2_dir_remove(const void *nrecord, void *_udata)
H5HF_huge_remove_ud1_t *udata = (H5HF_huge_remove_ud1_t *)_udata; /* User callback data */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_bt2_dir_remove)
+ FUNC_ENTER_NOAPI_NOINIT
/* Free the space in the file for the object being removed */
if(H5MF_xfree(udata->hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, udata->dxpl_id, ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->addr, ((const H5HF_huge_bt2_indir_rec_t *)nrecord)->len) < 0)
@@ -792,7 +792,7 @@ done:
static herr_t
H5HF_huge_bt2_dir_store(void *nrecord, const void *udata)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_dir_store)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
*(H5HF_huge_bt2_dir_rec_t *)nrecord = *(const H5HF_huge_bt2_dir_rec_t *)udata;
@@ -821,7 +821,7 @@ H5HF_huge_bt2_dir_compare(const void *_rec1, const void *_rec2)
const H5HF_huge_bt2_dir_rec_t *rec2 = (const H5HF_huge_bt2_dir_rec_t *)_rec2;
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_dir_compare)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef QAK
HDfprintf(stderr, "%s: rec1 = {%a, %Hu}\n", "H5HF_huge_bt2_dir_compare", rec1->addr, rec1->len);
@@ -861,7 +861,7 @@ H5HF_huge_bt2_dir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
const H5HF_huge_bt2_dir_rec_t *nrecord = (const H5HF_huge_bt2_dir_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_dir_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@@ -893,7 +893,7 @@ H5HF_huge_bt2_dir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
H5HF_huge_bt2_dir_rec_t *nrecord = (H5HF_huge_bt2_dir_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_dir_decode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@@ -926,7 +926,7 @@ H5HF_huge_bt2_dir_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED dxpl_i
{
const H5HF_huge_bt2_dir_rec_t *nrecord = (const H5HF_huge_bt2_dir_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_dir_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDfprintf(stream, "%*s%-*s {%a, %Hu}\n", indent, "", fwidth, "Record:",
nrecord->addr, nrecord->len);
@@ -952,7 +952,7 @@ H5HF_huge_bt2_dir_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED dxpl_i
herr_t
H5HF_huge_bt2_filt_dir_found(const void *nrecord, void *op_data)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_dir_found)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef QAK
HDfprintf(stderr, "%s: nrecord = {%a, %Hu, %x, %Hu}\n", "H5HF_huge_bt2_filt_dir_found",
@@ -987,7 +987,7 @@ H5HF_huge_bt2_filt_dir_remove(const void *nrecord, void *_udata)
H5HF_huge_remove_ud1_t *udata = (H5HF_huge_remove_ud1_t *)_udata; /* User callback data */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_bt2_filt_dir_remove)
+ FUNC_ENTER_NOAPI_NOINIT
/* Free the space in the file for the object being removed */
if(H5MF_xfree(udata->hdr->f, H5FD_MEM_FHEAP_HUGE_OBJ, udata->dxpl_id, ((const H5HF_huge_bt2_filt_dir_rec_t *)nrecord)->addr, ((const H5HF_huge_bt2_filt_dir_rec_t *)nrecord)->len) < 0)
@@ -1017,7 +1017,7 @@ done:
static herr_t
H5HF_huge_bt2_filt_dir_store(void *nrecord, const void *udata)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_dir_store)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
*(H5HF_huge_bt2_filt_dir_rec_t *)nrecord = *(const H5HF_huge_bt2_filt_dir_rec_t *)udata;
@@ -1046,7 +1046,7 @@ H5HF_huge_bt2_filt_dir_compare(const void *_rec1, const void *_rec2)
const H5HF_huge_bt2_filt_dir_rec_t *rec2 = (const H5HF_huge_bt2_filt_dir_rec_t *)_rec2;
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_dir_compare)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef QAK
HDfprintf(stderr, "%s: rec1 = {%a, %Hu, %x, %Hu}\n", "H5HF_huge_bt2_filt_dir_compare", rec1->addr, rec1->len, rec1->filter_mask, rec1->obj_size);
@@ -1086,7 +1086,7 @@ H5HF_huge_bt2_filt_dir_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
const H5HF_huge_bt2_filt_dir_rec_t *nrecord = (const H5HF_huge_bt2_filt_dir_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_dir_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@@ -1120,7 +1120,7 @@ H5HF_huge_bt2_filt_dir_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
H5HF_huge_bt2_ctx_t *ctx = (H5HF_huge_bt2_ctx_t *)_ctx; /* Callback context structure */
H5HF_huge_bt2_filt_dir_rec_t *nrecord = (H5HF_huge_bt2_filt_dir_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_dir_decode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@@ -1154,7 +1154,7 @@ H5HF_huge_bt2_filt_dir_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED d
{
const H5HF_huge_bt2_filt_dir_rec_t *nrecord = (const H5HF_huge_bt2_filt_dir_rec_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_bt2_filt_dir_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDfprintf(stream, "%*s%-*s {%a, %Hu, %x, %Hu}\n", indent, "", fwidth, "Record:",
nrecord->addr, nrecord->len, nrecord->filter_mask, nrecord->obj_size);
diff --git a/src/H5HFcache.c b/src/H5HFcache.c
index c3bae6c..ad119a8 100644
--- a/src/H5HFcache.c
+++ b/src/H5HFcache.c
@@ -163,7 +163,7 @@ H5FL_BLK_DEFINE(direct_block);
static herr_t
H5HF_dtable_decode(H5F_t *f, const uint8_t **pp, H5HF_dtable_t *dtable)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dtable_decode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(f);
@@ -213,7 +213,7 @@ H5HF_dtable_decode(H5F_t *f, const uint8_t **pp, H5HF_dtable_t *dtable)
static herr_t
H5HF_dtable_encode(H5F_t *f, uint8_t **pp, const H5HF_dtable_t *dtable)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dtable_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(f);
@@ -274,7 +274,7 @@ H5HF_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
uint8_t heap_flags; /* Status flags for heap */
H5HF_hdr_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_hdr_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -454,7 +454,7 @@ H5HF_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5H
uint8_t hdr_buf[H5HF_HDR_BUF_SIZE]; /* Buffer for header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_hdr_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -586,7 +586,7 @@ H5HF_cache_hdr_dest(H5F_t *f, H5HF_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_hdr_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -632,7 +632,7 @@ H5HF_cache_hdr_clear(H5F_t *f, H5HF_hdr_t *hdr, hbool_t destroy)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_hdr_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -669,7 +669,7 @@ done:
static herr_t
H5HF_cache_hdr_size(const H5F_t UNUSED *f, const H5HF_hdr_t *hdr, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_cache_hdr_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(f);
@@ -714,7 +714,7 @@ H5HF_cache_iblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
unsigned u; /* Local index variable */
H5HF_indirect_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_iblock_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -906,7 +906,7 @@ H5HF_cache_iblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
uint8_t iblock_buf[H5HF_IBLOCK_BUF_SIZE]; /* Buffer for indirect block */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_iblock_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -1091,7 +1091,7 @@ H5HF_cache_iblock_dest(H5F_t *f, H5HF_indirect_t *iblock)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_iblock_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1142,7 +1142,7 @@ H5HF_cache_iblock_clear(H5F_t *f, H5HF_indirect_t *iblock, hbool_t destroy)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_iblock_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1179,7 +1179,7 @@ done:
static herr_t
H5HF_cache_iblock_size(const H5F_t UNUSED *f, const H5HF_indirect_t *iblock, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_cache_iblock_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(iblock);
@@ -1218,7 +1218,7 @@ H5HF_cache_dblock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
haddr_t heap_addr; /* Address of heap header in the file */
H5HF_direct_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_dblock_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -1389,7 +1389,7 @@ H5HF_cache_dblock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_dblock_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -1662,7 +1662,7 @@ H5HF_cache_dblock_dest(H5F_t *f, H5HF_direct_t *dblock)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_dblock_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1714,7 +1714,7 @@ H5HF_cache_dblock_clear(H5F_t *f, H5HF_direct_t *dblock, hbool_t destroy)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_cache_dblock_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1751,7 +1751,7 @@ done:
static herr_t
H5HF_cache_dblock_size(const H5F_t UNUSED *f, const H5HF_direct_t *dblock, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_cache_dblock_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(dblock);
diff --git a/src/H5HFdbg.c b/src/H5HFdbg.c
index 151ab7b..1709231 100644
--- a/src/H5HFdbg.c
+++ b/src/H5HFdbg.c
@@ -115,7 +115,7 @@ static herr_t H5HF_dtable_debug(H5HF_dtable_t *dtable, FILE *stream,
static herr_t
H5HF_dtable_debug(H5HF_dtable_t *dtable, FILE *stream, int indent, int fwidth)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dtable_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -190,7 +190,7 @@ H5HF_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
H5HF_hdr_t *hdr = NULL; /* Fractal heap header info */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HF_hdr_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -310,7 +310,7 @@ H5HF_dblock_debug_cb(const H5FS_section_info_t *_sect, void *_udata)
haddr_t sect_start, sect_end; /* Section's beginning and ending offsets */
haddr_t dblock_start, dblock_end; /* Direct block's beginning and ending offsets */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dblock_debug_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -397,7 +397,7 @@ H5HF_dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream,
uint8_t *marker = NULL; /* Track free space for block */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HF_dblock_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -527,7 +527,7 @@ H5HF_iblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream,
size_t u, v; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HF_iblock_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -656,7 +656,7 @@ H5HF_sects_debug_cb(const H5FS_section_info_t *_sect, void *_udata)
H5HF_debug_iter_ud2_t *udata = (H5HF_debug_iter_ud2_t *)_udata; /* User data for callbacks */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sects_debug_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -711,7 +711,7 @@ H5HF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr,
H5HF_hdr_t *hdr = NULL; /* Fractal heap header info */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HF_sects_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
diff --git a/src/H5HFdblock.c b/src/H5HFdblock.c
index db2359c..d6c8134 100644
--- a/src/H5HFdblock.c
+++ b/src/H5HFdblock.c
@@ -102,7 +102,7 @@ H5HF_man_dblock_create(hid_t dxpl_id, H5HF_hdr_t *hdr, H5HF_indirect_t *par_iblo
size_t free_space; /* Free space in new block */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_dblock_create)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -229,7 +229,7 @@ H5HF_man_dblock_destroy(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_direct_t *dblock,
unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting indirect block */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_dblock_destroy)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -343,7 +343,7 @@ H5HF_man_dblock_new(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t request,
size_t min_dblock_size; /* Min. size of direct block to allocate */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_dblock_new)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -442,7 +442,7 @@ H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr,
H5HF_dblock_cache_ud_t udata; /* parent and other infor for deserializing direct block */
H5HF_direct_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_dblock_protect)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -521,7 +521,7 @@ H5HF_man_dblock_locate(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t obj_off,
unsigned entry; /* Entry of block */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_dblock_locate)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -622,7 +622,7 @@ H5HF_man_dblock_delete(H5F_t *f, hid_t dxpl_id, haddr_t dblock_addr,
unsigned dblock_status = 0; /* Direct block's status in the metadata cache */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_dblock_delete)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -689,7 +689,7 @@ H5HF_man_dblock_dest(H5HF_direct_t *dblock)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_dblock_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
diff --git a/src/H5HFdtable.c b/src/H5HFdtable.c
index 29af47f..a7d95bc 100644
--- a/src/H5HFdtable.c
+++ b/src/H5HFdtable.c
@@ -96,7 +96,7 @@ H5HF_dtable_init(H5HF_dtable_t *dtable)
size_t u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_dtable_init)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -153,7 +153,7 @@ done:
herr_t
H5HF_dtable_lookup(const H5HF_dtable_t *dtable, hsize_t off, unsigned *row, unsigned *col)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dtable_lookup)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -201,7 +201,7 @@ HDfprintf(stderr, "%s: high_bit = %u, off_mask = %Hu\n", "H5HF_dtable_lookup", h
herr_t
H5HF_dtable_dest(H5HF_dtable_t *dtable)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dtable_dest)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -242,7 +242,7 @@ H5HF_dtable_size_to_row(const H5HF_dtable_t *dtable, size_t block_size)
{
unsigned row; /* Row where block will fit */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dtable_size_to_row)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -276,7 +276,7 @@ H5HF_dtable_size_to_rows(const H5HF_dtable_t *dtable, hsize_t size)
{
unsigned rows; /* # of rows required for indirect block */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dtable_size_to_rows)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -312,7 +312,7 @@ H5HF_dtable_span_size(const H5HF_dtable_t *dtable, unsigned start_row,
unsigned end_entry; /* Entry for last block covered */
hsize_t acc_span_size; /* Accumulated span size */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_dtable_span_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
diff --git a/src/H5HFhdr.c b/src/H5HFhdr.c
index 684c171..e4b89ba 100644
--- a/src/H5HFhdr.c
+++ b/src/H5HFhdr.c
@@ -112,7 +112,7 @@ H5HF_hdr_alloc(H5F_t *f)
H5HF_hdr_t *hdr = NULL; /* Shared fractal heap header */
H5HF_hdr_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_alloc)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -160,7 +160,7 @@ H5HF_hdr_compute_free_space(H5HF_hdr_t *hdr, unsigned iblock_row)
unsigned curr_row; /* Current row in block */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_hdr_compute_free_space)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -210,7 +210,7 @@ H5HF_hdr_finish_init_phase1(H5HF_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_finish_init_phase1)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -250,7 +250,7 @@ H5HF_hdr_finish_init_phase2(H5HF_hdr_t *hdr)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_finish_init_phase2)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -304,7 +304,7 @@ H5HF_hdr_finish_init(H5HF_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_finish_init)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -344,7 +344,7 @@ H5HF_hdr_create(H5F_t *f, hid_t dxpl_id, const H5HF_create_t *cparam)
size_t dblock_overhead; /* Direct block's overhead */
haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_create)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -535,7 +535,7 @@ H5HF_hdr_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw)
H5HF_hdr_t *hdr; /* Fractal heap header */
H5HF_hdr_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_protect)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -581,7 +581,7 @@ H5HF_hdr_incr(H5HF_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_incr)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@@ -617,7 +617,7 @@ H5HF_hdr_decr(H5HF_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_decr)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@@ -654,7 +654,7 @@ done:
herr_t
H5HF_hdr_fuse_incr(H5HF_hdr_t *hdr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_hdr_fuse_incr)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(hdr);
@@ -682,7 +682,7 @@ H5HF_hdr_fuse_incr(H5HF_hdr_t *hdr)
size_t
H5HF_hdr_fuse_decr(H5HF_hdr_t *hdr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_hdr_fuse_decr)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(hdr);
@@ -713,7 +713,7 @@ H5HF_hdr_dirty(H5HF_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_dirty)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@@ -751,7 +751,7 @@ H5HF_hdr_adj_free(H5HF_hdr_t *hdr, ssize_t amt)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_adj_free)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -789,7 +789,7 @@ H5HF_hdr_adjust_heap(H5HF_hdr_t *hdr, hsize_t new_size, hssize_t extra_free)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_adjust_heap)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -827,7 +827,7 @@ done:
herr_t
H5HF_hdr_inc_alloc(H5HF_hdr_t *hdr, size_t alloc_size)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_hdr_inc_alloc)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -860,7 +860,7 @@ H5HF_hdr_start_iter(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock, hsize_t curr_off,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_start_iter)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -898,7 +898,7 @@ H5HF_hdr_reset_iter(H5HF_hdr_t *hdr, hsize_t curr_off)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_reset_iter)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -938,7 +938,7 @@ H5HF_hdr_skip_blocks(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_indirect_t *iblock,
hsize_t sect_size; /* Size of section in heap space */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_skip_blocks)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -987,7 +987,7 @@ H5HF_hdr_update_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_size)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_update_iter)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1166,7 +1166,7 @@ H5HF_hdr_inc_iter(H5HF_hdr_t *hdr, hsize_t adv_size, unsigned nentries)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_inc_iter)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1210,7 +1210,7 @@ H5HF_hdr_reverse_iter(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr)
hbool_t walked_up; /* Loop flag */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_reverse_iter)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1351,7 +1351,7 @@ H5HF_hdr_empty(H5HF_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_empty)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@@ -1399,7 +1399,7 @@ H5HF_hdr_free(H5HF_hdr_t *hdr)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_hdr_free)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1442,7 +1442,7 @@ H5HF_hdr_delete(H5HF_hdr_t *hdr, hid_t dxpl_id)
unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting heap header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HF_hdr_delete, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
diff --git a/src/H5HFhuge.c b/src/H5HFhuge.c
index 7577583..3bbd137 100644
--- a/src/H5HFhuge.c
+++ b/src/H5HFhuge.c
@@ -108,7 +108,7 @@ H5HF_huge_bt2_create(H5HF_hdr_t *hdr, hid_t dxpl_id)
H5B2_create_t bt2_cparam; /* v2 B-tree creation parameters */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_bt2_create)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -185,7 +185,7 @@ done:
herr_t
H5HF_huge_init(H5HF_hdr_t *hdr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_huge_init)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -263,7 +263,7 @@ H5HF_huge_new_id(H5HF_hdr_t *hdr)
hsize_t new_id; /* New object's ID */
hsize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_new_id)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -316,7 +316,7 @@ H5HF_huge_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, void *obj,
unsigned filter_mask = 0; /* Filter mask for object (only used for filtered objects) */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_insert)
+ FUNC_ENTER_NOAPI_NOINIT
#ifdef QAK
HDfprintf(stderr, "%s: obj_size = %Zu\n", FUNC, obj_size);
#endif /* QAK */
@@ -511,7 +511,7 @@ H5HF_huge_get_obj_len(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_get_obj_len)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -607,7 +607,7 @@ H5HF_huge_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
unsigned filter_mask = 0; /* Filter mask for object (only used for filtered objects) */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_op_real)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -752,7 +752,7 @@ H5HF_huge_write(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
size_t obj_size; /* Object's size in the file */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_write)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -828,7 +828,7 @@ H5HF_huge_read(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, void *obj)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_read)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -865,7 +865,7 @@ H5HF_huge_op(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_op)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -902,7 +902,7 @@ H5HF_huge_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id)
H5HF_huge_remove_ud1_t udata; /* User callback data for v2 B-tree remove call */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_remove)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1010,7 +1010,7 @@ H5HF_huge_term(H5HF_hdr_t *hdr, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_term)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1076,7 +1076,7 @@ H5HF_huge_delete(H5HF_hdr_t *hdr, hid_t dxpl_id)
H5B2_remove_t op; /* Callback for v2 B-tree removal */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_huge_delete)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c
index 3bfa421..af79213 100644
--- a/src/H5HFiblock.c
+++ b/src/H5HFiblock.c
@@ -110,7 +110,7 @@ H5HF_iblock_pin(H5HF_indirect_t *iblock)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_iblock_pin)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(iblock);
@@ -168,7 +168,7 @@ H5HF_iblock_unpin(H5HF_indirect_t *iblock)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_iblock_unpin)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(iblock);
@@ -226,7 +226,7 @@ H5HF_iblock_incr(H5HF_indirect_t *iblock)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_iblock_incr)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(iblock);
@@ -263,7 +263,7 @@ H5HF_iblock_decr(H5HF_indirect_t *iblock)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_iblock_decr)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(iblock);
@@ -326,7 +326,7 @@ H5HF_iblock_dirty(H5HF_indirect_t *iblock)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_iblock_dirty)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(iblock);
@@ -365,7 +365,7 @@ H5HF_man_iblock_root_create(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_si
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iblock_root_create)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check for allocating entire root indirect block initially */
if(hdr->man_dtable.cparam.start_root_rows == 0)
@@ -500,7 +500,7 @@ H5HF_man_iblock_root_double(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_si
size_t u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iblock_root_double)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get "new block" iterator information */
if(H5HF_man_iter_curr(&hdr->next_block, &next_row, NULL, &next_entry, &iblock) < 0)
@@ -682,7 +682,7 @@ H5HF_man_iblock_root_halve(H5HF_indirect_t *iblock, hid_t dxpl_id)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iblock_root_halve)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(iblock);
@@ -816,7 +816,7 @@ H5HF_man_iblock_root_revert(H5HF_indirect_t *root_iblock, hid_t dxpl_id)
size_t dblock_size; /* Direct block's size */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iblock_root_revert)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -892,7 +892,7 @@ H5HF_man_iblock_alloc_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t **
hbool_t iblock_held = FALSE; /* Flag to indicate that indirect block is held */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iblock_alloc_row)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -956,7 +956,7 @@ H5HF_man_iblock_create(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_indirect_t *par_iblo
size_t u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iblock_create)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1092,7 +1092,7 @@ H5HF_man_iblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr,
hbool_t should_protect = FALSE; /* Whether we should protect the indirect block or not */
H5HF_indirect_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iblock_protect)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1192,7 +1192,7 @@ H5HF_man_iblock_unprotect(H5HF_indirect_t *iblock, hid_t dxpl_id,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iblock_unprotect)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1230,7 +1230,7 @@ H5HF_man_iblock_attach(H5HF_indirect_t *iblock, unsigned entry, haddr_t child_ad
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iblock_attach)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1295,7 +1295,7 @@ H5HF_man_iblock_detach(H5HF_indirect_t *iblock, hid_t dxpl_id, unsigned entry)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iblock_detach)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1396,7 +1396,7 @@ done:
herr_t
H5HF_man_iblock_entry_addr(H5HF_indirect_t *iblock, unsigned entry, haddr_t *child_addr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_man_iblock_entry_addr)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -1439,7 +1439,7 @@ H5HF_man_iblock_delete(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t iblock_addr,
hbool_t did_protect; /* Whether we protected the indirect block or not */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iblock_delete)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1539,7 +1539,7 @@ H5HF_man_iblock_size(H5F_t *f, hid_t dxpl_id, H5HF_hdr_t *hdr, haddr_t iblock_ad
hbool_t did_protect; /* Whether we protected the indirect block or not */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HF_man_iblock_size, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -1606,7 +1606,7 @@ H5HF_man_iblock_dest(H5HF_indirect_t *iblock)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iblock_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
diff --git a/src/H5HFiter.c b/src/H5HFiter.c
index f7178a1..0f2f7a4 100644
--- a/src/H5HFiter.c
+++ b/src/H5HFiter.c
@@ -95,7 +95,7 @@ H5FL_DEFINE(H5HF_block_loc_t);
herr_t
H5HF_man_iter_init(H5HF_block_iter_t *biter)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_man_iter_init)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -138,7 +138,7 @@ H5HF_man_iter_start_offset(H5HF_hdr_t *hdr, hid_t dxpl_id,
hbool_t root_block = TRUE; /* Flag to indicate the current block is the root indirect block */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iter_start_offset)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -281,7 +281,7 @@ done:
herr_t
H5HF_man_iter_set_entry(const H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, unsigned entry)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_man_iter_set_entry)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -318,7 +318,7 @@ H5HF_man_iter_start_entry(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter,
H5HF_block_loc_t *new_loc = NULL; /* Pointer to new block location */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iter_start_entry)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -376,7 +376,7 @@ H5HF_man_iter_reset(H5HF_block_iter_t *biter)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iter_reset)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -434,7 +434,7 @@ done:
herr_t
H5HF_man_iter_next(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, unsigned nentries)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_man_iter_next)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -473,7 +473,7 @@ H5HF_man_iter_up(H5HF_block_iter_t *biter)
H5HF_block_loc_t *up_loc; /* Pointer to 'up' block location */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iter_up)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -521,7 +521,7 @@ H5HF_man_iter_down(H5HF_block_iter_t *biter, H5HF_indirect_t *iblock)
H5HF_block_loc_t *down_loc = NULL; /* Pointer to new 'down' block location */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_iter_down)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -574,7 +574,7 @@ herr_t
H5HF_man_iter_curr(H5HF_block_iter_t *biter, unsigned *row, unsigned *col,
unsigned *entry, H5HF_indirect_t **block)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_man_iter_curr)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -614,7 +614,7 @@ H5HF_man_iter_offset(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, hsize_t *offset)
{
hsize_t curr_offset; /* For computing offset in heap */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_man_iter_offset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -652,7 +652,7 @@ H5HF_man_iter_offset(H5HF_hdr_t *hdr, H5HF_block_iter_t *biter, hsize_t *offset)
hbool_t
H5HF_man_iter_ready(H5HF_block_iter_t *biter)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_man_iter_ready)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
diff --git a/src/H5HFman.c b/src/H5HFman.c
index b1fb322..62f5580 100644
--- a/src/H5HFman.c
+++ b/src/H5HFman.c
@@ -116,7 +116,7 @@ H5HF_man_insert(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t obj_size, const void *obj
htri_t node_found; /* Whether an existing free list node was found */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_insert)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -246,7 +246,7 @@ H5HF_man_op_real(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
uint8_t *p; /* Temporary pointer to obj info in block */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_op_real)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -379,7 +379,7 @@ H5HF_man_read(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id, void *obj)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_read)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -416,7 +416,7 @@ H5HF_man_write(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_write)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -454,7 +454,7 @@ H5HF_man_op(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_op)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -499,7 +499,7 @@ H5HF_man_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, const uint8_t *id)
size_t blk_off; /* Offset of object in block */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_man_remove)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
diff --git a/src/H5HFsection.c b/src/H5HFsection.c
index e41f46d..38d9381 100644
--- a/src/H5HFsection.c
+++ b/src/H5HFsection.c
@@ -327,7 +327,7 @@ H5HF_sect_init_cls(H5FS_section_class_t *cls, H5HF_hdr_t *hdr)
H5HF_sect_private_t *cls_prvt; /* Pointer to class private info */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_init_cls)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(cls);
@@ -369,7 +369,7 @@ H5HF_sect_term_cls(H5FS_section_class_t *cls)
H5HF_sect_private_t *cls_prvt; /* Pointer to class private info */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_term_cls)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(cls);
@@ -410,7 +410,7 @@ H5HF_sect_node_new(unsigned sect_type, haddr_t sect_addr, hsize_t sect_size,
H5HF_free_section_t *new_sect; /* New section */
H5HF_free_section_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_node_new)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(H5F_addr_defined(sect_addr));
@@ -454,7 +454,7 @@ H5HF_sect_node_free(H5HF_free_section_t *sect, H5HF_indirect_t *iblock)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_node_free)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(sect);
@@ -491,7 +491,7 @@ H5HF_sect_single_new(hsize_t sect_off, size_t sect_size,
H5HF_free_section_t *sect = NULL; /* 'Single' free space section to add */
H5HF_free_section_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_single_new)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -545,7 +545,7 @@ H5HF_sect_single_locate_parent(H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t refresh,
hbool_t did_protect; /* Whether we protected the indirect block or not */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_single_locate_parent)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -604,7 +604,7 @@ H5HF_sect_single_revive(H5HF_hdr_t *hdr, hid_t dxpl_id,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_single_revive)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -653,7 +653,7 @@ H5HF_sect_single_dblock_info(H5HF_hdr_t *hdr, hid_t dxpl_id,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HF_sect_single_dblock_info, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
@@ -740,7 +740,7 @@ H5HF_sect_single_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_single_reduce)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -797,7 +797,7 @@ H5HF_sect_single_full_dblock(H5HF_hdr_t *hdr, hid_t dxpl_id,
size_t dblock_overhead; /* Direct block's overhead */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_single_full_dblock)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect);
@@ -853,7 +853,7 @@ H5HF_sect_single_add(H5FS_section_info_t *_sect, unsigned *flags, void *_udata)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_single_add)
+ FUNC_ENTER_NOAPI_NOINIT
/* Don't need to check section if we are deserializing, because it should
* have already been checked when it was first added
@@ -907,7 +907,7 @@ H5HF_sect_single_deserialize(const H5FS_section_class_t UNUSED *cls,
H5HF_free_section_t *new_sect; /* New section */
H5FS_section_info_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_single_deserialize)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(H5F_addr_defined(sect_addr));
@@ -949,7 +949,7 @@ H5HF_sect_single_can_merge(const H5FS_section_info_t *_sect1,
const H5HF_free_section_t *sect2 = (const H5HF_free_section_t *)_sect2; /* Fractal heap free section */
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_sect_single_can_merge)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(sect1);
@@ -997,7 +997,7 @@ H5HF_sect_single_merge(H5FS_section_info_t *_sect1, H5FS_section_info_t *_sect2,
hid_t dxpl_id = udata->dxpl_id; /* DXPL ID for operation */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_single_merge)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect1);
@@ -1054,7 +1054,7 @@ H5HF_sect_single_can_shrink(const H5FS_section_info_t *_sect, void *_udata)
H5HF_hdr_t *hdr = udata->hdr; /* Fractal heap header */
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_sect_single_can_shrink)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(sect);
@@ -1113,7 +1113,7 @@ H5HF_sect_single_shrink(H5FS_section_info_t **_sect, void UNUSED *_udata)
size_t dblock_size; /* Section's direct block's size */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_single_shrink)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect);
@@ -1175,7 +1175,7 @@ H5HF_sect_single_free(H5FS_section_info_t *_sect)
H5HF_indirect_t *parent = NULL; /* Parent indirect block for section */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_single_free)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect);
@@ -1214,7 +1214,7 @@ H5HF_sect_single_valid(const H5FS_section_class_t UNUSED *cls, const H5FS_sectio
{
const H5HF_free_section_t *sect = (const H5HF_free_section_t *)_sect; /* Pointer to section to check */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_sect_single_valid)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(sect);
@@ -1302,7 +1302,7 @@ H5HF_sect_row_create(haddr_t sect_off, hsize_t sect_size, hbool_t is_first,
H5HF_free_section_t *sect = NULL; /* 'Row' section created */
H5HF_free_section_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_row_create)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect_size);
@@ -1348,7 +1348,7 @@ H5HF_sect_row_from_single(H5HF_hdr_t *hdr, H5HF_free_section_t *sect,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_row_from_single)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1396,7 +1396,7 @@ H5HF_sect_row_revive(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_row_revive)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1438,7 +1438,7 @@ H5HF_sect_row_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect,
hbool_t alloc_from_start; /* Whether to allocate from the end of the row */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_row_reduce)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -1512,7 +1512,7 @@ H5HF_sect_row_first(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_row_first)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@@ -1554,7 +1554,7 @@ H5HF_sect_row_get_iblock(H5HF_free_section_t *sect)
{
H5HF_indirect_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_sect_row_get_iblock)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -1593,7 +1593,7 @@ H5HF_sect_row_init_cls(H5FS_section_class_t *cls, void *_udata)
H5HF_hdr_t *hdr = (H5HF_hdr_t *)_udata; /* Fractal heap header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_row_init_cls)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(cls);
@@ -1636,7 +1636,7 @@ H5HF_sect_row_term_cls(H5FS_section_class_t *cls)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_row_term_cls)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(cls);
@@ -1672,7 +1672,7 @@ H5HF_sect_row_serialize(const H5FS_section_class_t *cls,
const H5HF_free_section_t *sect = (const H5HF_free_section_t *)_sect;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_row_serialize)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(cls);
@@ -1716,7 +1716,7 @@ H5HF_sect_row_deserialize(const H5FS_section_class_t *cls, hid_t dxpl_id,
H5HF_hdr_t *hdr; /* Fractal heap header */
H5FS_section_info_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_row_deserialize)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(cls);
@@ -1760,7 +1760,7 @@ H5HF_sect_row_can_merge(const H5FS_section_info_t *_sect1,
H5HF_free_section_t *top_indir_sect1, *top_indir_sect2; /* Top indirect section for each row */
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_sect_row_can_merge)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(sect1);
@@ -1819,7 +1819,7 @@ H5HF_sect_row_merge(H5FS_section_info_t *_sect1, H5FS_section_info_t *_sect2,
hid_t dxpl_id = udata->dxpl_id; /* DXPL ID for operation */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_row_merge)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect1);
@@ -1885,7 +1885,7 @@ H5HF_sect_row_can_shrink(const H5FS_section_info_t *_sect, void UNUSED *_udata)
H5HF_hdr_t *hdr = udata->hdr; /* Fractal heap header */
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_sect_row_can_shrink)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(sect);
@@ -1924,7 +1924,7 @@ H5HF_sect_row_shrink(H5FS_section_info_t **_sect, void *_udata)
hid_t dxpl_id = udata->dxpl_id; /* DXPL ID for operation */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_row_shrink)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect);
@@ -1965,7 +1965,7 @@ H5HF_sect_row_free_real(H5HF_free_section_t *sect)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_row_free_real)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(sect);
@@ -1998,7 +1998,7 @@ H5HF_sect_row_free(H5FS_section_info_t *_sect)
H5HF_free_section_t *sect = (H5HF_free_section_t *)_sect; /* Pointer to section to free */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_row_free)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(sect);
HDassert(sect->u.row.under);
@@ -2038,7 +2038,7 @@ H5HF_sect_row_valid(const H5FS_section_class_t *cls, const H5FS_section_info_t *
const H5HF_free_section_t *indir_sect; /* Pointer to underlying indirect section */
unsigned indir_idx; /* Index of row in underlying indirect section's row array */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_sect_row_valid)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Basic sanity check */
HDassert(cls);
@@ -2096,7 +2096,7 @@ H5HF_sect_row_debug(const H5FS_section_info_t *_sect,
{
const H5HF_free_section_t *sect = (const H5HF_free_section_t *)_sect; /* Section to dump info */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_sect_row_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(sect);
@@ -2143,7 +2143,7 @@ H5HF_sect_indirect_iblock_off(const H5HF_free_section_t *sect)
{
hsize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_sect_indirect_iblock_off)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -2174,7 +2174,7 @@ H5HF_sect_indirect_top(H5HF_free_section_t *sect)
{
H5HF_free_section_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_sect_indirect_top)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -2210,7 +2210,7 @@ H5HF_sect_indirect_init_cls(H5FS_section_class_t *cls, void *_udata)
H5HF_hdr_t *hdr = (H5HF_hdr_t *)_udata; /* Fractal heap header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_indirect_init_cls)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(cls);
@@ -2247,7 +2247,7 @@ H5HF_sect_indirect_term_cls(H5FS_section_class_t *cls)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_indirect_term_cls)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(cls);
@@ -2283,7 +2283,7 @@ H5HF_sect_indirect_new(H5HF_hdr_t *hdr, haddr_t sect_off, hsize_t sect_size,
H5HF_free_section_t *sect = NULL; /* 'Indirect' free space section to add */
H5HF_free_section_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_indirect_new)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -2354,7 +2354,7 @@ H5HF_sect_indirect_for_row(H5HF_hdr_t *hdr, H5HF_indirect_t *iblock,
H5HF_free_section_t *sect = NULL; /* 'Indirect' free space section to add */
H5HF_free_section_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_indirect_for_row)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -2428,7 +2428,7 @@ H5HF_sect_indirect_init_rows(H5HF_hdr_t *hdr, hid_t dxpl_id,
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_indirect_init_rows)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -2670,7 +2670,7 @@ H5HF_sect_indirect_add(H5HF_hdr_t *hdr, hid_t dxpl_id,
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_indirect_add)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -2738,7 +2738,7 @@ H5HF_sect_indirect_decr(H5HF_free_section_t *sect)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_indirect_decr)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -2792,7 +2792,7 @@ H5HF_sect_indirect_revive_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_indirect_revive_row)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -2858,7 +2858,7 @@ H5HF_sect_indirect_revive(H5HF_hdr_t *hdr, hid_t dxpl_id,
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_indirect_revive)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -2927,7 +2927,7 @@ H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_
H5HF_free_section_t *peer_sect = NULL; /* Peer indirect section */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_indirect_reduce_row)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -3194,7 +3194,7 @@ H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *s
H5HF_free_section_t *peer_sect = NULL; /* Peer indirect section */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_indirect_reduce)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -3421,7 +3421,7 @@ H5HF_sect_indirect_is_first(H5HF_free_section_t *sect)
{
hbool_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_sect_indirect_is_first)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(sect);
@@ -3456,7 +3456,7 @@ H5HF_sect_indirect_first(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *se
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_indirect_first)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(hdr);
@@ -3506,7 +3506,7 @@ done:
static H5HF_indirect_t *
H5HF_sect_indirect_get_iblock(H5HF_free_section_t *sect)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_sect_indirect_get_iblock)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -3549,7 +3549,7 @@ H5HF_sect_indirect_merge_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_indirect_merge_row)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check parameters */
HDassert(hdr);
@@ -3786,7 +3786,7 @@ H5HF_sect_indirect_build_parent(H5HF_hdr_t *hdr, H5HF_free_section_t *sect)
unsigned par_entry; /* Entry within parent indirect section */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_indirect_build_parent)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check parameters */
HDassert(hdr);
@@ -3854,7 +3854,7 @@ H5HF_sect_indirect_shrink(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *s
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_indirect_shrink)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check parameters */
HDassert(hdr);
@@ -3911,7 +3911,7 @@ H5HF_sect_indirect_serialize(H5HF_hdr_t *hdr, const H5HF_free_section_t *sect,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_indirect_serialize)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -3978,7 +3978,7 @@ H5HF_sect_indirect_deserialize(H5HF_hdr_t *hdr, hid_t dxpl_id,
unsigned end_col; /* End column in indirect block */
H5FS_section_info_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_indirect_deserialize)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(hdr);
@@ -4048,7 +4048,7 @@ H5HF_sect_indirect_free(H5HF_free_section_t *sect)
H5HF_indirect_t *iblock = NULL; /* Indirect block for section */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_indirect_free)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(sect);
@@ -4097,7 +4097,7 @@ H5HF_sect_indirect_valid(const H5HF_hdr_t *hdr, const H5HF_free_section_t *sect)
unsigned end_entry; /* Entry for last block covered */
unsigned u; /* Local index variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_sect_indirect_valid)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check arguments */
HDassert(hdr);
@@ -4195,7 +4195,7 @@ static herr_t
H5HF_sect_indirect_debug(const H5HF_free_section_t *sect,
FILE *stream, int indent, int fwidth)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_sect_indirect_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(sect);
diff --git a/src/H5HFspace.c b/src/H5HFspace.c
index 7978a96..fd07679 100644
--- a/src/H5HFspace.c
+++ b/src/H5HFspace.c
@@ -110,7 +110,7 @@ H5HF_space_start(H5HF_hdr_t *hdr, hid_t dxpl_id, hbool_t may_create)
H5HF_FSPACE_SECT_CLS_INDIRECT};
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_space_start)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -171,7 +171,7 @@ H5HF_space_add(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *node,
H5HF_sect_add_ud1_t udata; /* User data for free space manager 'add' */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_space_add)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -218,7 +218,7 @@ H5HF_space_find(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t request, H5HF_free_secti
htri_t node_found = FALSE; /* Whether an existing free list node was found */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_space_find)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -264,7 +264,7 @@ H5HF_space_size(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t *fs_size)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_space_size)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -309,7 +309,7 @@ H5HF_space_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *node)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_space_remove)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -347,7 +347,7 @@ H5HF_space_close(H5HF_hdr_t *hdr, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_space_close)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -402,7 +402,7 @@ H5HF_space_delete(H5HF_hdr_t *hdr, hid_t dxpl_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_space_delete)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -438,7 +438,7 @@ H5HF_space_sect_change_class(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_space_sect_change_class)
+ FUNC_ENTER_NOAPI_NOINIT
#ifdef QAK
HDfprintf(stderr, "%s: Called\n", FUNC);
#endif /* QAK */
diff --git a/src/H5HFstat.c b/src/H5HFstat.c
index 2ab5240..b0e1987 100644
--- a/src/H5HFstat.c
+++ b/src/H5HFstat.c
@@ -86,7 +86,7 @@
herr_t
H5HF_stat_info(const H5HF_t *fh, H5HF_stat_t *stats)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_stat_info)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(fh);
@@ -131,7 +131,7 @@ H5HF_size(const H5HF_t *fh, hid_t dxpl_id, hsize_t *heap_size)
hsize_t meta_size = 0; /* free space storage size */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HF_size, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* Check arguments.
diff --git a/src/H5HFtest.c b/src/H5HFtest.c
index 30adf96..c2e9cb0 100644
--- a/src/H5HFtest.c
+++ b/src/H5HFtest.c
@@ -87,7 +87,7 @@
herr_t
H5HF_get_cparam_test(const H5HF_t *fh, H5HF_create_t *cparam)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_get_cparam_test)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(fh);
@@ -126,7 +126,7 @@ H5HF_cmp_cparam_test(const H5HF_create_t *cparam1, const H5HF_create_t *cparam2)
{
int ret_value = 0; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_cmp_cparam_test)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(cparam1);
@@ -246,7 +246,7 @@ H5HF_get_max_root_rows(const H5HF_t *fh)
{
unsigned ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_get_max_root_rows)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(fh);
@@ -277,7 +277,7 @@ H5HF_get_dtable_width_test(const H5HF_t *fh)
{
unsigned ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_get_dtable_width_test)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(fh);
@@ -308,7 +308,7 @@ H5HF_get_dtable_max_drows_test(const H5HF_t *fh)
{
unsigned ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_get_dtable_max_drows_test)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(fh);
@@ -343,7 +343,7 @@ H5HF_get_iblock_max_drows_test(const H5HF_t *fh, unsigned pos)
{
unsigned ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_get_iblock_max_drows_test)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(fh);
@@ -376,7 +376,7 @@ H5HF_get_dblock_size_test(const H5HF_t *fh, unsigned row)
{
hsize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_get_dblock_size_test)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(fh);
@@ -408,7 +408,7 @@ H5HF_get_dblock_free_test(const H5HF_t *fh, unsigned row)
{
hsize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_get_dblock_free_test)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(fh);
@@ -439,7 +439,7 @@ H5HF_get_id_off_test(const H5HF_t *fh, const void *_id, hsize_t *obj_off)
{
const uint8_t *id = (const uint8_t *)_id; /* Object ID */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_get_id_off_test)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(fh);
@@ -473,7 +473,7 @@ H5HF_get_id_type_test(const void *_id, unsigned char *obj_type)
{
const uint8_t *id = (const uint8_t *)_id; /* Object ID */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_get_id_type_test)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(id);
@@ -503,7 +503,7 @@ herr_t
H5HF_get_tiny_info_test(const H5HF_t *fh, size_t *max_len,
hbool_t *len_extended)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_get_tiny_info_test)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(fh);
@@ -535,7 +535,7 @@ H5HF_get_tiny_info_test(const H5HF_t *fh, size_t *max_len,
herr_t
H5HF_get_huge_info_test(const H5HF_t *fh, hsize_t *next_id, hbool_t *ids_direct)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_get_huge_info_test)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(fh);
diff --git a/src/H5HFtiny.c b/src/H5HFtiny.c
index f11b6c0..a4cbdc1 100644
--- a/src/H5HFtiny.c
+++ b/src/H5HFtiny.c
@@ -99,7 +99,7 @@ static herr_t H5HF_tiny_op_real(H5HF_hdr_t *hdr, const uint8_t *id,
herr_t
H5HF_tiny_init(H5HF_hdr_t *hdr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_tiny_init)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -150,7 +150,7 @@ H5HF_tiny_insert(H5HF_hdr_t *hdr, size_t obj_size, const void *obj, void *_id)
size_t enc_obj_size; /* Encoded object size */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_tiny_insert)
+ FUNC_ENTER_NOAPI_NOINIT
#ifdef QAK
HDfprintf(stderr, "%s: obj_size = %Zu\n", FUNC, obj_size);
#endif /* QAK */
@@ -213,7 +213,7 @@ H5HF_tiny_get_obj_len(H5HF_hdr_t *hdr, const uint8_t *id, size_t *obj_len_p)
{
size_t enc_obj_size; /* Encoded object size */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_tiny_get_obj_len)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -258,7 +258,7 @@ H5HF_tiny_op_real(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op,
size_t enc_obj_size; /* Encoded object size */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_tiny_op_real)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -316,7 +316,7 @@ H5HF_tiny_read(H5HF_hdr_t *hdr, const uint8_t *id, void *obj)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_tiny_read)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -353,7 +353,7 @@ H5HF_tiny_op(H5HF_hdr_t *hdr, const uint8_t *id, H5HF_operator_t op,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_tiny_op)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -390,7 +390,7 @@ H5HF_tiny_remove(H5HF_hdr_t *hdr, const uint8_t *id)
size_t enc_obj_size; /* Encoded object size */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HF_tiny_remove)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
diff --git a/src/H5HG.c b/src/H5HG.c
index 5feff8b..7c2b282 100644
--- a/src/H5HG.c
+++ b/src/H5HG.c
@@ -140,7 +140,7 @@ H5HG_create(H5F_t *f, hid_t dxpl_id, size_t size)
size_t n;
haddr_t ret_value = HADDR_UNDEF; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HG_create)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(f);
@@ -251,7 +251,7 @@ H5HG_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw)
H5HG_heap_t *heap; /* Global heap */
H5HG_heap_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HG_protect)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -298,7 +298,7 @@ H5HG_alloc(H5F_t *f, H5HG_heap_t *heap, size_t size, unsigned *heap_flags_ptr)
size_t need = H5HG_SIZEOF_OBJHDR(f) + H5HG_ALIGN(size);
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HG_alloc);
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(heap);
@@ -433,7 +433,7 @@ H5HG_extend(H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t need)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HG_extend)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(f);
@@ -524,7 +524,7 @@ H5HG_insert(H5F_t *f, hid_t dxpl_id, size_t size, void *obj, H5HG_t *hobj/*out*/
unsigned heap_flags = H5AC__NO_FLAGS_SET;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HG_insert, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
@@ -611,7 +611,7 @@ H5HG_read(H5F_t *f, hid_t dxpl_id, H5HG_t *hobj, void *object/*out*/,
void *orig_object = object; /* Keep a copy of the original object pointer */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5HG_read, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Check args */
HDassert(f);
@@ -683,7 +683,7 @@ H5HG_link(H5F_t *f, hid_t dxpl_id, const H5HG_t *hobj, int adjust)
unsigned heap_flags = H5AC__NO_FLAGS_SET;
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5HG_link, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
@@ -746,7 +746,7 @@ H5HG_remove (H5F_t *f, hid_t dxpl_id, H5HG_t *hobj)
unsigned flags = H5AC__NO_FLAGS_SET;/* Whether the heap gets deleted */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HG_remove, FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
@@ -829,7 +829,7 @@ H5HG_free(H5HG_heap_t *heap)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HG_free, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments */
HDassert(heap);
diff --git a/src/H5HGcache.c b/src/H5HGcache.c
index eb71dfb..5af753e 100644
--- a/src/H5HGcache.c
+++ b/src/H5HGcache.c
@@ -119,7 +119,7 @@ H5HG_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata)
size_t max_idx = 0; /* The maximum index seen */
H5HG_heap_t *ret_value = NULL; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HG_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -283,7 +283,7 @@ H5HG_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HG_heap_t *
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HG_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -323,7 +323,7 @@ H5HG_dest(H5F_t *f, H5HG_heap_t *heap)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HG_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(heap);
@@ -368,7 +368,7 @@ H5HG_clear(H5F_t *f, H5HG_heap_t *heap, hbool_t destroy)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5HG_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(heap);
@@ -402,7 +402,7 @@ done:
static herr_t
H5HG_size(const H5F_t UNUSED *f, const H5HG_heap_t *heap, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HG_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(heap);
diff --git a/src/H5HGdbg.c b/src/H5HGdbg.c
index c263155..74044cb 100644
--- a/src/H5HGdbg.c
+++ b/src/H5HGdbg.c
@@ -95,7 +95,7 @@ H5HG_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
uint8_t *p = NULL;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HG_debug, FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
diff --git a/src/H5HGquery.c b/src/H5HGquery.c
index ae0a2b7..a1b3777 100644
--- a/src/H5HGquery.c
+++ b/src/H5HGquery.c
@@ -87,8 +87,8 @@
haddr_t
H5HG_get_addr(const H5HG_heap_t *heap)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HG_get_addr)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(heap);
@@ -111,8 +111,8 @@ H5HG_get_addr(const H5HG_heap_t *heap)
size_t
H5HG_get_size(const H5HG_heap_t *heap)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HG_get_size)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(heap);
@@ -135,8 +135,8 @@ H5HG_get_size(const H5HG_heap_t *heap)
size_t
H5HG_get_free_size(const H5HG_heap_t *heap)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HG_get_free_size)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(heap);
diff --git a/src/H5HL.c b/src/H5HL.c
index e37eb9f..b1b5b24 100644
--- a/src/H5HL.c
+++ b/src/H5HL.c
@@ -118,7 +118,7 @@ H5HL_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, haddr_t *addr_p/*out*/)
hsize_t total_size; /* Total heap size on disk */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_create, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
@@ -215,7 +215,7 @@ H5HL_dblk_realloc(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t new_heap_size)
size_t old_heap_size; /* Old size of heap data block */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HL_dblk_realloc)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(heap);
@@ -325,7 +325,7 @@ H5HL_minimize_heap_space(H5F_t *f, hid_t dxpl_id, H5HL_t *heap)
size_t new_heap_size = heap->dblk_size; /* New size of heap */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_minimize_heap_space, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -451,7 +451,7 @@ H5HL_protect(H5F_t *f, hid_t dxpl_id, haddr_t addr, H5AC_protect_t rw)
unsigned dblk_cache_flags = H5AC__NO_FLAGS_SET; /* Cache flags for unprotecting data block entry */
H5HL_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_protect, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check arguments */
HDassert(f);
@@ -539,7 +539,7 @@ H5HL_offset_into(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_NOAPI_NOINIT"
*/
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_offset_into)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(heap);
@@ -568,7 +568,7 @@ H5HL_unprotect(H5HL_t *heap)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5HL_unprotect, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(heap);
@@ -617,7 +617,7 @@ done:
static H5HL_free_t *
H5HL_remove_free(H5HL_t *heap, H5HL_free_t *fl)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_remove_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(fl->prev)
fl->prev->next = fl->next;
@@ -650,7 +650,7 @@ H5HL_dirty(H5HL_t *heap)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HL_dirty)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(heap);
@@ -697,7 +697,7 @@ H5HL_insert(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t buf_size, const void *
hbool_t found;
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_insert, UFAIL)
+ FUNC_ENTER_NOAPI(UFAIL)
/* check arguments */
HDassert(f);
@@ -913,7 +913,7 @@ H5HL_remove(H5F_t *f, hid_t dxpl_id, H5HL_t *heap, size_t offset, size_t size)
H5HL_free_t *fl = NULL;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_remove, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
@@ -1064,7 +1064,7 @@ H5HL_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr)
unsigned cache_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting heap */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_delete, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
@@ -1139,7 +1139,7 @@ H5HL_get_size(H5F_t *f, hid_t dxpl_id, haddr_t addr, size_t *size)
H5HL_t *heap; /* Heap data structure */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_get_size, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
@@ -1191,7 +1191,7 @@ H5HL_heapsize(H5F_t *f, hid_t dxpl_id, haddr_t addr, hsize_t *heap_size)
H5HL_t *heap; /* Heap data structure */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_heapsize, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
diff --git a/src/H5HLcache.c b/src/H5HLcache.c
index 34673d5..aadae11 100644
--- a/src/H5HLcache.c
+++ b/src/H5HLcache.c
@@ -138,7 +138,7 @@ H5HL_fl_deserialize(H5HL_t *heap)
hsize_t free_block; /* Offset of free block */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HL_fl_deserialize)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(heap);
@@ -208,7 +208,7 @@ H5HL_fl_serialize(const H5HL_t *heap)
{
H5HL_free_t *fl; /* Pointer to heap free list node */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_fl_serialize)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(heap);
@@ -258,7 +258,7 @@ H5HL_prefix_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
haddr_t eoa; /* Relative end of file address */
H5HL_prfx_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HL_prefix_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -396,7 +396,7 @@ H5HL_prefix_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
uint8_t heap_buf[H5HL_SPEC_READ_SIZE]; /* Buffer for heap */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HL_prefix_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -497,7 +497,7 @@ H5HL_prefix_dest(H5F_t *f, void *thing)
H5HL_prfx_t *prfx = (H5HL_prfx_t *)thing; /* Local heap prefix to destroy */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HL_prefix_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(prfx);
@@ -553,7 +553,7 @@ H5HL_prefix_clear(H5F_t UNUSED *f, void *thing, hbool_t destroy)
H5HL_prfx_t *prfx = (H5HL_prfx_t *)thing; /* The local heap prefix to operate on */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HL_prefix_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(prfx);
@@ -589,7 +589,7 @@ H5HL_prefix_size(const H5F_t UNUSED *f, const void *thing, size_t *size_ptr)
{
const H5HL_prfx_t *prfx = (const H5HL_prfx_t *)thing; /* Pointer to local heap prefix to query */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_prefix_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(prfx);
@@ -628,7 +628,7 @@ H5HL_datablock_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
H5HL_cache_dblk_ud_t *udata = (H5HL_cache_dblk_ud_t *)_udata; /* User data for callback */
H5HL_dblk_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HL_datablock_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -694,7 +694,7 @@ H5HL_datablock_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
H5HL_dblk_t *dblk = (H5HL_dblk_t *)_thing; /* Pointer to the local heap data block */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HL_datablock_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -748,7 +748,7 @@ H5HL_datablock_dest(H5F_t *f, void *_thing)
H5HL_dblk_t *dblk = (H5HL_dblk_t *)_thing; /* Pointer to the local heap data block */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HL_datablock_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(dblk);
@@ -798,7 +798,7 @@ H5HL_datablock_clear(H5F_t *f, void *_thing, hbool_t destroy)
H5HL_dblk_t *dblk = (H5HL_dblk_t *)_thing; /* Pointer to the local heap data block */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5HL_datablock_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(dblk);
@@ -834,7 +834,7 @@ H5HL_datablock_size(const H5F_t UNUSED *f, const void *_thing, size_t *size_ptr)
{
const H5HL_dblk_t *dblk = (const H5HL_dblk_t *)_thing; /* Pointer to the local heap data block */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_datablock_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(dblk);
diff --git a/src/H5HLdbg.c b/src/H5HLdbg.c
index b8a8d35..29d5c82 100644
--- a/src/H5HLdbg.c
+++ b/src/H5HLdbg.c
@@ -60,7 +60,7 @@ H5HL_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE * stream, int indent, int
size_t amount_free = 0;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(f);
diff --git a/src/H5HLint.c b/src/H5HLint.c
index c6d6839..d5238eb 100644
--- a/src/H5HLint.c
+++ b/src/H5HLint.c
@@ -104,7 +104,7 @@ H5HL_new(size_t sizeof_size, size_t sizeof_addr, size_t prfx_size)
H5HL_t *heap = NULL; /* New local heap */
H5HL_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_new, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check arguments */
HDassert(sizeof_size > 0);
@@ -145,7 +145,7 @@ done:
static herr_t
H5HL_inc_rc(H5HL_t *heap)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_inc_rc)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(heap);
@@ -174,7 +174,7 @@ H5HL_inc_rc(H5HL_t *heap)
static herr_t
H5HL_dec_rc(H5HL_t *heap)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HL_dec_rc)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(heap);
@@ -206,7 +206,7 @@ H5HL_dec_rc(H5HL_t *heap)
herr_t
H5HL_dest(H5HL_t *heap)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5HL_dest)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(heap);
@@ -252,7 +252,7 @@ H5HL_prfx_new(H5HL_t *heap)
H5HL_prfx_t *prfx = NULL; /* New local heap prefix */
H5HL_prfx_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_prfx_new, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check arguments */
HDassert(heap);
@@ -296,7 +296,7 @@ H5HL_prfx_dest(H5HL_prfx_t *prfx)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_prfx_dest, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(prfx);
@@ -342,7 +342,7 @@ H5HL_dblk_new(H5HL_t *heap)
H5HL_dblk_t *dblk = NULL; /* New local heap data block */
H5HL_dblk_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_dblk_new, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check arguments */
HDassert(heap);
@@ -386,7 +386,7 @@ H5HL_dblk_dest(H5HL_dblk_t *dblk)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HL_dblk_dest, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check arguments */
HDassert(dblk);
diff --git a/src/H5HP.c b/src/H5HP.c
index ad76817..335fde2 100644
--- a/src/H5HP.c
+++ b/src/H5HP.c
@@ -88,7 +88,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_NOAPI_NOINIT_NOFUNC(H5HP_swim_max);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Get copies of the information about the object to move in the heap */
val=heap->heap[loc].val;
@@ -146,7 +146,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_NOAPI_NOINIT_NOFUNC(H5HP_swim_min);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Get copies of the information about the object to move in the heap */
val=heap->heap[loc].val;
@@ -204,7 +204,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_NOAPI_NOINIT_NOFUNC(H5HP_sink_max);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Get copies of the information about the object to move in the heap */
val=heap->heap[loc].val;
@@ -273,7 +273,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_NOAPI_NOINIT_NOFUNC(H5HP_sink_min);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Get copies of the information about the object to move in the heap */
val=heap->heap[loc].val;
@@ -339,7 +339,7 @@ H5HP_create(H5HP_type_t heap_type)
H5HP_t *new_heap=NULL; /* Pointer to new heap object created */
H5HP_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5HP_create,NULL);
+ FUNC_ENTER_NOAPI(NULL)
/* Check args */
assert(heap_type==H5HP_MIN_HEAP || heap_type==H5HP_MAX_HEAP);
@@ -413,7 +413,7 @@ H5HP_count(const H5HP_t *heap)
{
ssize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5HP_count);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(heap);
@@ -460,7 +460,7 @@ H5HP_insert(H5HP_t *heap, int val, void *obj)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HP_insert,FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
assert(heap);
@@ -539,7 +539,7 @@ done:
herr_t
H5HP_top(const H5HP_t *heap, int *val)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5HP_top);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(heap);
@@ -586,7 +586,7 @@ H5HP_remove(H5HP_t *heap, int *val, void **obj)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HP_remove,FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
assert(heap);
@@ -672,7 +672,7 @@ H5HP_change(H5HP_t *heap, int val, void *_obj)
int old_val; /* Object's old priority value */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HP_change,FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
assert(heap);
@@ -757,7 +757,7 @@ H5HP_incr(H5HP_t *heap, unsigned amt, void *_obj)
size_t obj_loc; /* Location of object in heap */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HP_incr,FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
assert(heap);
@@ -829,7 +829,7 @@ H5HP_decr(H5HP_t *heap, unsigned amt, void *_obj)
size_t obj_loc; /* Location of object in heap */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5HP_decr,FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
assert(heap);
@@ -896,7 +896,7 @@ done:
herr_t
H5HP_close(H5HP_t *heap)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5HP_close)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(heap);
diff --git a/src/H5I.c b/src/H5I.c
index 79a53f0..13a07f9 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -154,7 +154,7 @@ DESCRIPTION
static herr_t
H5I_init_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5I_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5I_init_interface() */
@@ -183,7 +183,7 @@ H5I_term_interface(void)
H5I_type_t type;
int n = 0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5I_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(H5_interface_initialize_g) {
/* How many types are still being used? */
@@ -235,7 +235,7 @@ H5Iregister_type(size_t hash_size, unsigned reserved, H5I_free_t free_func)
{
H5I_type_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Iregister_type, H5I_BADID)
+ FUNC_ENTER_API(H5I_BADID)
H5TRACE3("It", "zIux", hash_size, reserved, free_func);
/* Call H5I_register_type with a value of 0 to get a new type */
@@ -277,7 +277,7 @@ H5I_register_type(H5I_type_t type_id, size_t hash_size, unsigned reserved,
H5I_id_type_t *type_ptr = NULL; /*ptr to the atomic type*/
H5I_type_t ret_value = H5I_BADID; /* type ID to return */
- FUNC_ENTER_NOAPI(H5I_register_type, H5I_BADID)
+ FUNC_ENTER_NOAPI(H5I_BADID)
/* Check that type_id is either a library type or zero */
if(type_id < 0 || type_id >= H5I_NTYPES)
@@ -389,7 +389,7 @@ H5Itype_exists(H5I_type_t type)
{
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_API(H5Itype_exists, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("t", "It", type);
if(type <= H5I_BADID || type >= H5I_next_type)
@@ -425,7 +425,7 @@ H5Inmembers(H5I_type_t type, hsize_t *num_members)
{
int ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Inmembers, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "It*h", type, num_members);
if(H5I_IS_LIB_TYPE(type))
@@ -475,7 +475,7 @@ H5I_nmembers(H5I_type_t type)
H5I_id_type_t *type_ptr = NULL;
int ret_value;
- FUNC_ENTER_NOAPI(H5I_nmembers, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if(type <= H5I_BADID || type >= H5I_next_type)
HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
@@ -511,7 +511,7 @@ H5Iclear_type(H5I_type_t type, hbool_t force)
{
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Iclear_type, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "Itb", type, force);
if(H5I_IS_LIB_TYPE(type))
@@ -564,7 +564,7 @@ H5I_clear_type(H5I_type_t type, hbool_t force, hbool_t app_ref)
unsigned i; /* Local index variable */
int ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5I_clear_type, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if(type <= H5I_BADID || type >= H5I_next_type)
HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
@@ -701,7 +701,7 @@ H5Idestroy_type(H5I_type_t type)
{
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Idestroy_type, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "It", type);
if(H5I_IS_LIB_TYPE(type))
@@ -735,7 +735,7 @@ H5I_destroy_type(H5I_type_t type)
H5I_id_type_t *type_ptr; /* ptr to the atomic type */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5I_destroy_type, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if(type <= H5I_BADID || type >= H5I_next_type)
HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
@@ -776,7 +776,7 @@ H5Iregister(H5I_type_t type, const void *object)
{
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Iregister, H5I_INVALID_HID)
+ FUNC_ENTER_API(H5I_INVALID_HID)
H5TRACE2("i", "It*x", type, object);
if(H5I_IS_LIB_TYPE(type))
@@ -825,7 +825,7 @@ H5I_register(H5I_type_t type, const void *object, hbool_t app_ref)
unsigned i; /*counter */
hid_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOAPI(H5I_register, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments */
if(type <= H5I_BADID || type >= H5I_next_type)
@@ -950,7 +950,7 @@ H5I_subst(hid_t id, const void *new_object)
H5I_id_info_t *id_ptr; /* Ptr to the atom */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_subst, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* General lookup of the ID */
if(NULL == (id_ptr = H5I_find_id(id)))
@@ -987,7 +987,7 @@ H5I_object(hid_t id)
H5I_id_info_t *id_ptr; /*ptr to the new atom */
void *ret_value = NULL; /*return value */
- FUNC_ENTER_NOAPI(H5I_object, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* General lookup of the ID */
if(NULL != (id_ptr = H5I_find_id(id))) {
@@ -1023,7 +1023,7 @@ H5Iobject_verify(hid_t id, H5I_type_t id_type)
{
void * ret_value; /* Return value */
- FUNC_ENTER_API(H5Iobject_verify, NULL)
+ FUNC_ENTER_API(NULL)
if(H5I_IS_LIB_TYPE(id_type))
HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, NULL, "cannot call public function on library type")
@@ -1059,7 +1059,7 @@ H5I_object_verify(hid_t id, H5I_type_t id_type)
H5I_id_info_t *id_ptr = NULL; /*ptr to the new atom */
void *ret_value = NULL; /*return value */
- FUNC_ENTER_NOAPI(H5I_object_verify, NULL)
+ FUNC_ENTER_NOAPI(NULL)
HDassert(id_type >= 1 && id_type < H5I_next_type);
@@ -1096,7 +1096,7 @@ H5I_get_type(hid_t id)
{
H5I_type_t ret_value = H5I_BADID;
- FUNC_ENTER_NOAPI(H5I_get_type, H5I_BADID)
+ FUNC_ENTER_NOAPI(H5I_BADID)
if(id > 0)
ret_value = H5I_TYPE(id);
@@ -1128,7 +1128,7 @@ H5Iget_type(hid_t id)
{
H5I_type_t ret_value = H5I_BADID; /* Return value */
- FUNC_ENTER_API(H5Iget_type, H5I_BADID)
+ FUNC_ENTER_API(H5I_BADID)
H5TRACE1("It", "i", id);
ret_value = H5I_get_type(id);
@@ -1163,7 +1163,7 @@ H5Iremove_verify(hid_t id, H5I_type_t id_type)
{
void * ret_value; /* Return value */
- FUNC_ENTER_API(H5Iremove_verify, NULL)
+ FUNC_ENTER_API(NULL)
if(H5I_IS_LIB_TYPE(id_type))
HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, NULL, "cannot call public function on library type")
@@ -1197,7 +1197,7 @@ H5I_remove_verify(hid_t id, H5I_type_t id_type)
{
void * ret_value = NULL; /*return value */
- FUNC_ENTER_NOAPI(H5I_remove_verify, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Argument checking will be performed by H5I_remove() */
@@ -1236,7 +1236,7 @@ H5I_remove(hid_t id)
unsigned hash_loc; /*atom's hash table location */
void * ret_value = NULL; /*return value */
- FUNC_ENTER_NOAPI(H5I_remove, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Check arguments */
type = H5I_TYPE(id);
@@ -1328,7 +1328,7 @@ H5Idec_ref(hid_t id)
{
int ret_value; /* Return value */
- FUNC_ENTER_API(H5Idec_ref, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Is", "i", id);
/* Check arguments */
@@ -1369,7 +1369,7 @@ H5I_dec_ref(hid_t id)
H5I_id_info_t *id_ptr; /*ptr to the new ID */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_dec_ref, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(id >= 0);
@@ -1440,7 +1440,7 @@ H5I_dec_app_ref(hid_t id)
H5I_id_info_t *id_ptr; /*ptr to the new ID */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_dec_app_ref, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(id >= 0);
@@ -1487,7 +1487,7 @@ H5I_dec_app_ref_always_close(hid_t id)
{
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_dec_app_ref_always_close, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(id >= 0);
@@ -1531,7 +1531,7 @@ H5Iinc_ref(hid_t id)
{
int ret_value; /* Return value */
- FUNC_ENTER_API(H5Iinc_ref, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Is", "i", id);
/* Check arguments */
@@ -1575,7 +1575,7 @@ H5I_inc_ref(hid_t id, hbool_t app_ref)
H5I_id_info_t *id_ptr; /*ptr to the ID */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_inc_ref, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(id >= 0);
@@ -1623,7 +1623,7 @@ H5Iget_ref(hid_t id)
{
int ret_value; /* Return value */
- FUNC_ENTER_API(H5Iget_ref, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Is", "i", id);
/* Check arguments */
@@ -1667,7 +1667,7 @@ H5I_get_ref(hid_t id, hbool_t app_ref)
H5I_id_info_t *id_ptr; /*ptr to the ID */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_get_ref, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(id >= 0);
@@ -1711,7 +1711,7 @@ H5Iinc_type_ref(H5I_type_t type)
{
int ret_value; /* Return value */
- FUNC_ENTER_API(H5Iinc_type_ref, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Is", "It", type);
/* Check arguments */
@@ -1750,7 +1750,7 @@ H5I_inc_type_ref(H5I_type_t type)
H5I_id_type_t *type_ptr; /* ptr to the type */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_inc_type_ref, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(type > 0 && type < H5I_next_type);
@@ -1795,7 +1795,7 @@ H5Idec_type_ref(H5I_type_t type)
{
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Idec_type_ref, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "It", type);
if(H5I_IS_LIB_TYPE(type))
@@ -1834,7 +1834,7 @@ H5I_dec_type_ref(H5I_type_t type)
H5I_id_type_t *type_ptr; /* Pointer to the ID type */
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_dec_type_ref, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if(type <= H5I_BADID || type >= H5I_next_type)
HGOTO_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid type number")
@@ -1882,7 +1882,7 @@ H5Iget_type_ref(H5I_type_t type)
{
int ret_value; /* Return value */
- FUNC_ENTER_API(H5Iget_type_ref, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Is", "It", type);
/* Check arguments */
@@ -1922,7 +1922,7 @@ H5I_get_type_ref(H5I_type_t type)
H5I_id_type_t *type_ptr; /*ptr to the type */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_get_type_ref, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(type >= 0);
@@ -1961,7 +1961,7 @@ H5Iis_valid(hid_t id)
H5I_id_info_t *id_ptr; /* ptr to the ID */
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_API(H5Iis_valid, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("t", "i", id);
/* Find the ID */
@@ -2006,7 +2006,7 @@ H5Isearch(H5I_type_t type, H5I_search_func_t func, void *key)
{
void * ret_value; /* Return value */
- FUNC_ENTER_API(H5Isearch, NULL)
+ FUNC_ENTER_API(NULL)
if(H5I_IS_LIB_TYPE(type))
HGOTO_ERROR(H5E_ATOM, H5E_BADGROUP, NULL, "cannot call public function on library type")
@@ -2051,7 +2051,7 @@ H5I_search(H5I_type_t type, H5I_search_func_t func, void *key, hbool_t app_ref)
H5I_id_type_t *type_ptr; /*ptr to the type */
void *ret_value = NULL; /*return value */
- FUNC_ENTER_NOAPI(H5I_search, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Check arguments */
if(type <= H5I_BADID || type >= H5I_next_type)
@@ -2109,7 +2109,7 @@ H5I_find_id(hid_t id)
unsigned hash_loc; /*bucket pointer */
H5I_id_info_t *ret_value; /*return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5I_find_id)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
type = H5I_TYPE(id);
@@ -2179,7 +2179,7 @@ H5Iget_name(hid_t id, char *name/*out*/, size_t size)
H5G_loc_t loc; /* Object location */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Iget_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("Zs", "ixz", id, name, size);
/* Get object location */
@@ -2215,7 +2215,7 @@ H5Iget_file_id(hid_t obj_id)
{
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Iget_file_id, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", obj_id);
if((ret_value = H5I_get_file_id(obj_id, TRUE)) < 0)
@@ -2246,7 +2246,7 @@ H5I_get_file_id(hid_t obj_id, hbool_t app_ref)
H5I_type_t type; /* ID type */
hid_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5I_get_file_id)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get object type */
type = H5I_TYPE(obj_id);
@@ -2301,7 +2301,7 @@ H5I_debug(H5I_type_t type)
unsigned int iu;
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
fprintf(stderr, "Dumping ID type %d\n", (int)type);
type_ptr = H5I_id_type_list_g[type];
diff --git a/src/H5Itest.c b/src/H5Itest.c
index 1c6892d..5236e8d 100644
--- a/src/H5Itest.c
+++ b/src/H5Itest.c
@@ -82,7 +82,7 @@ H5I_get_name_test(hid_t id, char *name/*out*/, size_t size, hbool_t *cached)
H5G_loc_t loc; /* Object location */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5I_get_name_test, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Get object location */
if(H5G_loc(id, &loc) < 0)
diff --git a/src/H5L.c b/src/H5L.c
index bdfae2e..fff14e5 100644
--- a/src/H5L.c
+++ b/src/H5L.c
@@ -17,7 +17,6 @@
/* Module Setup */
/****************/
-#define H5G_PACKAGE /*suppress error about including H5Gpkg */
#define H5L_PACKAGE /*suppress error about including H5Lpkg */
/* Interface initialization */
@@ -30,8 +29,8 @@
#include "H5ACprivate.h" /* Metadata cache */
#include "H5Dprivate.h" /* Datasets */
#include "H5Eprivate.h" /* Error handling */
-#include "H5Gpkg.h" /* Groups */
#include "H5Fprivate.h" /* File access */
+#include "H5Gprivate.h" /* Groups */
#include "H5Iprivate.h" /* IDs */
#include "H5Lpkg.h" /* Links */
#include "H5MMprivate.h" /* Memory management */
@@ -227,7 +226,7 @@ H5L_init(void)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5L_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
@@ -252,7 +251,7 @@ H5L_init_interface(void)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT
/* Initialize user-defined link classes */
if(H5L_register_external() < 0)
@@ -280,7 +279,7 @@ H5L_term_interface(void)
{
int n = 0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5L_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Free the table of link types */
H5L_table_g = (H5L_class_t *)H5MM_xfree(H5L_table_g);
@@ -318,7 +317,7 @@ H5Lmove(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
H5G_loc_t dst_loc, *dst_loc_p;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Lmove, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name, lcpl_id,
lapl_id);
@@ -376,7 +375,7 @@ H5Lcopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
H5G_loc_t dst_loc, *dst_loc_p;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Lcopy, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name, lcpl_id,
lapl_id);
@@ -437,7 +436,7 @@ H5Lcreate_soft(const char *link_target,
H5G_loc_t link_loc; /* Group location for new link */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Lcreate_soft, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "*si*sii", link_target, link_loc_id, link_name, lcpl_id, lapl_id);
/* Check arguments */
@@ -483,7 +482,7 @@ H5Lcreate_hard(hid_t cur_loc_id, const char *cur_name,
H5G_loc_t new_loc, *new_loc_p;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Lcreate_hard, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "i*si*sii", cur_loc_id, cur_name, new_loc_id, new_name, lcpl_id,
lapl_id);
@@ -552,7 +551,7 @@ H5Lcreate_ud(hid_t link_loc_id, const char *link_name, H5L_type_t link_type,
H5G_loc_t link_loc;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Lcreate_ud, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE7("e", "i*sLl*xzii", link_loc_id, link_name, link_type, udata,
udata_size, lcpl_id, lapl_id);
@@ -596,7 +595,7 @@ H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id)
H5G_loc_t loc; /* Group's location */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Ldelete, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*si", loc_id, name, lapl_id);
/* Check arguments */
@@ -641,7 +640,7 @@ H5Ldelete_by_idx(hid_t loc_id, const char *group_name,
H5L_trav_rmbi_t udata; /* User data for callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Ldelete_by_idx, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "i*sIiIohi", loc_id, group_name, idx_type, order, n, lapl_id);
/* Check arguments */
@@ -700,7 +699,7 @@ H5Lget_val(hid_t loc_id, const char *name, void *buf/*out*/, size_t size,
H5G_loc_t loc; /* Group location for location to query */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Lget_val, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "i*sxzi", loc_id, name, buf, size, lapl_id);
/* Check arguments */
@@ -750,7 +749,7 @@ H5Lget_val_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
H5L_trav_gvbi_t udata; /* User data for callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Lget_val_by_idx, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE8("e", "i*sIiIohxzi", loc_id, group_name, idx_type, order, n, buf, size,
lapl_id);
@@ -806,7 +805,7 @@ H5Lexists(hid_t loc_id, const char *name, hid_t lapl_id)
H5G_loc_t loc;
htri_t ret_value;
- FUNC_ENTER_API(H5Lexists, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("t", "i*si", loc_id, name, lapl_id);
/* Check arguments */
@@ -850,7 +849,7 @@ H5Lget_info(hid_t loc_id, const char *name, H5L_info_t *linfo /*out*/,
H5G_loc_t loc;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_API(H5Lget_info, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*sxi", loc_id, name, linfo, lapl_id);
/* Check arguments */
@@ -896,7 +895,7 @@ H5Lget_info_by_idx(hid_t loc_id, const char *group_name,
H5L_trav_gibi_t udata; /* User data for callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Lget_info_by_idx, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE7("e", "i*sIiIohxi", loc_id, group_name, idx_type, order, n, linfo,
lapl_id);
@@ -956,7 +955,7 @@ H5Lregister(const H5L_class_t *cls)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Lregister, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "*x", cls);
/* Check args */
@@ -1003,7 +1002,7 @@ H5Lunregister(H5L_type_t id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Lunregister, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "Ll", id);
/* Check args */
@@ -1040,7 +1039,7 @@ H5Lis_registered(H5L_type_t id)
size_t i; /* Local index variable */
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_API(H5Lis_registered, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("t", "Ll", id);
/* Check args */
@@ -1085,7 +1084,7 @@ H5Lget_name_by_idx(hid_t loc_id, const char *group_name,
H5L_trav_gnbi_t udata; /* User data for callback */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Lget_name_by_idx, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE8("Zs", "i*sIiIohxzi", loc_id, group_name, idx_type, order, n, name, size,
lapl_id);
@@ -1157,7 +1156,7 @@ H5Literate(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order,
hsize_t idx; /* Internal location to hold index */
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Literate, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "iIiIo*hx*x", grp_id, idx_type, order, idx_p, op, op_data);
/* Check arguments */
@@ -1224,7 +1223,7 @@ H5Literate_by_name(hid_t loc_id, const char *group_name,
hsize_t idx; /* Internal location to hold index */
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Literate_by_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE8("e", "i*sIiIo*hx*xi", loc_id, group_name, idx_type, order, idx_p, op,
op_data, lapl_id);
@@ -1299,7 +1298,7 @@ H5Lvisit(hid_t grp_id, H5_index_t idx_type, H5_iter_order_t order,
H5I_type_t id_type; /* Type of ID */
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Lvisit, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "iIiIox*x", grp_id, idx_type, order, op, op_data);
/* Check args */
@@ -1356,7 +1355,7 @@ H5Lvisit_by_name(hid_t loc_id, const char *group_name, H5_index_t idx_type,
{
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Lvisit_by_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE7("e", "i*sIiIox*xi", loc_id, group_name, idx_type, order, op, op_data,
lapl_id);
@@ -1413,7 +1412,7 @@ H5L_find_class_idx(H5L_type_t id)
size_t i; /* Local index variable */
int ret_value = FAIL; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5L_find_class_idx)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
for(i = 0; i < H5L_table_used_g; i++)
if(H5L_table_g[i].id == id)
@@ -1444,7 +1443,7 @@ H5L_find_class(H5L_type_t id)
int idx; /* Filter index in global table */
H5L_class_t *ret_value = NULL; /* Return value */
- FUNC_ENTER_NOAPI(H5L_find_class, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Get the index in the global table */
if((idx = H5L_find_class_idx(id)) < 0)
@@ -1479,7 +1478,7 @@ H5L_register(const H5L_class_t *cls)
size_t i; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5L_register, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(cls);
HDassert(cls->id >= 0 && cls->id <= H5L_TYPE_MAX);
@@ -1532,7 +1531,7 @@ H5L_unregister(H5L_type_t id)
size_t i; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5L_unregister, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(id >= 0 && id <= H5L_TYPE_MAX);
@@ -1575,7 +1574,7 @@ H5L_link(const H5G_loc_t *new_loc, const char *new_name, H5G_loc_t *obj_loc,
H5O_link_t lnk; /* Link to insert */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_link)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(new_loc);
@@ -1619,7 +1618,7 @@ H5L_link_object(const H5G_loc_t *new_loc, const char *new_name,
H5O_link_t lnk; /* Link to insert */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_link_object)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(new_loc);
@@ -1667,7 +1666,7 @@ H5L_link_cb(H5G_loc_t *grp_loc/*in*/, const char *name, const H5O_link_t UNUSED
hbool_t obj_created = FALSE; /* Whether an object was created (through a hard link) */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_link_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check if the name in this group resolved to a valid location */
/* (which is not what we want) */
@@ -1830,7 +1829,7 @@ H5L_create_real(const H5G_loc_t *link_loc, const char *link_name,
H5L_trav_cr_t udata; /* User data for callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_create_real)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(link_loc);
@@ -1917,7 +1916,7 @@ H5L_create_hard(H5G_loc_t *cur_loc, const char *cur_name,
hbool_t loc_valid = FALSE;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5L_create_hard, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(cur_loc);
@@ -1985,7 +1984,7 @@ H5L_create_soft(const char *target_path, const H5G_loc_t *link_loc,
H5O_link_t lnk; /* Link to insert */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5L_create_soft, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(link_loc);
@@ -2034,7 +2033,7 @@ H5L_create_ud(const H5G_loc_t *link_loc, const char *link_name,
H5O_link_t lnk; /* Link to insert */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_create_ud)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(type >= H5L_TYPE_UD_MIN && type <= H5L_TYPE_MAX);
@@ -2089,7 +2088,7 @@ H5L_get_val_real(const H5O_link_t *lnk, void *buf, size_t size)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_get_val_real)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(lnk);
@@ -2147,7 +2146,7 @@ H5L_get_val_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char *name, const H5O_link
H5L_trav_gv_t *udata = (H5L_trav_gv_t *)_udata; /* User data passed in */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_get_val_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check if the name in this group resolved to a valid link */
if(lnk == NULL)
@@ -2192,7 +2191,7 @@ H5L_get_val(H5G_loc_t *loc, const char *name, void *buf/*out*/, size_t size,
H5L_trav_gv_t udata; /* User data for callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5L_get_val, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(loc);
@@ -2234,7 +2233,7 @@ H5L_get_val_by_idx_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
hbool_t lnk_copied = FALSE; /* Whether the link was copied */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_get_val_by_idx_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check if the name of the group resolved to a valid object */
if(obj_loc == NULL)
@@ -2283,7 +2282,7 @@ H5L_delete_cb(H5G_loc_t *grp_loc/*in*/, const char *name, const H5O_link_t *lnk,
H5L_trav_rm_t *udata = (H5L_trav_rm_t *)_udata; /* User data passed in */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5L_delete_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check if the group resolved to a valid link */
if(grp_loc == NULL)
@@ -2329,7 +2328,7 @@ H5L_delete(H5G_loc_t *loc, const char *name, hid_t lapl_id, hid_t dxpl_id)
char *norm_name = NULL; /* Pointer to normalized name */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5L_delete, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(loc);
@@ -2373,7 +2372,7 @@ H5L_delete_by_idx_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
H5L_trav_gvbi_t *udata = (H5L_trav_gvbi_t *)_udata; /* User data passed in */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_delete_by_idx_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check if the name of the group resolved to a valid object */
if(obj_loc == NULL)
@@ -2419,7 +2418,7 @@ H5L_move_dest_cb(H5G_loc_t *grp_loc/*in*/, const char *name,
hbool_t temp_loc_init = FALSE;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_move_dest_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Make sure an object with this name doesn't already exist */
if(obj_loc != NULL)
@@ -2531,7 +2530,7 @@ H5L_move_cb(H5G_loc_t *grp_loc/*in*/, const char *name, const H5O_link_t *lnk,
hbool_t link_copied = FALSE; /* Has udata_out.lnk been allocated? */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_move_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check if the name in this group resolved to a valid link */
if(obj_loc == NULL)
@@ -2650,7 +2649,7 @@ H5L_move(H5G_loc_t *src_loc, const char *src_name, H5G_loc_t *dst_loc,
hid_t lapl_copy; /* Copy of lapl for this function */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_move)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(src_loc);
@@ -2728,7 +2727,7 @@ H5L_exists_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
{
hbool_t *udata = (hbool_t *)_udata; /* User data passed in */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5L_exists_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check if the name in this group resolved to a valid link */
*udata = (hbool_t)(lnk != NULL);
@@ -2759,7 +2758,7 @@ H5L_exists(const H5G_loc_t *loc, const char *name, hid_t lapl_id, hid_t dxpl_id)
hbool_t exists = FALSE; /* Whether the link exists in the group */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_exists)
+ FUNC_ENTER_NOAPI_NOINIT
/* Traverse the group hierarchy to locate the object to get info about */
if(H5G_traverse(loc, name, H5G_TARGET_SLINK|H5G_TARGET_UDLINK, H5L_exists_cb, &exists, lapl_id, dxpl_id) < 0)
@@ -2793,7 +2792,7 @@ H5L_get_info_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
H5L_trav_gi_t *udata = (H5L_trav_gi_t *)_udata; /* User data passed in */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_get_info_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check if the name in this group resolved to a valid link */
if(lnk == NULL)
@@ -2831,7 +2830,7 @@ H5L_get_info(const H5G_loc_t *loc, const char *name,
H5L_trav_gi_t udata; /* User data for callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5L_get_info, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
udata.linfo = linfo;
udata.dxpl_id = dxpl_id;
@@ -2868,7 +2867,7 @@ H5L_get_info_by_idx_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
hbool_t lnk_copied = FALSE; /* Whether the link was copied */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_get_info_by_idx_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check if the name of the group resolved to a valid object */
if(obj_loc == NULL)
@@ -2916,7 +2915,7 @@ H5L_get_default_lcpl(void)
{
hid_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5L_get_default_lcpl, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
ret_value = H5P_LINK_CREATE_DEFAULT;
@@ -2946,7 +2945,7 @@ H5L_get_name_by_idx_cb(H5G_loc_t UNUSED *grp_loc/*in*/, const char UNUSED *name,
H5L_trav_gnbi_t *udata = (H5L_trav_gnbi_t *)_udata; /* User data passed in */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_get_name_by_idx_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check if the name of the group resolved to a valid object */
if(obj_loc == NULL)
@@ -2965,3 +2964,137 @@ done:
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5L_get_name_by_idx_cb() */
+
+/*-------------------------------------------------------------------------
+ * Function: H5L_link_copy_file
+ *
+ * Purpose: Copy a link and the object it points to from one file to
+ * another.
+ *
+ * Return: Non-negative on success/Negative on failure
+ *
+ * Programmer: Quincey Koziol
+ * koziol@hdfgroup.org
+ * Sep 29 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5L_link_copy_file(H5F_t *dst_file, hid_t dxpl_id, const H5O_link_t *_src_lnk,
+ const H5O_loc_t *src_oloc, H5O_link_t *dst_lnk, H5O_copy_t *cpy_info)
+{
+ H5O_link_t tmp_src_lnk; /* Temporary copy of src link, when needed */
+ const H5O_link_t *src_lnk = _src_lnk; /* Source link */
+ hbool_t dst_lnk_init = FALSE; /* Whether the destination link is initialized */
+ hbool_t expanded_link_open = FALSE; /* Whether the target location has been opened */
+ H5G_loc_t tmp_src_loc; /* Group location holding target object */
+ H5G_name_t tmp_src_path; /* Path for target object */
+ H5O_loc_t tmp_src_oloc; /* Object location for target object */
+ herr_t ret_value = SUCCEED; /* Return value */
+
+ FUNC_ENTER_NOAPI(FAIL)
+
+ /* check arguments */
+ HDassert(dst_file);
+ HDassert(src_lnk);
+ HDassert(dst_lnk);
+ HDassert(cpy_info);
+
+ /* Expand soft or external link, if requested */
+ if((H5L_TYPE_SOFT == src_lnk->type && cpy_info->expand_soft_link)
+ || (H5L_TYPE_EXTERNAL == src_lnk->type
+ && cpy_info->expand_ext_link)) {
+ H5G_loc_t lnk_grp_loc; /* Group location holding link */
+ H5G_name_t lnk_grp_path; /* Path for link */
+ htri_t tar_exists; /* Whether the target object exists */
+
+ /* Set up group location for link */
+ H5G_name_reset(&lnk_grp_path);
+ lnk_grp_loc.path = &lnk_grp_path;
+ lnk_grp_loc.oloc = (H5O_loc_t *)src_oloc; /* Casting away const OK -QAK */
+
+ /* Check if the target object exists */
+ if((tar_exists = H5G_loc_exists(&lnk_grp_loc, src_lnk->name, H5P_DEFAULT,
+ dxpl_id)) < 0)
+ HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to check if target object exists")
+
+ if(tar_exists) {
+ /* Make a temporary copy of the link, so that it will not change the
+ * info in the cache when we change it to a hard link */
+ if(NULL == H5O_msg_copy(H5O_LINK_ID, src_lnk, &tmp_src_lnk))
+ HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy message")
+
+ /* Set up group location for target object. Let H5G_traverse expand
+ * the link. */
+ tmp_src_loc.path = &tmp_src_path;
+ tmp_src_loc.oloc = &tmp_src_oloc;
+ if(H5G_loc_reset(&tmp_src_loc) < 0)
+ HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to reset location")
+
+ /* Find the target object */
+ if(H5G_loc_find(&lnk_grp_loc, src_lnk->name, &tmp_src_loc,
+ H5P_DEFAULT, dxpl_id) < 0)
+ HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to find target object")
+ expanded_link_open = TRUE;
+
+ /* Convert symbolic link to hard link */
+ if(tmp_src_lnk.type == H5L_TYPE_SOFT)
+ tmp_src_lnk.u.soft.name =
+ (char *)H5MM_xfree(tmp_src_lnk.u.soft.name);
+ else if(tmp_src_lnk.u.ud.size > 0)
+ tmp_src_lnk.u.ud.udata = H5MM_xfree(tmp_src_lnk.u.ud.udata);
+ tmp_src_lnk.type = H5L_TYPE_HARD;
+ tmp_src_lnk.u.hard.addr = tmp_src_oloc.addr;
+ src_lnk = &tmp_src_lnk;
+ } /* end if */
+ } /* end if */
+
+ /* Copy src link information to dst link information */
+ if(NULL == H5O_msg_copy(H5O_LINK_ID, src_lnk, dst_lnk))
+ HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy message")
+ dst_lnk_init = TRUE;
+
+ /* Check if object in source group is a hard link & copy it */
+ if(H5L_TYPE_HARD == src_lnk->type) {
+ H5O_loc_t new_dst_oloc; /* Copied object location in destination */
+
+ /* Set up copied object location to fill in */
+ H5O_loc_reset(&new_dst_oloc);
+ new_dst_oloc.file = dst_file;
+
+ if(!expanded_link_open) {
+ /* Build temporary object location for source */
+ H5O_loc_reset(&tmp_src_oloc);
+ tmp_src_oloc.file = src_oloc->file;
+ tmp_src_oloc.addr = src_lnk->u.hard.addr;
+ } /* end if */
+ HDassert(H5F_addr_defined(tmp_src_oloc.addr));
+
+ /* Copy the shared object from source to destination */
+ /* Don't care about obj_type or udata because those are only important
+ * for old style groups */
+ if(H5O_copy_header_map(&tmp_src_oloc, &new_dst_oloc, dxpl_id, cpy_info,
+ TRUE, NULL, NULL) < 0)
+ HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy object")
+
+ /* Copy new destination object's information for eventual insertion */
+ dst_lnk->u.hard.addr = new_dst_oloc.addr;
+ } /* end if */
+
+done:
+ /* Check if we used a temporary src link */
+ if(src_lnk != _src_lnk) {
+ HDassert(src_lnk == &tmp_src_lnk);
+ H5O_msg_reset(H5O_LINK_ID, &tmp_src_lnk);
+ } /* end if */
+ if(ret_value < 0)
+ if(dst_lnk_init)
+ H5O_msg_reset(H5O_LINK_ID, dst_lnk);
+ /* Check if we need to free the temp source oloc */
+ if(expanded_link_open)
+ if(H5G_loc_free(&tmp_src_loc) < 0)
+ HDONE_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to free object")
+
+ FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5L_link_copy_file() */
+
diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c
index 02213d1..6a09b9e 100644
--- a/src/H5Lexternal.c
+++ b/src/H5Lexternal.c
@@ -74,7 +74,7 @@ DESCRIPTION
static herr_t
H5L_init_extern_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5L_init_extern_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5L_init())
} /* H5L_init_extern_interface() */
@@ -100,7 +100,7 @@ H5L_getenv_prefix_name(char **env_prefix/*in,out*/)
char *retptr=NULL;
char *strret=NULL;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5L_getenv_prefix_name)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
strret = HDstrchr(*env_prefix, COLON_SEPC);
if (strret == NULL) {
@@ -135,7 +135,7 @@ H5L_build_name(char *prefix, char *file_name, char **full_name/*out*/)
size_t fname_len; /* Length of external link file name */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_build_name)
+ FUNC_ENTER_NOAPI_NOINIT
prefix_len = HDstrlen(prefix);
fname_len = HDstrlen(file_name);
@@ -218,7 +218,7 @@ H5L_extern_traverse(const char UNUSED *link_name, hid_t cur_group,
H5F_close_degree_t fc_degree = H5F_CLOSE_WEAK; /* File close degree for target file */
hid_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5L_extern_traverse, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
HDassert(p);
@@ -489,7 +489,7 @@ H5L_extern_query(const char UNUSED * link_name, const void *_udata, size_t udata
const uint8_t *udata = (const uint8_t *)_udata; /* Pointer to external link buffer */
ssize_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5L_extern_query)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check external link version & flags */
if(((*udata >> 4) & 0x0F) != H5L_EXT_VERSION)
@@ -546,7 +546,7 @@ H5Lcreate_external(const char *file_name, const char *obj_name,
uint8_t *p; /* Pointer into external link buffer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Lcreate_external, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "*s*si*sii", file_name, obj_name, link_loc_id, link_name,
lcpl_id, lapl_id);
@@ -607,7 +607,7 @@ H5L_register_external(void)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5L_register_external, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if(H5L_register(H5L_EXTERN_LINK_CLASS) < 0)
HGOTO_ERROR(H5E_LINK, H5E_NOTREGISTERED, FAIL, "unable to register external link class")
@@ -650,7 +650,7 @@ H5Lunpack_elink_val(const void *_ext_linkval, size_t link_size,
size_t len; /* Length of the filename in the linkval*/
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Lunpack_elink_val, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "*xz*Iu**s**s", _ext_linkval, link_size, flags, filename,
obj_path);
diff --git a/src/H5Lpkg.h b/src/H5Lpkg.h
index e02a871..2e931f5 100644
--- a/src/H5Lpkg.h
+++ b/src/H5Lpkg.h
@@ -56,6 +56,9 @@
H5_DLL herr_t H5L_create_ud(const H5G_loc_t *link_loc, const char *link_name,
const void * ud_data, size_t ud_data_size, H5L_type_t type,
hid_t lcpl_id, hid_t lapl_id, hid_t dxpl_id);
+H5_DLL herr_t H5L_link_copy_file(H5F_t *dst_file, hid_t dxpl_id,
+ const H5O_link_t *_src_lnk, const H5O_loc_t *src_oloc, H5O_link_t *dst_lnk,
+ H5O_copy_t *cpy_info);
#endif /* _H5Lpkg_H */
diff --git a/src/H5MF.c b/src/H5MF.c
index 61caa7a..203c942 100644
--- a/src/H5MF.c
+++ b/src/H5MF.c
@@ -116,7 +116,7 @@ H5MF_init_merge_flags(H5F_t *f)
hbool_t all_same; /* Whether all the types map to the same value */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5MF_init_merge_flags, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -225,7 +225,7 @@ H5MF_alloc_open(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type)
H5MF_FSPACE_SECT_CLS_SIMPLE};
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5MF_alloc_open)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -272,7 +272,7 @@ H5MF_alloc_create(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type)
herr_t ret_value = SUCCEED; /* Return value */
H5FS_create_t fs_create; /* Free space creation parameters */
- FUNC_ENTER_NOAPI_NOINIT(H5MF_alloc_create)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -322,7 +322,7 @@ H5MF_alloc_start(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5MF_alloc_start)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -364,7 +364,7 @@ H5MF_alloc_close(H5F_t *f, hid_t dxpl_id, H5FD_mem_t type)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5MF_alloc_close)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -408,7 +408,7 @@ H5MF_alloc(H5F_t *f, H5FD_mem_t alloc_type, hid_t dxpl_id, hsize_t size)
H5FD_mem_t fs_type; /* Free space type (mapped from allocation type) */
haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5MF_alloc, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI(HADDR_UNDEF)
#ifdef H5MF_ALLOC_DEBUG
HDfprintf(stderr, "%s: alloc_type = %u, size = %Hu\n", FUNC, (unsigned)alloc_type, size);
#endif /* H5MF_ALLOC_DEBUG */
@@ -534,7 +534,7 @@ H5MF_alloc_tmp(H5F_t *f, hsize_t size)
haddr_t eoa; /* End of allocated space in the file */
haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5MF_alloc_tmp, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI(HADDR_UNDEF)
#ifdef H5MF_ALLOC_DEBUG
HDfprintf(stderr, "%s: size = %Hu\n", FUNC, size);
#endif /* H5MF_ALLOC_DEBUG */
@@ -587,7 +587,7 @@ H5MF_xfree(H5F_t *f, H5FD_mem_t alloc_type, hid_t dxpl_id, haddr_t addr,
H5FD_mem_t fs_type; /* Free space type (mapped from allocation type) */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5MF_xfree, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
#ifdef H5MF_ALLOC_DEBUG
HDfprintf(stderr, "%s: Entering - alloc_type = %u, addr = %a, size = %Hu\n", FUNC, (unsigned)alloc_type, addr, size);
#endif /* H5MF_ALLOC_DEBUG */
@@ -719,7 +719,7 @@ H5MF_try_extend(H5F_t *f, hid_t dxpl_id, H5FD_mem_t alloc_type, haddr_t addr,
haddr_t end; /* End of block to extend */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5MF_try_extend, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
#ifdef H5MF_ALLOC_DEBUG
HDfprintf(stderr, "%s: Entering: alloc_type = %u, addr = %a, size = %Hu, extra_requested = %Hu\n", FUNC, (unsigned)alloc_type, addr, size, extra_requested);
#endif /* H5MF_ALLOC_DEBUG */
@@ -797,7 +797,7 @@ H5MF_get_freespace(H5F_t *f, hid_t dxpl_id, hsize_t *tot_space, hsize_t *meta_si
H5FD_mem_t type; /* Memory type for iteration */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5MF_get_freespace, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -899,7 +899,7 @@ H5MF_try_shrink(H5F_t *f, H5FD_mem_t alloc_type, hid_t dxpl_id, haddr_t addr,
H5MF_sect_ud_t udata; /* User data for callback */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5MF_try_shrink, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
#ifdef H5MF_ALLOC_DEBUG
HDfprintf(stderr, "%s: Entering - alloc_type = %u, addr = %a, size = %Hu\n", FUNC, (unsigned)alloc_type, addr, size);
#endif /* H5MF_ALLOC_DEBUG */
@@ -960,7 +960,7 @@ H5MF_close(H5F_t *f, hid_t dxpl_id)
H5FD_mem_t type; /* Memory type for iteration */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5MF_close, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
#ifdef H5MF_ALLOC_DEBUG
HDfprintf(stderr, "%s: Entering\n", FUNC);
#endif /* H5MF_ALLOC_DEBUG */
diff --git a/src/H5MFaggr.c b/src/H5MFaggr.c
index 1e43bfb..4d8e7d5 100644
--- a/src/H5MFaggr.c
+++ b/src/H5MFaggr.c
@@ -96,7 +96,7 @@ H5MF_aggr_vfd_alloc(H5F_t *f, H5FD_mem_t alloc_type, hid_t dxpl_id, hsize_t size
{
haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5MF_aggr_vfd_alloc, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI(HADDR_UNDEF)
#ifdef H5MF_ALLOC_DEBUG
HDfprintf(stderr, "%s: alloc_type = %u, size = %Hu\n", FUNC, (unsigned)alloc_type, size);
#endif /* H5MF_ALLOC_DEBUG */
@@ -157,7 +157,7 @@ H5MF_aggr_alloc(H5F_t *f, hid_t dxpl_id, H5F_blk_aggr_t *aggr,
haddr_t eoa = HADDR_UNDEF; /* Initial EOA for the file */
haddr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5MF_aggr_alloc, HADDR_UNDEF)
+ FUNC_ENTER_NOAPI(HADDR_UNDEF)
#ifdef H5MF_AGGR_DEBUG
HDfprintf(stderr, "%s: type = %u, size = %Hu\n", FUNC, (unsigned)type, size);
#endif /* H5MF_AGGR_DEBUG */
@@ -379,7 +379,7 @@ H5MF_aggr_try_extend(H5F_t *f, H5F_blk_aggr_t *aggr, H5FD_mem_t type,
{
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI(H5MF_aggr_try_extend, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
@@ -446,7 +446,7 @@ H5MF_aggr_can_absorb(const H5F_t *f, const H5F_blk_aggr_t *aggr,
{
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5MF_aggr_can_absorb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(f);
@@ -497,7 +497,7 @@ herr_t
H5MF_aggr_absorb(const H5F_t UNUSED *f, H5F_blk_aggr_t *aggr, H5MF_free_section_t *sect,
hbool_t allow_sect_absorb)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5MF_aggr_absorb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(f);
@@ -583,7 +583,7 @@ herr_t
H5MF_aggr_query(const H5F_t *f, const H5F_blk_aggr_t *aggr, haddr_t *addr,
hsize_t *size)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MF_aggr_query)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(f);
@@ -619,7 +619,7 @@ H5MF_aggr_reset(H5F_t *f, hid_t dxpl_id, H5F_blk_aggr_t *aggr)
H5FD_mem_t alloc_type; /* Type of file memory to work with */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5MF_aggr_reset)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(f);
@@ -682,7 +682,7 @@ H5MF_free_aggrs(H5F_t *f, hid_t dxpl_id)
hsize_t sda_size = 0; /* Size of "small data aggregator" */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5MF_free_aggrs, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
diff --git a/src/H5MFdbg.c b/src/H5MFdbg.c
index ca87c83..bd8d3d6 100644
--- a/src/H5MFdbg.c
+++ b/src/H5MFdbg.c
@@ -106,7 +106,7 @@ H5MF_sects_debug_cb(const H5FS_section_info_t *_sect, void *_udata)
H5MF_debug_iter_ud_t *udata = (H5MF_debug_iter_ud_t *)_udata; /* User data for callbacks */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5MF_sects_debug_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -166,7 +166,7 @@ H5MF_sects_dump(H5F_t *f, hid_t dxpl_id, FILE *stream)
int fwidth = 50; /* Field width */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5MF_sects_dump, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
#ifdef H5MF_ALLOC_DEBUG
HDfprintf(stderr, "%s: Dumping file free space sections\n", FUNC);
#endif /* H5MF_ALLOC_DEBUG */
diff --git a/src/H5MFsection.c b/src/H5MFsection.c
index 3f011ec..89b2219 100644
--- a/src/H5MFsection.c
+++ b/src/H5MFsection.c
@@ -134,7 +134,7 @@ H5MF_sect_simple_new(haddr_t sect_off, hsize_t sect_size)
H5MF_free_section_t *sect = NULL; /* 'Simple' free space section to add */
H5MF_free_section_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5MF_sect_simple_new)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect_size);
@@ -180,7 +180,7 @@ H5MF_sect_simple_deserialize(const H5FS_section_class_t UNUSED *cls,
H5MF_free_section_t *sect; /* New section */
H5FS_section_info_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5MF_sect_simple_deserialize)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(H5F_addr_defined(sect_addr));
@@ -221,7 +221,7 @@ H5MF_sect_simple_can_merge(const H5FS_section_info_t *_sect1,
const H5MF_free_section_t *sect2 = (const H5MF_free_section_t *)_sect2; /* File free section */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MF_sect_simple_can_merge)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(sect1);
@@ -259,7 +259,7 @@ H5MF_sect_simple_merge(H5FS_section_info_t *_sect1, H5FS_section_info_t *_sect2,
H5MF_free_section_t *sect2 = (H5MF_free_section_t *)_sect2; /* File free section */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5MF_sect_simple_merge)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect1);
@@ -302,7 +302,7 @@ H5MF_sect_simple_can_shrink(const H5FS_section_info_t *_sect, void *_udata)
haddr_t end; /* End of section to extend */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5MF_sect_simple_can_shrink)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect);
@@ -395,7 +395,7 @@ H5MF_sect_simple_shrink(H5FS_section_info_t **_sect, void *_udata)
H5MF_sect_ud_t *udata = (H5MF_sect_ud_t *)_udata; /* User data for callback */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5MF_sect_simple_shrink)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(sect);
@@ -453,7 +453,7 @@ H5MF_sect_simple_free(H5FS_section_info_t *_sect)
{
H5MF_free_section_t *sect = (H5MF_free_section_t *)_sect; /* File free section */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MF_sect_simple_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(sect);
@@ -490,7 +490,7 @@ H5MF_sect_simple_valid(const H5FS_section_class_t UNUSED *cls,
const H5MF_free_section_t *sect = (const H5MF_free_section_t *)_sect; /* File free section */
#endif /* NDEBUG */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MF_sect_simple_valid)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(sect);
@@ -517,7 +517,7 @@ H5MF_sect_simple_split(H5FS_section_info_t *sect, hsize_t frag_size)
{
H5MF_free_section_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5MF_sect_simple_split)
+ FUNC_ENTER_NOAPI_NOINIT
/* Allocate space for new section */
if(NULL == (ret_value = H5MF_sect_simple_new(sect->addr, frag_size)))
diff --git a/src/H5MM.c b/src/H5MM.c
index 5555fc9..9ac96d8 100644
--- a/src/H5MM.c
+++ b/src/H5MM.c
@@ -56,8 +56,8 @@
void *
H5MM_malloc(size_t size)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MM_malloc);
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(size);
@@ -89,8 +89,8 @@ H5MM_malloc(size_t size)
void *
H5MM_calloc(size_t size)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MM_calloc);
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(size);
@@ -126,8 +126,8 @@ H5MM_realloc(void *mem, size_t size)
{
void *ret_value;
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MM_realloc)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(NULL == mem) {
if(0 == size)
@@ -164,7 +164,7 @@ H5MM_xstrdup(const char *s)
{
char *ret_value = NULL;
- FUNC_ENTER_NOAPI(H5MM_xstrdup, NULL)
+ FUNC_ENTER_NOAPI(NULL)
if(s) {
if(NULL == (ret_value = (char *)H5MM_malloc(HDstrlen(s) + 1)))
@@ -200,7 +200,7 @@ H5MM_strdup(const char *s)
{
char *ret_value;
- FUNC_ENTER_NOAPI(H5MM_strdup, NULL)
+ FUNC_ENTER_NOAPI(NULL)
if(!s)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "null string")
@@ -235,8 +235,8 @@ done:
void *
H5MM_xfree(void *mem)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MM_xfree);
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(mem)
HDfree(mem);
diff --git a/src/H5MP.c b/src/H5MP.c
index b668d0c..4820b76 100644
--- a/src/H5MP.c
+++ b/src/H5MP.c
@@ -92,7 +92,7 @@ H5MP_create(size_t page_size, unsigned flags)
H5MP_pool_t *mp = NULL; /* New memory pool header */
H5MP_pool_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5MP_create, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Allocate space for the pool header */
if(NULL == (mp = H5FL_MALLOC(H5MP_pool_t)))
@@ -143,7 +143,7 @@ H5MP_new_page(H5MP_pool_t *mp, size_t page_size)
H5MP_page_blk_t *first_blk; /* Pointer to first block in page */
H5MP_page_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5MP_new_page)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(mp);
@@ -214,7 +214,7 @@ H5MP_malloc (H5MP_pool_t *mp, size_t request)
size_t needed; /* Size requested, plus block header and alignment */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5MP_malloc, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Sanity check */
HDassert(mp);
@@ -353,7 +353,7 @@ H5MP_free(H5MP_pool_t *mp, void *spc)
H5MP_page_t *spc_page; /* Page containing block to free */
void *ret_value = NULL; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5MP_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(mp);
@@ -438,7 +438,7 @@ H5MP_close(H5MP_pool_t *mp)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5MP_close, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Release memory for pool pages */
if(mp->first != NULL) {
diff --git a/src/H5MPtest.c b/src/H5MPtest.c
index 2232b94..ccbd140 100644
--- a/src/H5MPtest.c
+++ b/src/H5MPtest.c
@@ -51,7 +51,7 @@
herr_t
H5MP_get_pool_free_size(const H5MP_pool_t *mp, size_t *free_size)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MP_get_pool_free_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(mp);
@@ -83,7 +83,7 @@ H5MP_get_pool_free_size(const H5MP_pool_t *mp, size_t *free_size)
herr_t
H5MP_get_pool_first_page(const H5MP_pool_t *mp, H5MP_page_t **page)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MP_get_pool_first_page)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(mp);
@@ -122,7 +122,7 @@ H5MP_pool_is_free_size_correct(const H5MP_pool_t *mp)
size_t pool_free; /* Size of pages' free space */
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MP_pool_is_free_size_correct)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(mp);
@@ -191,7 +191,7 @@ done:
herr_t
H5MP_get_page_free_size(const H5MP_page_t *page, size_t *free_size)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MP_get_page_free_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(page);
@@ -223,7 +223,7 @@ H5MP_get_page_free_size(const H5MP_page_t *page, size_t *free_size)
herr_t
H5MP_get_page_next_page(const H5MP_page_t *page, H5MP_page_t **next_page)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5MP_get_page_next_page)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments. */
HDassert(page);
diff --git a/src/H5O.c b/src/H5O.c
index f113001..234dd68 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -192,7 +192,7 @@ static const H5O_obj_class_t *const H5O_obj_class_g[] = {
static herr_t
H5O_init_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* H5O interface sanity checks */
HDassert(H5O_MSG_TYPES == NELMTS(H5O_msg_class_g));
@@ -232,7 +232,7 @@ H5Oopen(hid_t loc_id, const char *name, hid_t lapl_id)
H5G_loc_t loc;
hid_t ret_value = FAIL;
- FUNC_ENTER_API(H5Oopen, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("i", "i*si", loc_id, name, lapl_id);
/* Check args */
@@ -284,7 +284,7 @@ H5Oopen_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
hbool_t loc_found = FALSE; /* Entry at 'name' found */
hid_t ret_value = FAIL;
- FUNC_ENTER_API(H5Oopen_by_idx, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("i", "i*sIiIohi", loc_id, group_name, idx_type, order, n, lapl_id);
/* Check args */
@@ -371,7 +371,7 @@ H5Oopen_by_addr(hid_t loc_id, haddr_t addr)
hid_t lapl_id = H5P_LINK_ACCESS_DEFAULT; /* lapl to use to open this object */
hid_t ret_value = FAIL;
- FUNC_ENTER_API(H5Oopen_by_addr, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("i", "ia", loc_id, addr);
/* Check args */
@@ -427,7 +427,7 @@ H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id,
H5G_loc_t obj_loc;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Olink, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "ii*sii", obj_id, new_loc_id, new_name, lcpl_id, lapl_id);
/* Check arguments */
@@ -482,7 +482,7 @@ H5Oincr_refcount(hid_t object_id)
H5O_loc_t *oloc;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_API(H5Oincr_refcount, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", object_id);
/* Get the object's oloc so we can adjust its link count */
@@ -523,7 +523,7 @@ H5Odecr_refcount(hid_t object_id)
H5O_loc_t *oloc;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_API(H5Odecr_refcount, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", object_id);
/* Get the object's oloc so we can adjust its link count */
@@ -557,7 +557,7 @@ H5Oexists_by_name(hid_t loc_id, const char *name, hid_t lapl_id)
H5G_loc_t loc; /* Location info */
hid_t ret_value = FAIL; /* Return value */
- FUNC_ENTER_API(H5Oexists_by_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("t", "i*si", loc_id, name, lapl_id);
/* Check args */
@@ -599,7 +599,7 @@ H5Oget_info(hid_t loc_id, H5O_info_t *oinfo)
H5G_loc_t loc; /* Location of group */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Oget_info, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*x", loc_id, oinfo);
/* Check args */
@@ -636,7 +636,7 @@ H5Oget_info_by_name(hid_t loc_id, const char *name, H5O_info_t *oinfo, hid_t lap
H5G_loc_t loc; /* Location of group */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Oget_info_by_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*s*xi", loc_id, name, oinfo, lapl_id);
/* Check args */
@@ -686,7 +686,7 @@ H5Oget_info_by_idx(hid_t loc_id, const char *group_name, H5_index_t idx_type,
hbool_t loc_found = FALSE; /* Entry at 'name' found */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Oget_info_by_idx, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE7("e", "i*sIiIoh*xi", loc_id, group_name, idx_type, order, n, oinfo,
lapl_id);
@@ -753,7 +753,7 @@ H5Oset_comment(hid_t obj_id, const char *comment)
H5G_loc_t loc; /* Location of group */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Oset_comment, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*s", obj_id, comment);
/* Check args */
@@ -793,7 +793,7 @@ H5Oset_comment_by_name(hid_t loc_id, const char *name, const char *comment,
H5G_loc_t loc; /* Location of group */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Oset_comment_by_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*s*si", loc_id, name, comment, lapl_id);
/* Check args */
@@ -838,7 +838,7 @@ H5Oget_comment(hid_t obj_id, char *comment, size_t bufsize)
H5G_loc_t loc; /* Location of group */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Oget_comment, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("Zs", "i*sz", obj_id, comment, bufsize);
/* Check args */
@@ -877,7 +877,7 @@ H5Oget_comment_by_name(hid_t loc_id, const char *name, char *comment, size_t buf
H5G_loc_t loc; /* Location of group */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Oget_comment_by_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("Zs", "i*s*szi", loc_id, name, comment, bufsize, lapl_id);
/* Check args */
@@ -938,7 +938,7 @@ H5Ovisit(hid_t obj_id, H5_index_t idx_type, H5_iter_order_t order,
{
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Ovisit, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "iIiIox*x", obj_id, idx_type, order, op, op_data);
/* Check args */
@@ -996,7 +996,7 @@ H5Ovisit_by_name(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
{
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Ovisit_by_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE7("e", "i*sIiIox*xi", loc_id, obj_name, idx_type, order, op, op_data,
lapl_id);
@@ -1047,7 +1047,7 @@ H5Oclose(hid_t object_id)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_API(H5Oclose, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", object_id);
/* Get the type of the object and close it in the correct way */
@@ -1117,7 +1117,7 @@ H5O_create(H5F_t *f, hid_t dxpl_id, size_t size_hint, size_t initial_rc,
hbool_t store_msg_crt_idx; /* Whether to always store message creation indices for this file */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOAPI(H5O_create, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -1297,7 +1297,7 @@ H5O_open(H5O_loc_t *loc)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_open, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(loc);
@@ -1341,7 +1341,7 @@ H5O_open_name(H5G_loc_t *loc, const char *name, hid_t lapl_id, hbool_t app_ref)
hbool_t loc_found = FALSE; /* Entry at 'name' found */
hid_t ret_value = FAIL;
- FUNC_ENTER_NOAPI(H5O_open_name, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(loc);
@@ -1389,7 +1389,7 @@ H5O_open_by_loc(const H5G_loc_t *obj_loc, hid_t lapl_id, hid_t dxpl_id, hbool_t
const H5O_obj_class_t *obj_class; /* Class of object for location */
hid_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_open_by_loc, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(obj_loc);
@@ -1424,7 +1424,7 @@ H5O_close(H5O_loc_t *loc)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_close, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(loc);
@@ -1485,7 +1485,7 @@ H5O_link_oh(H5F_t *f, int adjust, hid_t dxpl_id, H5O_t *oh, hbool_t *deleted)
haddr_t addr = H5O_OH_GET_ADDR(oh); /* Object header address */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_link_oh, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -1601,7 +1601,7 @@ H5O_link(const H5O_loc_t *loc, int adjust, hid_t dxpl_id)
hbool_t deleted = FALSE; /* Whether the object was deleted */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_link, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(loc);
@@ -1652,7 +1652,7 @@ H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC_protect_t prot)
unsigned file_intent; /* R/W intent on file */
H5O_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_protect, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(loc);
@@ -1869,7 +1869,7 @@ H5O_pin(const H5O_loc_t *loc, hid_t dxpl_id)
H5O_t *oh = NULL; /* Object header */
H5O_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_pin, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(loc);
@@ -1915,7 +1915,7 @@ H5O_unpin(H5O_t *oh)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_unpin, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(oh);
@@ -1951,7 +1951,7 @@ H5O_unprotect(const H5O_loc_t *loc, hid_t dxpl_id, H5O_t *oh, unsigned oh_flags)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_unprotect, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(loc);
@@ -1988,7 +1988,7 @@ H5O_touch_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, hbool_t force)
time_t now; /* Current time */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_touch_oh)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(f);
HDassert(oh);
@@ -2082,7 +2082,7 @@ H5O_touch(const H5O_loc_t *loc, hbool_t force, hid_t dxpl_id)
unsigned oh_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting object header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_touch, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(loc);
@@ -2126,7 +2126,7 @@ H5O_bogus_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned mesg_flags)
int idx; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_bogus_oh, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(oh);
@@ -2192,7 +2192,7 @@ H5O_delete(H5F_t *f, hid_t dxpl_id, haddr_t addr)
unsigned oh_flags = H5AC__NO_FLAGS_SET; /* Flags for unprotecting object header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_delete, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
@@ -2246,7 +2246,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_NOAPI_NOINIT(H5O_delete_oh)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(f);
@@ -2285,7 +2285,7 @@ H5O_obj_type(const H5O_loc_t *loc, H5O_type_t *obj_type, hid_t dxpl_id)
H5O_t *oh = NULL; /* Object header for location */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_obj_type, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Load the object header */
if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
@@ -2321,7 +2321,7 @@ H5O_obj_type_real(H5O_t *oh, H5O_type_t *obj_type)
{
const H5O_obj_class_t *obj_class; /* Class of object for header */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_obj_type_real)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(oh);
@@ -2363,7 +2363,7 @@ H5O_obj_class(const H5O_loc_t *loc, hid_t dxpl_id)
H5O_t *oh = NULL; /* Object header for location */
const H5O_obj_class_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_obj_class)
+ FUNC_ENTER_NOAPI_NOINIT
/* Load the object header */
if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_READ)))
@@ -2400,7 +2400,7 @@ H5O_obj_class_real(H5O_t *oh)
size_t i; /* Local index variable */
const H5O_obj_class_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_obj_class_real, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Sanity check */
HDassert(oh);
@@ -2442,7 +2442,7 @@ H5O_get_loc(hid_t object_id)
{
H5O_loc_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_get_loc)
+ FUNC_ENTER_NOAPI_NOINIT
switch(H5I_get_type(object_id)) {
case H5I_GROUP:
@@ -2498,7 +2498,7 @@ done:
herr_t
H5O_loc_reset(H5O_loc_t *loc)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_loc_reset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(loc);
@@ -2536,7 +2536,7 @@ H5O_loc_reset(H5O_loc_t *loc)
herr_t
H5O_loc_copy(H5O_loc_t *dst, H5O_loc_t *src, H5_copy_depth_t depth)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_loc_copy)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(src);
@@ -2578,7 +2578,7 @@ H5O_loc_copy(H5O_loc_t *dst, H5O_loc_t *src, H5_copy_depth_t depth)
herr_t
H5O_loc_hold_file(H5O_loc_t *loc)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_loc_hold_file)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(loc);
@@ -2614,7 +2614,7 @@ H5O_loc_free(H5O_loc_t *loc)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5O_loc_free)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(loc);
@@ -2653,7 +2653,7 @@ H5O_get_hdr_info(const H5O_loc_t *loc, hid_t dxpl_id, H5O_hdr_info_t *hdr)
H5O_t *oh = NULL; /* Object header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_get_hdr_info, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(loc);
@@ -2698,7 +2698,7 @@ H5O_get_hdr_info_real(const H5O_t *oh, H5O_hdr_info_t *hdr)
const H5O_chunk_t *curr_chunk; /* Pointer to current message being operated on */
unsigned u; /* Local index variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_get_hdr_info_real)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(oh);
@@ -2780,7 +2780,7 @@ H5O_get_info(const H5O_loc_t *loc, hid_t dxpl_id, hbool_t want_ih_info,
H5O_t *oh = NULL; /* Object header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_get_info, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(loc);
@@ -2901,7 +2901,7 @@ H5O_get_create_plist(const H5O_loc_t *loc, hid_t dxpl_id, H5P_genplist_t *oc_pli
H5O_t *oh = NULL; /* Object header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_get_create_plist, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(loc);
@@ -2956,7 +2956,7 @@ H5O_get_nlinks(const H5O_loc_t *loc, hid_t dxpl_id, hsize_t *nlinks)
H5O_t *oh = NULL; /* Object header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_get_nlinks, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(loc);
@@ -2997,7 +2997,7 @@ H5O_obj_create(H5F_t *f, H5O_type_t obj_type, void *crt_info, H5G_loc_t *obj_loc
size_t u; /* Local index variable */
void *ret_value = NULL; /* Return value */
- FUNC_ENTER_NOAPI(H5O_obj_create, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Sanity checks */
HDassert(f);
@@ -3045,8 +3045,8 @@ done:
haddr_t
H5O_get_oh_addr(const H5O_t *oh)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_get_oh_addr)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(oh);
HDassert(oh->chunk);
@@ -3074,7 +3074,7 @@ H5O_get_rc_and_type(const H5O_loc_t *loc, hid_t dxpl_id, unsigned *rc, H5O_type_
H5O_t *oh = NULL; /* Object header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_get_rc_and_type, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(loc);
@@ -3115,7 +3115,7 @@ done:
static herr_t
H5O_free_visit_visited(void *item, void UNUSED *key, void UNUSED *operator_data/*in,out*/)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_free_visit_visited)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
item = H5FL_FREE(H5_obj_t, item);
@@ -3147,7 +3147,7 @@ H5O_visit_cb(hid_t UNUSED group, const char *name, const H5L_info_t *linfo,
hbool_t obj_found = FALSE; /* Object at 'name' found */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_visit_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(name);
@@ -3262,7 +3262,7 @@ H5O_visit(hid_t loc_id, const char *obj_name, H5_index_t idx_type,
hid_t obj_id = (-1); /* ID of object */
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_visit, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Portably initialize user data struct to zeros */
HDmemset(&udata, 0, sizeof(udata));
@@ -3373,7 +3373,7 @@ H5O_inc_rc(H5O_t *oh)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_inc_rc, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(oh);
@@ -3409,7 +3409,7 @@ H5O_dec_rc(H5O_t *oh)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_dec_rc, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(oh);
@@ -3447,7 +3447,7 @@ H5O_dec_rc_by_loc(const H5O_loc_t *loc, hid_t dxpl_id)
H5O_t *oh = NULL; /* Object header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_dec_rc_by_loc, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(loc);
@@ -3488,7 +3488,7 @@ H5O_free(H5O_t *oh)
{
unsigned u; /* Local index variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(oh);
diff --git a/src/H5Oainfo.c b/src/H5Oainfo.c
index 20ebf26..78b17e0 100644
--- a/src/H5Oainfo.c
+++ b/src/H5Oainfo.c
@@ -112,7 +112,7 @@ H5O_ainfo_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
unsigned char flags; /* Flags for encoding attribute info */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_ainfo_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -184,7 +184,7 @@ H5O_ainfo_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const void
const H5O_ainfo_t *ainfo = (const H5O_ainfo_t *)_mesg;
unsigned char flags; /* Flags for encoding attribute info */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_ainfo_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
@@ -241,7 +241,7 @@ H5O_ainfo_copy(const void *_mesg, void *_dest)
H5O_ainfo_t *dest = (H5O_ainfo_t *) _dest;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_ainfo_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(ainfo);
@@ -281,7 +281,7 @@ H5O_ainfo_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void *_mesg)
const H5O_ainfo_t *ainfo = (const H5O_ainfo_t *)_mesg;
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_ainfo_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set return value */
ret_value = 1 /* Version */
@@ -310,7 +310,7 @@ H5O_ainfo_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void *_mesg)
static herr_t
H5O_ainfo_free(void *mesg)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_ainfo_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(mesg);
@@ -338,7 +338,7 @@ H5O_ainfo_delete(H5F_t *f, hid_t dxpl_id, H5O_t UNUSED *open_oh, void *_mesg)
H5O_ainfo_t *ainfo = (H5O_ainfo_t *)_mesg;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_ainfo_delete)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -372,7 +372,7 @@ static herr_t
H5O_ainfo_pre_copy_file(H5F_t UNUSED *file_src, const void UNUSED *native_src,
hbool_t *deleted, const H5O_copy_t *cpy_info, void UNUSED *udata)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_ainfo_pre_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(deleted);
@@ -409,7 +409,7 @@ H5O_ainfo_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst,
H5O_ainfo_t *ainfo_dst = NULL;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_ainfo_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(file_src);
@@ -467,7 +467,7 @@ H5O_ainfo_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src,
const H5O_ainfo_t *ainfo_src = (const H5O_ainfo_t *)mesg_src;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_ainfo_post_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(ainfo_src);
@@ -501,7 +501,7 @@ H5O_ainfo_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
{
const H5O_ainfo_t *ainfo = (const H5O_ainfo_t *) _mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_ainfo_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c
index aba88b4..a21c2b8 100644
--- a/src/H5Oalloc.c
+++ b/src/H5Oalloc.c
@@ -115,7 +115,7 @@ H5O_add_gap(H5F_t *f, H5O_t *oh, unsigned chunkno, hbool_t *chk_dirtied,
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_add_gap)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(oh);
@@ -240,7 +240,7 @@ H5O_eliminate_gap(H5O_t *oh, hbool_t *chk_dirtied, H5O_mesg_t *mesg,
uint8_t *move_start, *move_end; /* Pointers to area of messages to move */
hbool_t null_before_gap; /* Flag whether the null message is before the gap or not */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_eliminate_gap)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(oh);
@@ -343,7 +343,7 @@ H5O_alloc_null(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned null_idx,
H5O_mesg_t *alloc_msg; /* Pointer to null message to allocate out of */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_alloc_null)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(oh);
@@ -450,7 +450,7 @@ H5O_alloc_msgs(H5O_t *oh, size_t min_alloc)
H5O_mesg_t *new_mesg; /* Pointer to new message array */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_alloc_msgs)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(oh);
@@ -521,7 +521,7 @@ H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno,
unsigned u; /* Local index variable */
htri_t ret_value = TRUE; /* return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_alloc_extend_chunk)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f != NULL);
@@ -762,7 +762,7 @@ H5O_alloc_new_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, size_t size)
unsigned u; /* Local index variable */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_alloc_new_chunk)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(oh);
@@ -1121,7 +1121,7 @@ H5O_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type,
int idx; /* Index of message which fits allocation */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_alloc, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(oh);
@@ -1205,7 +1205,7 @@ H5O_release_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_mesg_t *mesg,
hbool_t chk_dirtied = FALSE; /* Flag for unprotecting chunk */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_release_mesg, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -1278,7 +1278,7 @@ H5O_move_cont(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned cont_u)
hbool_t chk_dirtied = FALSE; /* Flags for unprotecting chunk */
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_move_cont)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments. */
HDassert(f);
@@ -1450,7 +1450,7 @@ H5O_move_msgs_forward(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
hbool_t did_packing = FALSE; /* Whether any messages were packed */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_move_msgs_forward)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(oh);
@@ -1734,7 +1734,7 @@ H5O_merge_null(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
hbool_t did_merging = FALSE; /* Whether any messages were merged */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_merge_null)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(oh != NULL);
@@ -1869,7 +1869,7 @@ H5O_remove_empty_chunks(H5F_t *f, hid_t dxpl_id, H5O_t *oh)
hbool_t did_deleting = FALSE; /* Whether any chunks were deleted */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_remove_empty_chunks)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(oh != NULL);
@@ -2059,7 +2059,7 @@ H5O_condense_header(H5F_t *f, H5O_t *oh, hid_t dxpl_id)
htri_t result; /* Result from packing/merging/etc */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOAPI(H5O_condense_header, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(oh != NULL);
@@ -2132,7 +2132,7 @@ H5O_alloc_shrink_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno)
herr_t ret_value = SUCCEED; /* Return value */
unsigned u; /* Index */
- FUNC_ENTER_NOAPI_NOINIT(H5O_alloc_shrink_chunk)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
diff --git a/src/H5Oattr.c b/src/H5Oattr.c
index ce8e4af..8cd243b 100644
--- a/src/H5Oattr.c
+++ b/src/H5Oattr.c
@@ -130,7 +130,7 @@ H5O_attr_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned UNUSED mesg_fl
unsigned flags = 0; /* Attribute flags */
H5A_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -278,7 +278,7 @@ H5O_attr_encode(H5F_t *f, uint8_t *p, const void *mesg)
unsigned flags = 0; /* Attribute flags */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_encode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -381,7 +381,7 @@ H5O_attr_copy(const void *_src, void *_dst)
{
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(_src);
@@ -418,7 +418,7 @@ H5O_attr_size(const H5F_t UNUSED *f, const void *_mesg)
size_t name_len;
size_t ret_value = 0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_attr_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(attr);
@@ -479,7 +479,7 @@ H5O_attr_size(const H5F_t UNUSED *f, const void *_mesg)
herr_t
H5O_attr_reset(void UNUSED *_mesg)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_attr_reset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5O_attr_reset() */
@@ -507,7 +507,7 @@ H5O_attr_free(void *mesg)
H5A_t *attr = (H5A_t *)mesg;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_free)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(mesg);
@@ -537,7 +537,7 @@ H5O_attr_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, void *_mesg)
H5A_t *attr = (H5A_t *) _mesg;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_delete)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -575,7 +575,7 @@ H5O_attr_link(H5F_t *f, hid_t dxpl_id, H5O_t *oh, void *_mesg)
H5A_t *attr = (H5A_t *) _mesg;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_link)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -616,7 +616,7 @@ static herr_t
H5O_attr_pre_copy_file(H5F_t UNUSED *file_src, const void UNUSED *native_src,
hbool_t *deleted, const H5O_copy_t *cpy_info, void UNUSED *udata)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_attr_pre_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(deleted);
@@ -653,7 +653,7 @@ H5O_attr_copy_file(H5F_t *file_src, const H5O_msg_class_t UNUSED *mesg_type,
{
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(native_src);
@@ -698,7 +698,7 @@ H5O_attr_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src,
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_post_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
if ( H5A_attr_post_copy_file(src_oloc, (const H5A_t *)mesg_src,
dst_oloc, (H5A_t *)mesg_dst, dxpl_id, cpy_info) < 0)
@@ -727,7 +727,7 @@ H5O_attr_get_crt_index(const void *_mesg, H5O_msg_crt_idx_t *crt_idx /*out*/)
{
const H5A_t *attr = (const H5A_t *)_mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_attr_get_crt_index)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(attr);
HDassert(crt_idx);
@@ -757,7 +757,7 @@ H5O_attr_set_crt_index(void *_mesg, H5O_msg_crt_idx_t crt_idx)
{
H5A_t *attr = (H5A_t *)_mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_attr_set_crt_index)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(attr);
@@ -795,7 +795,7 @@ H5O_attr_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE * stream, int in
char buf[256]; /* Temporary string buffer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_debug)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
diff --git a/src/H5Oattribute.c b/src/H5Oattribute.c
index e3a3973..057caaf 100644
--- a/src/H5Oattribute.c
+++ b/src/H5Oattribute.c
@@ -183,7 +183,7 @@ H5O_attr_to_dense_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
H5A_t *attr = (H5A_t *)mesg->native; /* Pointer to attribute to insert */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_to_dense_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(oh);
@@ -230,7 +230,7 @@ H5O_attr_create(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr)
htri_t shared_mesg; /* Should this message be stored in the Shared Message table? */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_create)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(loc);
@@ -432,7 +432,7 @@ H5O_attr_open_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, unsigned sequence,
H5O_iter_opn_t *udata = (H5O_iter_opn_t *)_udata; /* Operator user data */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_open_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(oh);
@@ -485,7 +485,7 @@ H5O_attr_open_by_name(const H5O_loc_t *loc, const char *name, hid_t dxpl_id)
htri_t found_open_attr = FALSE; /* Whether opened object is found */
H5A_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_open_by_name)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(loc);
@@ -583,7 +583,7 @@ H5O_attr_open_by_idx_cb(const H5A_t *attr, void *_ret_attr)
H5A_t **ret_attr = (H5A_t **)_ret_attr; /* 'User data' passed in */
herr_t ret_value = H5_ITER_STOP; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_open_by_idx_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(attr);
@@ -627,7 +627,7 @@ H5O_attr_open_by_idx(const H5O_loc_t *loc, H5_index_t idx_type,
htri_t found_open_attr = FALSE; /* Whether opened object is found */
H5A_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_open_by_idx)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(loc);
@@ -705,7 +705,7 @@ H5O_attr_find_opened_attr(const H5O_loc_t *loc, H5A_t **attr, const char* name_t
size_t num_open_attr; /* Number of opened attributes */
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_find_opened_attr)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get file serial number for the location of attribute */
if(H5F_get_fileno(loc->file, &loc_fnum) < 0)
@@ -780,7 +780,7 @@ H5O_attr_update_shared(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5A_t *attr,
htri_t shared_mesg; /* Whether the message should be shared */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_update_shared)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -866,7 +866,7 @@ H5O_attr_write_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
hbool_t chk_dirtied = FALSE; /* Flag for unprotecting chunk */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_write_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(oh);
@@ -945,7 +945,7 @@ H5O_attr_write(const H5O_loc_t *loc, hid_t dxpl_id, H5A_t *attr)
H5O_ainfo_t ainfo; /* Attribute information for object */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_write)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(loc);
@@ -1027,7 +1027,7 @@ H5O_attr_rename_chk_cb(H5O_t UNUSED *oh, H5O_mesg_t *mesg/*in,out*/,
H5O_iter_ren_t *udata = (H5O_iter_ren_t *)_udata; /* Operator user data */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_attr_rename_chk_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(oh);
@@ -1079,7 +1079,7 @@ H5O_attr_rename_mod_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
hbool_t chk_dirtied = FALSE; /* Flag for unprotecting chunk */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_rename_mod_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(oh);
@@ -1200,7 +1200,7 @@ H5O_attr_rename(const H5O_loc_t *loc, hid_t dxpl_id, const char *old_name,
H5O_ainfo_t ainfo; /* Attribute information for object */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_rename)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(loc);
@@ -1291,7 +1291,7 @@ H5O_attr_iterate_real(hid_t loc_id, const H5O_loc_t *loc, hid_t dxpl_id,
H5A_attr_table_t atable = {0, NULL}; /* Table of attributes */
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_iterate_real)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(loc);
@@ -1376,7 +1376,7 @@ H5O_attr_iterate(hid_t loc_id, hid_t dxpl_id,
H5G_loc_t loc; /* Object location */
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_iterate)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(attr_op);
@@ -1421,7 +1421,7 @@ H5O_attr_remove_update(const H5O_loc_t *loc, H5O_t *oh, H5O_ainfo_t *ainfo,
H5A_attr_table_t atable = {0, NULL}; /* Table of attributes */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_remove_update)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(loc);
@@ -1543,7 +1543,7 @@ H5O_attr_remove_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/,
H5O_iter_rm_t *udata = (H5O_iter_rm_t *)_udata; /* Operator user data */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_remove_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(oh);
@@ -1591,7 +1591,7 @@ H5O_attr_remove(const H5O_loc_t *loc, const char *name, hid_t dxpl_id)
htri_t ainfo_exists = FALSE; /* Whether the attribute info exists in the file */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_remove)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(loc);
@@ -1676,7 +1676,7 @@ H5O_attr_remove_by_idx(const H5O_loc_t *loc, H5_index_t idx_type,
H5A_attr_table_t atable = {0, NULL}; /* Table of attributes */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_remove_by_idx)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(loc);
@@ -1764,7 +1764,7 @@ H5O_attr_count_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, hsize_t *nattrs)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_count_real)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -1826,7 +1826,7 @@ H5O_attr_exists_cb(H5O_t UNUSED *oh, H5O_mesg_t *mesg/*in,out*/,
H5O_iter_rm_t *udata = (H5O_iter_rm_t *)_udata; /* Operator user data */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_attr_exists_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(mesg);
@@ -1864,7 +1864,7 @@ H5O_attr_exists(const H5O_loc_t *loc, const char *name, hid_t dxpl_id)
H5O_ainfo_t ainfo; /* Attribute information for object */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_exists)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(loc);
@@ -1936,7 +1936,7 @@ H5O_attr_bh_info(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5_ih_info_t *bh_info)
H5B2_t *bt2_corder = NULL; /* v2 B-tree handle for creation order index */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_attr_bh_info, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(oh);
@@ -2019,7 +2019,7 @@ H5O_attr_count(const H5O_loc_t *loc, hid_t dxpl_id)
hsize_t nattrs; /* Number of attributes */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_attr_count)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(loc);
diff --git a/src/H5Obtreek.c b/src/H5Obtreek.c
index 99e6bdd..d25a7a3 100644
--- a/src/H5Obtreek.c
+++ b/src/H5Obtreek.c
@@ -85,7 +85,7 @@ H5O_btreek_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
H5O_btreek_t *mesg; /* Native message */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_btreek_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -129,7 +129,7 @@ H5O_btreek_encode(H5F_t UNUSED *f, hbool_t UNUSED disable_shared, uint8_t *p, co
{
const H5O_btreek_t *mesg = (const H5O_btreek_t *)_mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_btreek_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@@ -167,7 +167,7 @@ H5O_btreek_copy(const void *_mesg, void *_dest)
H5O_btreek_t *dest = (H5O_btreek_t *)_dest;
void *ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5O_btreek_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(mesg);
@@ -205,7 +205,7 @@ H5O_btreek_size(const H5F_t UNUSED *f, hbool_t UNUSED disable_shared, const void
{
size_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_btreek_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@@ -237,7 +237,7 @@ H5O_btreek_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE
{
const H5O_btreek_t *mesg = (const H5O_btreek_t *)_mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_btreek_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
diff --git a/src/H5Ocache.c b/src/H5Ocache.c
index a89da1f..d4969a0 100644
--- a/src/H5Ocache.c
+++ b/src/H5Ocache.c
@@ -168,7 +168,7 @@ H5O_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
haddr_t eoa; /* Relative end of file address */
H5O_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -372,7 +372,7 @@ H5O_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t UNUSED addr, H5O_t *
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -518,7 +518,7 @@ H5O_dest(H5F_t *f, H5O_t *oh)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(oh);
@@ -581,7 +581,7 @@ H5O_clear(H5F_t *f, H5O_t *oh, hbool_t destroy)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5O_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(oh);
@@ -648,7 +648,7 @@ done:
static herr_t
H5O_size(const H5F_t UNUSED *f, const H5O_t *oh, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(oh);
@@ -688,7 +688,7 @@ H5O_cache_chk_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
uint8_t *buf; /* Buffer to decode */
H5O_chunk_proxy_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_cache_chk_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -781,7 +781,7 @@ H5O_cache_chk_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_cache_chk_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* flush */
if(chk_proxy->cache_info.is_dirty) {
@@ -827,7 +827,7 @@ H5O_cache_chk_dest(H5F_t *f, H5O_chunk_proxy_t *chk_proxy)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_cache_chk_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(chk_proxy);
@@ -899,7 +899,7 @@ H5O_cache_chk_clear(H5F_t *f, H5O_chunk_proxy_t *chk_proxy, hbool_t destroy)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5O_cache_chk_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(chk_proxy);
@@ -950,7 +950,7 @@ done:
static herr_t
H5O_cache_chk_size(const H5F_t UNUSED *f, const H5O_chunk_proxy_t *chk_proxy, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_cache_chk_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(chk_proxy);
@@ -984,7 +984,7 @@ H5O_add_cont_msg(H5O_cont_msgs_t *cont_msg_info, const H5O_cont_t *cont)
unsigned contno; /* Continuation message index */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_add_cont_msg)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(cont_msg_info);
@@ -1040,7 +1040,7 @@ H5O_chunk_deserialize(H5O_t *oh, haddr_t addr, size_t len, const uint8_t *image,
#endif /* NDEBUG */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_chunk_deserialize)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(oh);
@@ -1371,7 +1371,7 @@ H5O_chunk_serialize(const H5F_t *f, H5O_t *oh, unsigned chunkno)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_chunk_serialize)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(f);
@@ -1434,7 +1434,7 @@ H5O_chunk_proxy_dest(H5O_chunk_proxy_t *chk_proxy)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_chunk_proxy_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(chk_proxy);
diff --git a/src/H5Ochunk.c b/src/H5Ochunk.c
index 488ce13..d6d4a1a 100644
--- a/src/H5Ochunk.c
+++ b/src/H5Ochunk.c
@@ -97,7 +97,7 @@ H5O_chunk_add(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
H5O_chunk_proxy_t *chk_proxy = NULL; /* Proxy for chunk, to mark it dirty in the cache */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_chunk_add, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -151,7 +151,7 @@ H5O_chunk_protect(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
H5O_chunk_proxy_t *chk_proxy = NULL; /* Proxy for protected chunk */
H5O_chunk_proxy_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_chunk_protect, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(f);
@@ -225,7 +225,7 @@ H5O_chunk_unprotect(H5F_t *f, hid_t dxpl_id, H5O_chunk_proxy_t *chk_proxy,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_chunk_unprotect, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -277,7 +277,7 @@ H5O_chunk_resize(H5O_t *oh, H5O_chunk_proxy_t *chk_proxy)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_chunk_resize, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(oh);
@@ -321,7 +321,7 @@ H5O_chunk_update_idx(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
H5O_chk_cache_ud_t chk_udata; /* User data for loading chunk */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_chunk_update_idx, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -373,7 +373,7 @@ H5O_chunk_delete(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx)
H5O_chk_cache_ud_t chk_udata; /* User data for loading chunk */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_chunk_delete, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
diff --git a/src/H5Ocont.c b/src/H5Ocont.c
index 8ba22cc..b609bfd 100644
--- a/src/H5Ocont.c
+++ b/src/H5Ocont.c
@@ -96,7 +96,7 @@ H5O_cont_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
H5O_cont_t *cont = NULL;
void *ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5O_cont_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -137,7 +137,7 @@ H5O_cont_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const void
{
const H5O_cont_t *cont = (const H5O_cont_t *) _mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_cont_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
@@ -176,7 +176,7 @@ H5O_cont_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void UNUSED *
{
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_cont_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set return value */
ret_value = H5F_SIZEOF_ADDR(f) + /* Continuation header address */
@@ -201,7 +201,7 @@ H5O_cont_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void UNUSED *
static herr_t
H5O_cont_free(void *mesg)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_cont_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(mesg);
@@ -229,7 +229,7 @@ H5O_cont_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg)
H5O_cont_t *mesg = (H5O_cont_t *) _mesg;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_cont_delete)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -266,7 +266,7 @@ H5O_cont_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
{
const H5O_cont_t *cont = (const H5O_cont_t *) _mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_cont_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c
index 9fe3d5e..1f8b4d8 100644
--- a/src/H5Ocopy.c
+++ b/src/H5Ocopy.c
@@ -186,7 +186,7 @@ H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Ocopy, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name,
ocpypl_id, lcpl_id);
@@ -308,7 +308,7 @@ H5O_copy_header_real(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */,
size_t msghdr_size;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5O_copy_header_real)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(oloc_src);
HDassert(oloc_src->file);
@@ -796,7 +796,7 @@ H5O_copy_header_map(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */,
hbool_t inc_link; /* Whether to increment the link count for the object */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5O_copy_header_map, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(oloc_src);
@@ -895,7 +895,7 @@ H5O_copy_free_addrmap_cb(void *_item, void UNUSED *key, void UNUSED *op_data)
{
H5O_addr_map_t *item = (H5O_addr_map_t *)_item;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_copy_free_addrmap_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(item);
@@ -932,7 +932,7 @@ H5O_copy_header(const H5O_loc_t *oloc_src, H5O_loc_t *oloc_dst /*out */,
H5O_copy_t cpy_info; /* Information for copying object */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5O_copy_header)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(oloc_src);
HDassert(oloc_src->file);
@@ -1002,7 +1002,7 @@ H5O_copy_obj(H5G_loc_t *src_loc, H5G_loc_t *dst_loc, const char *dst_name,
unsigned cpy_option = 0; /* Copy options */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_copy_obj, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(src_loc);
HDassert(src_loc->oloc->file);
@@ -1069,7 +1069,7 @@ H5O_copy_obj_by_ref(H5O_loc_t *src_oloc, hid_t dxpl_id, H5O_loc_t *dst_oloc,
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5O_copy_obj_by_ref, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(src_oloc);
HDassert(dst_oloc);
@@ -1137,7 +1137,7 @@ H5O_copy_expand_ref(H5F_t *file_src, void *_src_ref, hid_t dxpl_id,
size_t i; /* Local index variable */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5O_copy_expand_ref, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
HDassert(file_src);
diff --git a/src/H5Odbg.c b/src/H5Odbg.c
index 81f1e70..bd30b90 100644
--- a/src/H5Odbg.c
+++ b/src/H5Odbg.c
@@ -102,7 +102,7 @@ H5O_assert(const H5O_t *oh)
size_t hdr_size; /* Size of header's chunks */
unsigned u, v; /* Local index variables */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_assert)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Initialize the tracking variables */
hdr_size = 0;
@@ -237,7 +237,7 @@ H5O_debug_id(unsigned type_id, H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_debug_id,FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(type_id < NELMTS(H5O_msg_class_g));
@@ -284,7 +284,7 @@ H5O_debug_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, haddr_t addr, FILE *stream, i
unsigned i; /* Local index variable */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5O_debug_real, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -537,7 +537,7 @@ H5O_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int f
H5O_loc_t loc; /* Object location for object to delete */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
diff --git a/src/H5Odrvinfo.c b/src/H5Odrvinfo.c
index 864fe9e..005b74a 100644
--- a/src/H5Odrvinfo.c
+++ b/src/H5Odrvinfo.c
@@ -86,7 +86,7 @@ H5O_drvinfo_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
H5O_drvinfo_t *mesg; /* Native message */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_drvinfo_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -143,7 +143,7 @@ H5O_drvinfo_encode(H5F_t UNUSED *f, hbool_t UNUSED disable_shared, uint8_t *p, c
{
const H5O_drvinfo_t *mesg = (const H5O_drvinfo_t *)_mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_drvinfo_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@@ -183,7 +183,7 @@ H5O_drvinfo_copy(const void *_mesg, void *_dest)
H5O_drvinfo_t *dest = (H5O_drvinfo_t *)_dest;
void *ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5O_drvinfo_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(mesg);
@@ -230,7 +230,7 @@ H5O_drvinfo_size(const H5F_t UNUSED *f, hbool_t UNUSED disable_shared, const voi
const H5O_drvinfo_t *mesg = (const H5O_drvinfo_t *)_mesg;
size_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_drvinfo_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@@ -264,7 +264,7 @@ H5O_drvinfo_reset(void *_mesg)
{
H5O_drvinfo_t *mesg = (H5O_drvinfo_t *) _mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_drvinfo_reset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(mesg);
@@ -294,7 +294,7 @@ H5O_drvinfo_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE
{
const H5O_drvinfo_t *mesg = (const H5O_drvinfo_t *)_mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_drvinfo_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index 39c97cb..9ccb51b 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -134,7 +134,7 @@ H5O_dtype_decode_helper(H5F_t *f, unsigned *ioflags/*in,out*/, const uint8_t **p
size_t z;
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_decode_helper)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(pp && *pp);
@@ -597,7 +597,7 @@ H5O_dtype_encode_helper(const H5F_t *f, uint8_t **pp, const H5T_t *dt)
size_t n, z;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_encode_helper)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(pp && *pp);
@@ -1087,7 +1087,7 @@ H5O_dtype_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh, unsigned
H5T_t *dt = NULL;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(p);
@@ -1131,7 +1131,7 @@ H5O_dtype_encode(H5F_t *f, uint8_t *p, const void *mesg)
const H5T_t *dt = (const H5T_t *) mesg;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_encode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -1171,7 +1171,7 @@ H5O_dtype_copy(const void *_src, void *_dst)
H5T_t *dst;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(src);
@@ -1218,7 +1218,7 @@ H5O_dtype_size(const H5F_t *f, const void *_mesg)
unsigned u; /* Local index variable */
size_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_dtype_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(dt);
@@ -1351,7 +1351,7 @@ H5O_dtype_reset(void *_mesg)
{
H5T_t *dt = (H5T_t *) _mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_dtype_reset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(dt)
H5T_free(dt);
@@ -1377,7 +1377,7 @@ H5O_dtype_reset(void *_mesg)
static herr_t
H5O_dtype_free(void *mesg)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_dtype_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(mesg);
@@ -1406,7 +1406,7 @@ H5O_dtype_set_share(void *_mesg/*in,out*/, const H5O_shared_t *sh)
H5T_t *dt = (H5T_t *)_mesg;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_set_share)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(dt);
HDassert(sh);
@@ -1462,7 +1462,7 @@ H5O_dtype_can_share(const void *_mesg)
htri_t tri_ret;
htri_t ret_value = TRUE;
- FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_can_share)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(mesg);
@@ -1507,7 +1507,7 @@ H5O_dtype_pre_copy_file(H5F_t *file_src, const void *mesg_src,
H5D_copy_file_ud_t *udata = (H5D_copy_file_ud_t *)_udata; /* Dataset copying user data */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_pre_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(file_src);
@@ -1556,7 +1556,7 @@ H5O_dtype_copy_file(H5F_t UNUSED *file_src, const H5O_msg_class_t *mesg_type,
H5T_t *dst_mesg; /* Destination datatype */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* Perform a normal copy of the object header message */
if(NULL == (dst_mesg = (H5T_t *)H5O_dtype_copy(native_src, NULL)))
@@ -1604,7 +1604,7 @@ H5O_dtype_debug(H5F_t *f, hid_t dxpl_id, const void *mesg, FILE *stream,
unsigned i;
size_t k;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_dtype_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
diff --git a/src/H5Oefl.c b/src/H5Oefl.c
index db25e82..b71af5e 100644
--- a/src/H5Oefl.c
+++ b/src/H5Oefl.c
@@ -99,7 +99,7 @@ H5O_efl_decode(H5F_t *f, hid_t dxpl_id, H5O_t UNUSED *open_oh,
size_t u; /* Local index variable */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_efl_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(f);
@@ -197,7 +197,7 @@ H5O_efl_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const void *
const H5O_efl_t *mesg = (const H5O_efl_t *)_mesg;
size_t u; /* Local index variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_efl_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
@@ -261,7 +261,7 @@ H5O_efl_copy(const void *_mesg, void *_dest)
size_t u; /* Local index variable */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_efl_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(mesg);
@@ -345,7 +345,7 @@ H5O_efl_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void *_mesg)
const H5O_efl_t *mesg = (const H5O_efl_t *) _mesg;
size_t ret_value = 0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_efl_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
@@ -382,7 +382,7 @@ H5O_efl_reset(void *_mesg)
H5O_efl_t *mesg = (H5O_efl_t *) _mesg;
size_t u; /* Local index variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_efl_reset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(mesg);
@@ -420,7 +420,7 @@ H5O_efl_total_size (H5O_efl_t *efl)
{
hsize_t ret_value = 0, tmp;
- FUNC_ENTER_NOAPI_NOINIT(H5O_efl_total_size)
+ FUNC_ENTER_NOAPI_NOINIT
if(efl->nused > 0 && H5O_EFL_UNLIMITED == efl->slot[efl->nused - 1].size)
ret_value = H5O_EFL_UNLIMITED;
@@ -464,7 +464,7 @@ H5O_efl_copy_file(H5F_t UNUSED *file_src, void *mesg_src, H5F_t *file_dst,
size_t idx, size, name_offset, heap_size;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_efl_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(efl_src);
@@ -548,7 +548,7 @@ H5O_efl_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE * s
char buf[64];
size_t u;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_efl_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index f333410..9fa6108 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -188,7 +188,7 @@ H5O_fill_new_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh
H5O_fill_t *fill = NULL;
void *ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5O_fill_new_decode)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(f);
HDassert(p);
@@ -302,7 +302,7 @@ H5O_fill_old_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh
H5O_fill_t *fill = NULL; /* Decoded fill value message */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_fill_old_decode)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(f);
HDassert(p);
@@ -361,7 +361,7 @@ H5O_fill_new_encode(H5F_t UNUSED *f, uint8_t *p, const void *_fill)
{
const H5O_fill_t *fill = (const H5O_fill_t *)_fill;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_new_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(p);
@@ -457,7 +457,7 @@ H5O_fill_old_encode(H5F_t UNUSED *f, uint8_t *p, const void *_fill)
{
const H5O_fill_t *fill = (const H5O_fill_t *)_fill;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_old_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(p);
@@ -494,7 +494,7 @@ H5O_fill_copy(const void *_src, void *_dst)
H5O_fill_t *dst = (H5O_fill_t *)_dst;
void *ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5O_fill_copy)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(src);
@@ -611,7 +611,7 @@ H5O_fill_new_size(const H5F_t UNUSED *f, const void *_fill)
const H5O_fill_t *fill = (const H5O_fill_t *)_fill;
size_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_new_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(fill);
@@ -658,7 +658,7 @@ H5O_fill_old_size(const H5F_t UNUSED *f, const void *_fill)
{
const H5O_fill_t *fill = (const H5O_fill_t *)_fill;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_old_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(fill);
@@ -684,7 +684,7 @@ H5O_fill_reset_dyn(H5O_fill_t *fill)
hid_t fill_type_id = -1; /* Datatype ID for fill value datatype when reclaiming VL fill values */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_fill_reset_dyn, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(fill);
@@ -749,7 +749,7 @@ H5O_fill_reset(void *_fill)
{
H5O_fill_t *fill = (H5O_fill_t *)_fill;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_reset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(fill);
@@ -780,7 +780,7 @@ H5O_fill_reset(void *_fill)
static herr_t
H5O_fill_free(void *fill)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(fill);
@@ -809,7 +809,7 @@ H5O_fill_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_fill, FILE *s
const H5O_fill_t *fill = (const H5O_fill_t *)_fill;
H5D_fill_value_t fill_status; /* Whether the fill value is defined */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_fill_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(f);
HDassert(fill);
@@ -912,7 +912,7 @@ H5O_fill_convert(H5O_fill_t *fill, H5T_t *dset_type, hbool_t *fill_changed, hid_
hid_t src_id = -1, dst_id = -1; /* Datatype identifiers */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_fill_convert)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(fill);
HDassert(dset_type);
@@ -1007,7 +1007,7 @@ done:
herr_t
H5O_fill_set_latest_version(H5O_fill_t *fill)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5O_fill_set_latest_version)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(fill);
diff --git a/src/H5Oginfo.c b/src/H5Oginfo.c
index 622edb3..418b053 100644
--- a/src/H5Oginfo.c
+++ b/src/H5Oginfo.c
@@ -102,7 +102,7 @@ H5O_ginfo_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
unsigned char flags; /* Flags for encoding group info */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_ginfo_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(p);
@@ -173,7 +173,7 @@ H5O_ginfo_encode(H5F_t UNUSED *f, hbool_t UNUSED disable_shared, uint8_t *p, con
const H5O_ginfo_t *ginfo = (const H5O_ginfo_t *) _mesg;
unsigned char flags; /* Flags for encoding group info */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_ginfo_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(p);
@@ -226,7 +226,7 @@ H5O_ginfo_copy(const void *_mesg, void *_dest)
H5O_ginfo_t *dest = (H5O_ginfo_t *)_dest;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_ginfo_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(ginfo);
@@ -267,7 +267,7 @@ H5O_ginfo_size(const H5F_t UNUSED *f, hbool_t UNUSED disable_shared, const void
const H5O_ginfo_t *ginfo = (const H5O_ginfo_t *)_mesg;
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_ginfo_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set return value */
ret_value = 1 + /* Version */
@@ -300,7 +300,7 @@ H5O_ginfo_size(const H5F_t UNUSED *f, hbool_t UNUSED disable_shared, const void
static herr_t
H5O_ginfo_free(void *mesg)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_ginfo_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(mesg);
@@ -329,7 +329,7 @@ H5O_ginfo_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
{
const H5O_ginfo_t *ginfo = (const H5O_ginfo_t *) _mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_ginfo_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index 4a119ac..e4d6486 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -103,7 +103,7 @@ H5O_layout_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
unsigned u;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_layout_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -295,7 +295,7 @@ H5O_layout_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const voi
unsigned u;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_layout_encode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -373,7 +373,7 @@ H5O_layout_copy(const void *_mesg, void *_dest)
H5O_layout_t *dest = (H5O_layout_t *) _dest;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_layout_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(mesg);
@@ -433,7 +433,7 @@ H5O_layout_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void *_mesg
const H5O_layout_t *mesg = (const H5O_layout_t *) _mesg;
size_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_layout_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
@@ -465,7 +465,7 @@ H5O_layout_reset(void *_mesg)
{
H5O_layout_t *mesg = (H5O_layout_t *)_mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_layout_reset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(mesg) {
/* Free the compact storage buffer */
@@ -498,7 +498,7 @@ H5O_layout_free(void *_mesg)
H5O_layout_t *mesg = (H5O_layout_t *) _mesg;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_layout_free)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(mesg);
@@ -531,7 +531,7 @@ H5O_layout_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg)
H5O_layout_t *mesg = (H5O_layout_t *) _mesg;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_layout_delete)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -590,7 +590,7 @@ H5O_layout_copy_file(H5F_t *file_src, void *mesg_src, H5F_t *file_dst,
hbool_t copied = FALSE; /* Whether the data was copied */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_layout_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(file_src);
@@ -680,7 +680,7 @@ H5O_layout_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg,
const H5O_layout_t *mesg = (const H5O_layout_t *) _mesg;
unsigned u;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_layout_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
diff --git a/src/H5Olinfo.c b/src/H5Olinfo.c
index 891631f..4939bab 100644
--- a/src/H5Olinfo.c
+++ b/src/H5Olinfo.c
@@ -25,12 +25,14 @@
*/
#define H5G_PACKAGE /*suppress error about including H5Gpkg */
+#define H5L_PACKAGE /*suppress error about including H5Lpkg */
#define H5O_PACKAGE /*suppress error about including H5Opkg */
#include "H5private.h" /* Generic Functions */
#include "H5Eprivate.h" /* Error handling */
#include "H5FLprivate.h" /* Free lists */
#include "H5Gpkg.h" /* Groups */
+#include "H5Lpkg.h" /* Links */
#include "H5Opkg.h" /* Object headers */
@@ -118,7 +120,7 @@ H5O_linfo_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
unsigned char index_flags; /* Flags for encoding link index info */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_linfo_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -191,7 +193,7 @@ H5O_linfo_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const void
const H5O_linfo_t *linfo = (const H5O_linfo_t *)_mesg;
unsigned char index_flags; /* Flags for encoding link index info */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_linfo_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
@@ -248,7 +250,7 @@ H5O_linfo_copy(const void *_mesg, void *_dest)
H5O_linfo_t *dest = (H5O_linfo_t *) _dest;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_linfo_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(linfo);
@@ -288,7 +290,7 @@ H5O_linfo_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void *_mesg)
const H5O_linfo_t *linfo = (const H5O_linfo_t *)_mesg;
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_linfo_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set return value */
ret_value = 1 /* Version */
@@ -317,7 +319,7 @@ H5O_linfo_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void *_mesg)
static herr_t
H5O_linfo_free(void *mesg)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_linfo_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(mesg);
@@ -345,7 +347,7 @@ H5O_linfo_delete(H5F_t *f, hid_t dxpl_id, H5O_t UNUSED *open_oh, void *_mesg)
H5O_linfo_t *linfo = (H5O_linfo_t *)_mesg;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_linfo_delete)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -353,7 +355,7 @@ H5O_linfo_delete(H5F_t *f, hid_t dxpl_id, H5O_t UNUSED *open_oh, void *_mesg)
/* If the group is using "dense" link storage, delete it */
if(H5F_addr_defined(linfo->fheap_addr))
- if(H5G_dense_delete(f, dxpl_id, linfo, TRUE) < 0)
+ if(H5G__dense_delete(f, dxpl_id, linfo, TRUE) < 0)
HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to free dense link storage")
done:
@@ -385,7 +387,7 @@ H5O_linfo_copy_file(H5F_t UNUSED *file_src, void *native_src, H5F_t *file_dst,
H5G_copy_file_ud_t *udata = (H5G_copy_file_ud_t *) _udata;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_linfo_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(linfo_src);
@@ -413,7 +415,7 @@ H5O_linfo_copy_file(H5F_t UNUSED *file_src, void *native_src, H5F_t *file_dst,
*/
if(H5F_addr_defined(linfo_src->fheap_addr)) {
/* Create the dense link storage */
- if(H5G_dense_create(file_dst, dxpl_id, linfo_dst, udata->common.src_pline) < 0)
+ if(H5G__dense_create(file_dst, dxpl_id, linfo_dst, udata->common.src_pline) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "unable to create 'dense' form of new format group")
} /* end if */
} /* end else */
@@ -453,21 +455,21 @@ H5O_linfo_post_copy_file_cb(const H5O_link_t *src_lnk, void *_udata)
hbool_t dst_lnk_init = FALSE; /* Whether the destination link is initialized */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_linfo_post_copy_file_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
HDassert(src_lnk);
HDassert(udata);
/* Copy the link (and the object it points to) */
- if(H5G_link_copy_file(udata->dst_oloc->file, udata->dxpl_id, src_lnk,
+ if(H5L_link_copy_file(udata->dst_oloc->file, udata->dxpl_id, src_lnk,
udata->src_oloc, &dst_lnk, udata->cpy_info) < 0)
HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, H5_ITER_ERROR, "unable to copy link")
dst_lnk_init = TRUE;
/* Insert the new object in the destination file's group */
/* (Doesn't increment the link count - that's already been taken care of for hard links) */
- if(H5G_dense_insert(udata->dst_oloc->file, udata->dxpl_id, udata->dst_linfo, &dst_lnk) < 0)
+ if(H5G__dense_insert(udata->dst_oloc->file, udata->dxpl_id, udata->dst_linfo, &dst_lnk) < 0)
HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, H5_ITER_ERROR, "unable to insert destination link")
done:
@@ -499,7 +501,7 @@ H5O_linfo_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src,
H5O_linfo_t *linfo_dst = (H5O_linfo_t *)mesg_dst;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_linfo_post_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(src_oloc && src_oloc->file);
@@ -525,7 +527,7 @@ H5O_linfo_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src,
udata.cpy_info = cpy_info;
/* Iterate over the links in the group, building a table of the link messages */
- if(H5G_dense_iterate(src_oloc->file, dxpl_id, linfo_src, H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)0, NULL, H5O_linfo_post_copy_file_cb, &udata) < 0)
+ if(H5G__dense_iterate(src_oloc->file, dxpl_id, linfo_src, H5_INDEX_NAME, H5_ITER_NATIVE, (hsize_t)0, NULL, H5O_linfo_post_copy_file_cb, &udata) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTNEXT, FAIL, "error iterating over links")
} /* end if */
@@ -553,7 +555,7 @@ H5O_linfo_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
{
const H5O_linfo_t *linfo = (const H5O_linfo_t *) _mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_linfo_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
diff --git a/src/H5Olink.c b/src/H5Olink.c
index 7e14558..ccc6d0e 100644
--- a/src/H5Olink.c
+++ b/src/H5Olink.c
@@ -25,6 +25,7 @@
*/
#define H5G_PACKAGE /*suppress error about including H5Gpkg */
+#define H5L_PACKAGE /*suppress error about including H5Lpkg */
#define H5O_PACKAGE /*suppress error about including H5Opkg */
#include "H5private.h" /* Generic Functions */
@@ -32,7 +33,7 @@
#include "H5FLprivate.h" /* Free lists */
#include "H5Gpkg.h" /* Groups */
#include "H5Iprivate.h" /* IDs */
-#include "H5Lprivate.h" /* Links */
+#include "H5Lpkg.h" /* Links */
#include "H5MMprivate.h" /* Memory management */
#include "H5Opkg.h" /* Object headers */
@@ -124,7 +125,7 @@ H5O_link_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
unsigned char link_flags; /* Flags for encoding link info */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_link_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -281,7 +282,7 @@ H5O_link_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const void
uint64_t len; /* Length of a string in the message */
unsigned char link_flags; /* Flags for encoding link info */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_link_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
@@ -405,7 +406,7 @@ H5O_link_copy(const void *_mesg, void *_dest)
H5O_link_t *dest = (H5O_link_t *) _dest;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_link_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(lnk);
@@ -474,7 +475,7 @@ H5O_link_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void *_mesg)
size_t name_size; /* Size of encoded name length */
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_link_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Get name's length */
name_len = (uint64_t)HDstrlen(lnk->name);
@@ -538,7 +539,7 @@ H5O_link_reset(void *_mesg)
{
H5O_link_t *lnk = (H5O_link_t *)_mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_link_reset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(lnk) {
/* Free information for link (but don't free link pointer) */
@@ -572,7 +573,7 @@ H5O_link_free(void *_mesg)
{
H5O_link_t *lnk = (H5O_link_t *)_mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_link_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(lnk);
@@ -602,7 +603,7 @@ H5O_link_delete(H5F_t *f, hid_t dxpl_id, H5O_t UNUSED *open_oh, void *_mesg)
H5O_link_t *lnk = (H5O_link_t *)_mesg;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_link_delete, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -675,7 +676,7 @@ static herr_t
H5O_link_pre_copy_file(H5F_t UNUSED *file_src, const void UNUSED *native_src,
hbool_t *deleted, const H5O_copy_t *cpy_info, void UNUSED *udata)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_link_pre_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(deleted);
@@ -715,7 +716,7 @@ H5O_link_copy_file(H5F_t UNUSED *file_src, void *native_src, H5F_t UNUSED *file_
H5O_link_t *link_src = (H5O_link_t *)native_src;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_link_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(link_src);
@@ -756,7 +757,7 @@ H5O_link_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src,
H5O_link_t *link_dst = (H5O_link_t *)mesg_dst;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_link_post_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(link_src);
@@ -768,7 +769,7 @@ H5O_link_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src,
HDassert(cpy_info->max_depth < 0 || cpy_info->curr_depth < cpy_info->max_depth);
/* Copy the link (and the object it points to) */
- if(H5G_link_copy_file(dst_oloc->file, dxpl_id, link_src, src_oloc, link_dst,
+ if(H5L_link_copy_file(dst_oloc->file, dxpl_id, link_src, src_oloc, link_dst,
cpy_info) < 0)
HGOTO_ERROR(H5E_OHDR, H5E_CANTCOPY, FAIL, "unable to copy link")
@@ -797,7 +798,7 @@ H5O_link_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
const H5O_link_t *lnk = (const H5O_link_t *) _mesg;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_link_debug)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
diff --git a/src/H5Omessage.c b/src/H5Omessage.c
index 467df3d..13ad73d 100644
--- a/src/H5Omessage.c
+++ b/src/H5Omessage.c
@@ -119,7 +119,7 @@ H5O_msg_create(const H5O_loc_t *loc, unsigned type_id, unsigned mesg_flags,
H5O_t *oh = NULL; /* Object header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_create, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(loc);
@@ -167,7 +167,7 @@ H5O_msg_append_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id,
const H5O_msg_class_t *type; /* Original H5O class type for the ID */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_append_oh, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -210,7 +210,7 @@ H5O_msg_append_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *t
int idx; /* Index of message to modify */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_append_real, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -263,7 +263,7 @@ H5O_msg_write(const H5O_loc_t *loc, unsigned type_id, unsigned mesg_flags,
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_write, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(loc);
@@ -318,7 +318,7 @@ H5O_msg_write_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id,
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_write_oh, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -367,7 +367,7 @@ H5O_msg_write_real(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *ty
unsigned idx; /* Index of message to modify */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_msg_write_real)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -467,7 +467,7 @@ H5O_msg_read(const H5O_loc_t *loc, unsigned type_id, void *mesg,
H5O_t *oh = NULL; /* Object header to use */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_read, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(loc);
@@ -522,7 +522,7 @@ H5O_msg_read_oh(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned type_id,
unsigned idx; /* Message's index in object header */
void *ret_value = NULL;
- FUNC_ENTER_NOAPI_NOINIT(H5O_msg_read_oh)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -578,7 +578,7 @@ H5O_msg_reset(unsigned type_id, void *native)
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_reset, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(type_id < NELMTS(H5O_msg_class_g));
@@ -614,7 +614,7 @@ H5O_msg_reset_real(const H5O_msg_class_t *type, void *native)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_msg_reset_real)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(type);
@@ -654,7 +654,7 @@ H5O_msg_free(unsigned type_id, void *mesg)
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
void * ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5O_msg_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(type_id < NELMTS(H5O_msg_class_g));
@@ -683,7 +683,7 @@ H5O_msg_free(unsigned type_id, void *mesg)
herr_t
H5O_msg_free_mesg(H5O_mesg_t *mesg)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_msg_free_mesg)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(mesg);
@@ -713,7 +713,7 @@ H5O_msg_free_mesg(H5O_mesg_t *mesg)
void *
H5O_msg_free_real(const H5O_msg_class_t *type, void *msg_native)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_msg_free_real)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(type);
@@ -751,7 +751,7 @@ H5O_msg_copy(unsigned type_id, const void *mesg, void *dst)
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_copy, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(mesg);
@@ -790,7 +790,7 @@ H5O_msg_count(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id)
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_count, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(loc);
@@ -836,7 +836,7 @@ H5O_msg_count_real(const H5O_t *oh, const H5O_msg_class_t *type)
unsigned u; /* Local index variable */
unsigned ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_msg_count_real)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(oh);
@@ -875,7 +875,7 @@ H5O_msg_exists(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id)
H5O_t *oh = NULL; /* Object header for location */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_exists, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(loc);
HDassert(loc->file);
@@ -922,7 +922,7 @@ H5O_msg_exists_oh(const H5O_t *oh, unsigned type_id)
unsigned u; /* Local index variable */
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_msg_exists_oh)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(oh);
HDassert(type_id < NELMTS(H5O_msg_class_g));
@@ -967,7 +967,7 @@ H5O_msg_remove(const H5O_loc_t *loc, unsigned type_id, int sequence, hbool_t adj
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_remove, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(loc);
@@ -1019,7 +1019,7 @@ H5O_msg_remove_op(const H5O_loc_t *loc, unsigned type_id, int sequence,
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_remove_op, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(loc);
@@ -1073,7 +1073,7 @@ H5O_msg_remove_cb(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, unsigned sequence,
htri_t try_remove = FALSE; /* Whether to try removing a message */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_msg_remove_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(mesg);
@@ -1140,7 +1140,7 @@ H5O_msg_remove_real(H5F_t *f, H5O_t *oh, const H5O_msg_class_t *type,
H5O_mesg_operator_t op; /* Wrapper for operator */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_remove_real, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -1214,7 +1214,7 @@ H5O_msg_iterate(const H5O_loc_t *loc, unsigned type_id,
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_iterate, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(loc);
@@ -1288,7 +1288,7 @@ H5O_msg_iterate_real(H5F_t *f, H5O_t *oh, const H5O_msg_class_t *type,
unsigned oh_modified = 0; /* Whether the callback modified the object header */
herr_t ret_value = H5_ITER_CONT; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_msg_iterate_real)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -1369,7 +1369,7 @@ H5O_msg_raw_size(const H5F_t *f, unsigned type_id, hbool_t disable_shared,
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_raw_size, 0)
+ FUNC_ENTER_NOAPI(0)
/* Check args */
HDassert(type_id < NELMTS(H5O_msg_class_g));
@@ -1414,7 +1414,7 @@ H5O_msg_size_f(const H5F_t *f, hid_t ocpl_id, unsigned type_id,
uint8_t oh_flags; /* Object header status flags */
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_size_f, 0)
+ FUNC_ENTER_NOAPI(0)
/* Check args */
HDassert(type_id < NELMTS(H5O_msg_class_g));
@@ -1476,7 +1476,7 @@ H5O_msg_size_oh(const H5F_t *f, const H5O_t *oh, unsigned type_id,
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_size_oh, 0)
+ FUNC_ENTER_NOAPI(0)
/* Check args */
HDassert(type_id < NELMTS(H5O_msg_class_g));
@@ -1527,7 +1527,7 @@ H5O_msg_can_share(unsigned type_id, const void *mesg)
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
htri_t ret_value;
- FUNC_ENTER_NOAPI_NOFUNC(H5O_msg_can_share)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(type_id < NELMTS(H5O_msg_class_g));
@@ -1574,7 +1574,7 @@ H5O_msg_can_share_in_ohdr(unsigned type_id)
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
htri_t ret_value;
- FUNC_ENTER_NOAPI_NOFUNC(H5O_msg_can_share_in_ohdr)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(type_id < NELMTS(H5O_msg_class_g));
@@ -1612,7 +1612,7 @@ H5O_msg_is_shared(unsigned type_id, const void *mesg)
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
htri_t ret_value;
- FUNC_ENTER_NOAPI_NOFUNC(H5O_msg_is_shared)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(type_id < NELMTS(H5O_msg_class_g));
@@ -1650,7 +1650,7 @@ H5O_msg_set_share(unsigned type_id, const H5O_shared_t *share, void *mesg)
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_set_share, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(type_id < NELMTS(H5O_msg_class_g));
@@ -1700,7 +1700,7 @@ H5O_msg_reset_share(unsigned type_id, void *mesg)
{
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
- FUNC_ENTER_NOAPI_NOFUNC(H5O_msg_reset_share)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(type_id < NELMTS(H5O_msg_class_g));
@@ -1735,7 +1735,7 @@ H5O_msg_get_crt_index(unsigned type_id, const void *mesg, H5O_msg_crt_idx_t *crt
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5O_msg_get_crt_index, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(type_id < NELMTS(H5O_msg_class_g));
@@ -1781,7 +1781,7 @@ H5O_msg_encode(H5F_t *f, unsigned type_id, hbool_t disable_shared,
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_encode,FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -1827,7 +1827,7 @@ H5O_msg_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned type_id,
void *ret_value; /* Return value */
unsigned ioflags = 0; /* Flags for decode routine */
- FUNC_ENTER_NOAPI(H5O_msg_decode, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(f);
@@ -1869,7 +1869,7 @@ H5O_msg_copy_file(const H5O_msg_class_t *type, H5F_t *file_src,
{
void *ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5O_msg_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(type);
@@ -1911,7 +1911,7 @@ H5O_msg_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type,
htri_t shared_mesg; /* Should this message be stored in the Shared Message table? */
int ret_value = FAIL; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_msg_alloc)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -1975,7 +1975,7 @@ H5O_copy_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned idx,
hbool_t chk_dirtied = FALSE; /* Flag for unprotecting chunk */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_copy_mesg)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -2050,7 +2050,7 @@ H5O_msg_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned type_id,
const H5O_msg_class_t *type; /* Actual H5O class type for the ID */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_delete, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(f);
@@ -2088,7 +2088,7 @@ H5O_delete_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5O_mesg_t *mesg)
const H5O_msg_class_t *type = mesg->type; /* Type of object to free */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_delete_mesg, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(f);
@@ -2129,7 +2129,7 @@ H5O_msg_flush(H5F_t *f, H5O_t *oh, H5O_mesg_t *mesg)
unsigned msg_id; /* ID for message */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_flush, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -2231,7 +2231,7 @@ H5O_flush_msgs(H5F_t *f, H5O_t *oh)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_flush_msgs, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(f);
@@ -2282,7 +2282,7 @@ H5O_msg_get_chunkno(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id)
unsigned idx; /* Index of message to modify */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_get_chunkno, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(loc);
@@ -2337,7 +2337,7 @@ H5O_msg_lock(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id)
unsigned idx; /* Index of message to modify */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_lock, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(loc);
@@ -2395,7 +2395,7 @@ H5O_msg_unlock(const H5O_loc_t *loc, unsigned type_id, hid_t dxpl_id)
unsigned idx; /* Index of message to modify */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_msg_unlock, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(loc);
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index 731d833..e719e08 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -126,7 +126,7 @@ H5O_mtime_new_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_o
uint32_t tmp_time; /* Temporary copy of the time */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_mtime_new_decode);
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
assert(f);
@@ -151,7 +151,7 @@ H5O_mtime_new_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_o
ret_value=mesg;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5O_mtime_new_decode() */
@@ -180,7 +180,7 @@ H5O_mtime_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
struct tm tm;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_mtime_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -287,7 +287,7 @@ H5O_mtime_new_encode(H5F_t UNUSED *f, hbool_t UNUSED disable_shared, uint8_t *p,
{
const time_t *mesg = (const time_t *) _mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_mtime_new_encode);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
assert(f);
@@ -305,7 +305,7 @@ H5O_mtime_new_encode(H5F_t UNUSED *f, hbool_t UNUSED disable_shared, uint8_t *p,
/* Encode time */
UINT32ENCODE(p, *mesg);
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5O_mtime_new_encode() */
@@ -330,7 +330,7 @@ H5O_mtime_encode(H5F_t UNUSED *f, hbool_t UNUSED disable_shared, uint8_t *p, con
const time_t *mesg = (const time_t *) _mesg;
struct tm *tm;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_mtime_encode);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
assert(f);
@@ -343,7 +343,7 @@ H5O_mtime_encode(H5F_t UNUSED *f, hbool_t UNUSED disable_shared, uint8_t *p, con
1900+tm->tm_year, 1+tm->tm_mon, tm->tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec);
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
}
@@ -372,7 +372,7 @@ H5O_mtime_copy(const void *_mesg, void *_dest)
time_t *dest = (time_t *) _dest;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_mtime_copy);
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
assert(mesg);
@@ -386,7 +386,7 @@ H5O_mtime_copy(const void *_mesg, void *_dest)
ret_value=dest;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
@@ -413,13 +413,13 @@ done:
static size_t
H5O_mtime_new_size(const H5F_t UNUSED * f, hbool_t UNUSED disable_shared, const void UNUSED * mesg)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_mtime_new_size);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
assert(f);
assert(mesg);
- FUNC_LEAVE_NOAPI(8);
+ FUNC_LEAVE_NOAPI(8)
} /* end H5O_mtime_new_size() */
@@ -446,13 +446,13 @@ H5O_mtime_new_size(const H5F_t UNUSED * f, hbool_t UNUSED disable_shared, const
static size_t
H5O_mtime_size(const H5F_t UNUSED * f, hbool_t UNUSED disable_shared, const void UNUSED * mesg)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_mtime_size);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
assert(f);
assert(mesg);
- FUNC_LEAVE_NOAPI(16);
+ FUNC_LEAVE_NOAPI(16)
}
@@ -474,9 +474,9 @@ H5O_mtime_size(const H5F_t UNUSED * f, hbool_t UNUSED disable_shared, const void
static herr_t
H5O_mtime_reset(void UNUSED *_mesg)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_mtime_reset);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
}
@@ -497,7 +497,7 @@ H5O_mtime_reset(void UNUSED *_mesg)
static herr_t
H5O_mtime_free(void *mesg)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_mtime_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(mesg);
@@ -530,7 +530,7 @@ H5O_mtime_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
struct tm *tm;
char buf[128];
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_mtime_debug);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
assert(f);
@@ -546,6 +546,6 @@ H5O_mtime_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
fprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
"Time:", buf);
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
}
diff --git a/src/H5Oname.c b/src/H5Oname.c
index f8d3553..fb44000 100644
--- a/src/H5Oname.c
+++ b/src/H5Oname.c
@@ -90,7 +90,7 @@ H5O_name_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
H5O_name_t *mesg;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_name_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -135,7 +135,7 @@ H5O_name_encode(H5F_t UNUSED *f, hbool_t UNUSED disable_shared, uint8_t *p, cons
{
const H5O_name_t *mesg = (const H5O_name_t *) _mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_name_encode);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
assert(f);
@@ -145,7 +145,7 @@ H5O_name_encode(H5F_t UNUSED *f, hbool_t UNUSED disable_shared, uint8_t *p, cons
/* encode */
HDstrcpy((char*)p, mesg->s);
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
}
@@ -174,7 +174,7 @@ H5O_name_copy(const void *_mesg, void *_dest)
H5O_name_t *dest = (H5O_name_t *) _dest;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_name_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(mesg);
@@ -225,7 +225,7 @@ H5O_name_size(const H5F_t UNUSED *f, hbool_t UNUSED disable_shared, const void *
const H5O_name_t *mesg = (const H5O_name_t *) _mesg;
size_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_name_size);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
assert(f);
@@ -233,7 +233,7 @@ H5O_name_size(const H5F_t UNUSED *f, hbool_t UNUSED disable_shared, const void *
ret_value = mesg->s ? HDstrlen(mesg->s) + 1 : 0;
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
@@ -258,7 +258,7 @@ H5O_name_reset(void *_mesg)
{
H5O_name_t *mesg = (H5O_name_t *) _mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_name_reset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(mesg);
@@ -291,7 +291,7 @@ H5O_name_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *s
{
const H5O_name_t *mesg = (const H5O_name_t *)_mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_name_debug);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
assert(f);
@@ -304,5 +304,5 @@ H5O_name_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *s
"Name:",
mesg->s);
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
}
diff --git a/src/H5Opline.c b/src/H5Opline.c
index 518bcdf..89ce865 100644
--- a/src/H5Opline.c
+++ b/src/H5Opline.c
@@ -117,7 +117,7 @@ H5O_pline_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
size_t i; /* Local index variable */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_pline_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(p);
@@ -242,7 +242,7 @@ H5O_pline_encode(H5F_t UNUSED *f, uint8_t *p/*out*/, const void *mesg)
const H5Z_filter_info_t *filter; /* Filter to encode */
size_t i, j; /* Local index variables */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_pline_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(p);
@@ -345,7 +345,7 @@ H5O_pline_copy(const void *_src, void *_dst/*out*/)
size_t i; /* Local index variable */
H5O_pline_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_pline_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* Allocate pipeline message, if not provided */
if(!dst && NULL == (dst = H5FL_MALLOC(H5O_pline_t)))
@@ -438,7 +438,7 @@ H5O_pline_size(const H5F_t UNUSED *f, const void *mesg)
size_t i; /* Local index variable */
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_pline_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Message header */
ret_value = 1 + /*version */
@@ -497,7 +497,7 @@ H5O_pline_reset(void *mesg)
H5O_pline_t *pline = (H5O_pline_t*)mesg; /* Pipeline message */
size_t i; /* Local index variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_pline_reset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(pline);
@@ -542,7 +542,7 @@ H5O_pline_reset(void *mesg)
static herr_t
H5O_pline_free(void *mesg)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_pline_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(mesg);
@@ -575,7 +575,7 @@ H5O_pline_pre_copy_file(H5F_t UNUSED *file_src, const void *mesg_src,
H5O_copy_file_ud_common_t *udata = (H5O_copy_file_ud_common_t *)_udata; /* Object copying user data */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_pline_pre_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(pline_src);
@@ -614,7 +614,7 @@ H5O_pline_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *mesg, FILE *s
const H5O_pline_t *pline = (const H5O_pline_t *)mesg;
size_t i, j;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_pline_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
@@ -681,7 +681,7 @@ H5O_pline_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *mesg, FILE *s
herr_t
H5O_pline_set_latest_version(H5O_pline_t *pline)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5O_pline_set_latest_version)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(pline);
diff --git a/src/H5Orefcount.c b/src/H5Orefcount.c
index e3c6981..399c8da 100644
--- a/src/H5Orefcount.c
+++ b/src/H5Orefcount.c
@@ -96,7 +96,7 @@ H5O_refcount_decode(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh
H5O_refcount_t *refcount = NULL; /* Reference count */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_refcount_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -142,7 +142,7 @@ H5O_refcount_encode(H5F_t UNUSED *f, hbool_t UNUSED disable_shared, uint8_t *p,
{
const H5O_refcount_t *refcount = (const H5O_refcount_t *)_mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_refcount_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
@@ -181,7 +181,7 @@ H5O_refcount_copy(const void *_mesg, void *_dest)
H5O_refcount_t *dest = (H5O_refcount_t *) _dest;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_refcount_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(refcount);
@@ -221,7 +221,7 @@ H5O_refcount_size(const H5F_t UNUSED *f, hbool_t UNUSED disable_shared,
{
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_refcount_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set return value */
ret_value = 1 /* Version */
@@ -246,7 +246,7 @@ H5O_refcount_size(const H5F_t UNUSED *f, hbool_t UNUSED disable_shared,
static herr_t
H5O_refcount_free(void *mesg)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_refcount_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(mesg);
@@ -274,7 +274,7 @@ static herr_t
H5O_refcount_pre_copy_file(H5F_t UNUSED *file_src, const void UNUSED *native_src,
hbool_t *deleted, const H5O_copy_t UNUSED *cpy_info, void UNUSED *udata)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_refcount_pre_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(deleted);
@@ -308,7 +308,7 @@ H5O_refcount_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FIL
{
const H5O_refcount_t *refcount = (const H5O_refcount_t *) _mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_refcount_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c
index 62d5b63..8ae73f7 100644
--- a/src/H5Osdspace.c
+++ b/src/H5Osdspace.c
@@ -118,7 +118,7 @@ H5O_sdspace_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
unsigned i; /* local counting variable */
unsigned flags, version;
- FUNC_ENTER_NOAPI_NOINIT(H5O_sdspace_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -236,7 +236,7 @@ H5O_sdspace_encode(H5F_t *f, uint8_t *p, const void *_mesg)
unsigned flags = 0;
unsigned u; /* Local counting variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_sdspace_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
@@ -303,7 +303,7 @@ H5O_sdspace_copy(const void *_mesg, void *_dest)
H5S_extent_t *dest = (H5S_extent_t *)_dest;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_sdspace_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(mesg);
@@ -353,7 +353,7 @@ H5O_sdspace_size(const H5F_t *f, const void *_mesg)
const H5S_extent_t *space = (const H5S_extent_t *)_mesg;
size_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_sdspace_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Basic information for all dataspace messages */
ret_value = 1 + /* Version */
@@ -392,7 +392,7 @@ H5O_sdspace_reset(void *_mesg)
{
H5S_extent_t *mesg = (H5S_extent_t*)_mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_sdspace_reset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
H5S_extent_release(mesg);
@@ -415,7 +415,7 @@ H5O_sdspace_reset(void *_mesg)
static herr_t
H5O_sdspace_free(void *mesg)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_sdspace_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(mesg);
@@ -448,7 +448,7 @@ H5O_sdspace_pre_copy_file(H5F_t UNUSED *file_src, const void *mesg_src,
H5D_copy_file_ud_t *udata = (H5D_copy_file_ud_t *)_udata; /* Dataset copying user data */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_sdspace_pre_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(file_src);
@@ -499,7 +499,7 @@ H5O_sdspace_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *mesg,
{
const H5S_extent_t *sdim = (const H5S_extent_t *)mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_sdspace_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(f);
diff --git a/src/H5Oshared.c b/src/H5Oshared.c
index 864c364..45c0a7d 100644
--- a/src/H5Oshared.c
+++ b/src/H5Oshared.c
@@ -114,7 +114,7 @@ H5O_shared_read(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned *ioflags,
uint8_t mesg_buf[H5O_MESG_BUF_SIZE]; /* Buffer for deserializing messages */
void *ret_value = NULL; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_shared_read)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -226,7 +226,7 @@ H5O_shared_link_adj(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_shared_link_adj)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -315,7 +315,7 @@ H5O_shared_decode(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned *ioflags,
unsigned version; /* Shared message version */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_shared_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(f);
@@ -400,7 +400,7 @@ H5O_shared_encode(const H5F_t *f, uint8_t *buf/*out*/, const H5O_shared_t *sh_me
{
unsigned version;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_shared_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(f);
@@ -448,7 +448,7 @@ H5O_shared_encode(const H5F_t *f, uint8_t *buf/*out*/, const H5O_shared_t *sh_me
herr_t
H5O_set_shared(H5O_shared_t *dst, const H5O_shared_t *src)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_set_shared)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(dst);
@@ -479,7 +479,7 @@ H5O_shared_size(const H5F_t *f, const H5O_shared_t *sh_mesg)
{
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_shared_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(sh_mesg->type == H5O_SHARE_TYPE_COMMITTED) {
ret_value = (size_t)1 + /*version */
@@ -515,7 +515,7 @@ H5O_shared_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_shared_delete)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -558,7 +558,7 @@ H5O_shared_link(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_shared_link)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -596,7 +596,7 @@ H5O_shared_copy_file(H5F_t *file_src, H5F_t *file_dst,
H5O_shared_t *shared_dst = (H5O_shared_t *)_native_dst; /* Alias to shared info in native destination message */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_shared_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(file_src);
@@ -656,7 +656,7 @@ H5O_shared_post_copy_file(H5F_t *f, const H5O_msg_class_t *mesg_type,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_shared_post_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -705,7 +705,7 @@ done:
herr_t
H5O_shared_debug(const H5O_shared_t *mesg, FILE *stream, int indent, int fwidth)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_shared_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(mesg);
diff --git a/src/H5Oshared.h b/src/H5Oshared.h
index 70b54dc..ddacc25 100644
--- a/src/H5Oshared.h
+++ b/src/H5Oshared.h
@@ -53,7 +53,7 @@ H5O_SHARED_DECODE(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned mesg_flags,
{
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_SHARED_DECODE)
+ FUNC_ENTER_NOAPI_NOINIT
#ifndef H5O_SHARED_TYPE
#error "Need to define H5O_SHARED_TYPE macro!"
@@ -113,7 +113,7 @@ H5O_SHARED_ENCODE(H5F_t *f, hbool_t disable_shared, uint8_t *p, const void *_mes
const H5O_shared_t *sh_mesg = (const H5O_shared_t *)_mesg; /* Pointer to shared message portion of actual message */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_SHARED_ENCODE)
+ FUNC_ENTER_NOAPI_NOINIT
#ifndef H5O_SHARED_TYPE
#error "Need to define H5O_SHARED_TYPE macro!"
@@ -168,7 +168,7 @@ H5O_SHARED_SIZE(const H5F_t *f, hbool_t disable_shared, const void *_mesg)
const H5O_shared_t *sh_mesg = (const H5O_shared_t *)_mesg; /* Pointer to shared message portion of actual message */
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_SHARED_SIZE)
+ FUNC_ENTER_NOAPI_NOINIT
#ifndef H5O_SHARED_TYPE
#error "Need to define H5O_SHARED_TYPE macro!"
@@ -221,7 +221,7 @@ H5O_SHARED_DELETE(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg)
H5O_shared_t *sh_mesg = (H5O_shared_t *)_mesg; /* Pointer to shared message portion of actual message */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_SHARED_DELETE)
+ FUNC_ENTER_NOAPI_NOINIT
#ifndef H5O_SHARED_TYPE
#error "Need to define H5O_SHARED_TYPE macro!"
@@ -273,7 +273,7 @@ H5O_SHARED_LINK(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, void *_mesg)
H5O_shared_t *sh_mesg = (H5O_shared_t *)_mesg; /* Pointer to shared message portion of actual message */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_SHARED_LINK)
+ FUNC_ENTER_NOAPI_NOINIT
#ifndef H5O_SHARED_TYPE
#error "Need to define H5O_SHARED_TYPE macro!"
@@ -325,7 +325,7 @@ H5O_SHARED_COPY_FILE(H5F_t *file_src, void *_native_src, H5F_t *file_dst,
void *dst_mesg = NULL; /* Destination message */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_SHARED_COPY_FILE)
+ FUNC_ENTER_NOAPI_NOINIT
#ifndef H5O_SHARED_TYPE
#error "Need to define H5O_SHARED_TYPE macro!"
@@ -389,7 +389,7 @@ H5O_SHARED_POST_COPY_FILE(const H5O_loc_t *oloc_src, const void *mesg_src,
H5O_shared_t *shared_dst = (H5O_shared_t *)mesg_dst; /* Alias to shared info in native destination */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_SHARED_POST_COPY_FILE)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(oloc_src->file);
HDassert(oloc_dst->file);
@@ -451,7 +451,7 @@ H5O_SHARED_DEBUG(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream,
const H5O_shared_t *sh_mesg = (const H5O_shared_t *)_mesg; /* Pointer to shared message portion of actual message */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_SHARED_DEBUG)
+ FUNC_ENTER_NOAPI_NOINIT
#ifndef H5O_SHARED_TYPE
#error "Need to define H5O_SHARED_TYPE macro!"
diff --git a/src/H5Oshmesg.c b/src/H5Oshmesg.c
index 51c1c55..69c7d49 100644
--- a/src/H5Oshmesg.c
+++ b/src/H5Oshmesg.c
@@ -82,7 +82,7 @@ H5O_shmesg_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
H5O_shmesg_table_t *mesg; /* Native message */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_shmesg_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -121,7 +121,7 @@ H5O_shmesg_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const voi
{
const H5O_shmesg_table_t *mesg = (const H5O_shmesg_table_t *)_mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_shmesg_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@@ -158,7 +158,7 @@ H5O_shmesg_copy(const void *_mesg, void *_dest)
H5O_shmesg_table_t *dest = (H5O_shmesg_table_t *)_dest;
void *ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5O_shmesg_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(mesg);
@@ -196,7 +196,7 @@ H5O_shmesg_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void UNUSED
{
size_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_shmesg_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
@@ -227,7 +227,7 @@ H5O_shmesg_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE
{
const H5O_shmesg_table_t *mesg = (const H5O_shmesg_table_t *)_mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_shmesg_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(f);
diff --git a/src/H5Ostab.c b/src/H5Ostab.c
index cc08300..c43a76b 100644
--- a/src/H5Ostab.c
+++ b/src/H5Ostab.c
@@ -102,7 +102,7 @@ H5O_stab_decode(H5F_t *f, hid_t UNUSED dxpl_id, H5O_t UNUSED *open_oh,
H5O_stab_t *stab = NULL;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_stab_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
@@ -145,7 +145,7 @@ H5O_stab_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const void
{
const H5O_stab_t *stab = (const H5O_stab_t *) _mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_stab_encode);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
assert(f);
@@ -156,7 +156,7 @@ H5O_stab_encode(H5F_t *f, hbool_t UNUSED disable_shared, uint8_t *p, const void
H5F_addr_encode(f, &p, stab->btree_addr);
H5F_addr_encode(f, &p, stab->heap_addr);
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
}
@@ -183,7 +183,7 @@ H5O_stab_copy(const void *_mesg, void *_dest)
H5O_stab_t *dest = (H5O_stab_t *) _dest;
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_stab_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(stab);
@@ -223,12 +223,12 @@ H5O_stab_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void UNUSED *
{
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_stab_size);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set return value */
ret_value=2 * H5F_SIZEOF_ADDR(f);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
@@ -249,7 +249,7 @@ H5O_stab_size(const H5F_t *f, hbool_t UNUSED disable_shared, const void UNUSED *
static herr_t
H5O_stab_free(void *mesg)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_stab_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(mesg);
@@ -276,14 +276,14 @@ H5O_stab_delete(H5F_t *f, hid_t dxpl_id, H5O_t UNUSED *open_oh, void *mesg)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_stab_delete)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(f);
HDassert(mesg);
/* Free the file space for the symbol table */
- if(H5G_stab_delete(f, dxpl_id, (const H5O_stab_t *)mesg) < 0)
+ if(H5G__stab_delete(f, dxpl_id, (const H5O_stab_t *)mesg) < 0)
HGOTO_ERROR(H5E_OHDR, H5E_CANTFREE, FAIL, "unable to free symbol table")
done:
@@ -316,7 +316,7 @@ H5O_stab_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst,
size_t size_hint; /* Local heap initial size */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_stab_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(stab_src);
@@ -331,7 +331,7 @@ H5O_stab_copy_file(H5F_t *file_src, void *native_src, H5F_t *file_dst,
HGOTO_ERROR(H5E_SYM, H5E_CANTGETSIZE, NULL, "can't query local heap size")
/* Create components of symbol table message */
- if(H5G_stab_create_components(file_dst, stab_dst, size_hint, dxpl_id) < 0)
+ if(H5G__stab_create_components(file_dst, stab_dst, size_hint, dxpl_id) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, NULL, "can't create symbol table components")
/* Cache stab in udata */
@@ -372,7 +372,7 @@ H5O_stab_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc
H5G_bt_it_cpy_t udata; /* B-tree user data */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_stab_post_copy_file)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(stab_src);
@@ -393,7 +393,7 @@ H5O_stab_post_copy_file(const H5O_loc_t *src_oloc, const void *mesg_src, H5O_loc
udata.cpy_info = cpy_info;
/* Iterate over objects in group, copying them */
- if((H5B_iterate(src_oloc->file, dxpl_id, H5B_SNODE, stab_src->btree_addr, H5G_node_copy, &udata)) < 0)
+ if((H5B_iterate(src_oloc->file, dxpl_id, H5B_SNODE, stab_src->btree_addr, H5G__node_copy, &udata)) < 0)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "iteration operator failed")
done:
@@ -422,7 +422,7 @@ H5O_stab_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
{
const H5O_stab_t *stab = (const H5O_stab_t *) _mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_stab_debug);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
assert(f);
@@ -437,5 +437,6 @@ H5O_stab_debug(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const void *_mesg, FILE *
HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
"Name heap address:", stab->heap_addr);
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
}
+
diff --git a/src/H5Otest.c b/src/H5Otest.c
index 83c8dff..0971c85 100644
--- a/src/H5Otest.c
+++ b/src/H5Otest.c
@@ -101,7 +101,7 @@ H5O_is_attr_dense_test(hid_t oid)
H5O_loc_t *loc; /* Pointer to object's location */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_is_attr_dense_test, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Get object location for object */
if(NULL == (loc = H5O_get_loc(oid)))
@@ -166,7 +166,7 @@ H5O_is_attr_empty_test(hid_t oid)
hsize_t nattrs; /* Number of attributes */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_is_attr_empty_test, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Get object location for object */
if(NULL == (loc = H5O_get_loc(oid)))
@@ -253,7 +253,7 @@ H5O_num_attrs_test(hid_t oid, hsize_t *nattrs)
hsize_t obj_nattrs; /* Number of attributes */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_num_attrs_test, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Get object location for object */
if(NULL == (loc = H5O_get_loc(oid)))
@@ -339,7 +339,7 @@ H5O_attr_dense_info_test(hid_t oid, hsize_t *name_count, hsize_t *corder_count)
H5O_loc_t *loc; /* Pointer to object's location */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_attr_dense_info_test, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Get object location for object */
if(NULL == (loc = H5O_get_loc(oid)))
@@ -427,7 +427,7 @@ H5O_check_msg_marked_test(hid_t oid, hbool_t flag_val)
unsigned idx; /* Index of message */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_check_msg_marked_test, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Get object location for object */
if(NULL == (loc = H5O_get_loc(oid)))
@@ -490,7 +490,7 @@ H5O_expunge_chunks_test(const H5O_loc_t *loc, hid_t dxpl_id)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_expunge_chunks_test, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Get the object header */
if(NULL == (oh = H5O_protect(loc, dxpl_id, H5AC_WRITE)))
@@ -546,7 +546,7 @@ H5O_get_rc(const H5O_loc_t *loc, hid_t dxpl_id, unsigned *rc)
H5O_t *oh = NULL; /* Object header */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5O_get_rc, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(loc);
diff --git a/src/H5Ounknown.c b/src/H5Ounknown.c
index 68bb64b..548f74d 100644
--- a/src/H5Ounknown.c
+++ b/src/H5Ounknown.c
@@ -78,7 +78,7 @@ H5FL_DEFINE(H5O_unknown_t);
static herr_t
H5O_unknown_free(void *mesg)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5O_unknown_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(mesg);
diff --git a/src/H5P.c b/src/H5P.c
index afcb84e..92b3d18 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -81,7 +81,7 @@ DESCRIPTION
static herr_t
H5P_init_pub_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_init_pub_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5P_init())
} /* H5P_init_pub_interface() */
@@ -114,7 +114,7 @@ H5Pcopy(hid_t id)
void *obj; /* Property object to copy */
hid_t ret_value=FALSE; /* return value */
- FUNC_ENTER_API(H5Pcopy, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", id);
if(H5P_DEFAULT==id)
@@ -147,7 +147,7 @@ H5Pcopy(hid_t id)
} /* end else */
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* H5Pcopy() */
@@ -196,7 +196,7 @@ H5Pcreate_class(hid_t parent, const char *name,
H5P_genclass_t *pclass = NULL; /* Property list class created */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Pcreate_class, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE8("i", "i*sx*xx*xx*x", parent, name, cls_create, create_data, cls_copy,
copy_data, cls_close, close_data);
@@ -260,7 +260,7 @@ H5Pcreate(hid_t cls_id)
H5P_genclass_t *pclass; /* Property list class to modify */
hid_t ret_value; /* return value */
- FUNC_ENTER_API(H5Pcreate, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", cls_id);
/* Check arguments. */
@@ -272,7 +272,7 @@ H5Pcreate(hid_t cls_id)
HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL, "unable to create property list");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* H5Pcreate() */
@@ -441,7 +441,7 @@ H5Pregister2(hid_t cls_id, const char *name, size_t size, void *def_value,
H5P_genclass_t *orig_pclass; /* Original property class */
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Pregister2, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE11("e", "i*sz*xxxxxxxx", cls_id, name, size, def_value, prp_create,
prp_set, prp_get, prp_delete, prp_copy, prp_cmp, prp_close);
@@ -625,7 +625,7 @@ H5Pinsert2(hid_t plist_id, const char *name, size_t size, void *value,
H5P_genplist_t *plist; /* Property list to modify */
herr_t ret_value; /* return value */
- FUNC_ENTER_API(H5Pinsert2, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE10("e", "i*sz*xxxxxxx", plist_id, name, size, value, prp_set, prp_get,
prp_delete, prp_copy, prp_cmp, prp_close);
@@ -642,7 +642,7 @@ H5Pinsert2(hid_t plist_id, const char *name, size_t size, void *value,
HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to register property in plist")
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* H5Pinsert2() */
@@ -683,7 +683,7 @@ H5Pset(hid_t plist_id, const char *name, void *value)
H5P_genplist_t *plist; /* Property list to modify */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*s*x", plist_id, name, value);
/* Check arguments. */
@@ -699,7 +699,7 @@ H5Pset(hid_t plist_id, const char *name, void *value)
HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to set value in plist");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* H5Pset() */
@@ -732,7 +732,7 @@ H5Pexist(hid_t id, const char *name)
H5P_genclass_t *pclass; /* Property class to query */
htri_t ret_value; /* return value */
- FUNC_ENTER_API(H5Pexist, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("t", "i*s", id, name);
/* Check arguments. */
@@ -759,7 +759,7 @@ H5Pexist(hid_t id, const char *name)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* H5Pexist() */
@@ -793,7 +793,7 @@ H5Pget_size(hid_t id, const char *name, size_t *size)
H5P_genplist_t *plist; /* Property list to query */
herr_t ret_value; /* return value */
- FUNC_ENTER_API(H5Pget_size, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*s*z", id, name, size);
/* Check arguments. */
@@ -825,7 +825,7 @@ H5Pget_size(hid_t id, const char *name, size_t *size)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* H5Pget_size() */
@@ -856,7 +856,7 @@ H5Pget_class(hid_t plist_id)
H5P_genclass_t *pclass=NULL; /* Property list class */
hid_t ret_value=FAIL; /* return value */
- FUNC_ENTER_API(H5Pget_class, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", plist_id);
/* Check arguments. */
@@ -879,7 +879,7 @@ done:
if(ret_value<0 && pclass)
H5P_close_class(pclass);
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* H5Pget_class() */
@@ -913,7 +913,7 @@ H5Pget_nprops(hid_t id, size_t *nprops)
H5P_genclass_t *pclass; /* Property class to query */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_nprops, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*z", id, nprops);
/* Check arguments. */
@@ -939,7 +939,7 @@ H5Pget_nprops(hid_t id, size_t *nprops)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* H5Pget_nprops() */
@@ -969,7 +969,7 @@ H5Pequal(hid_t id1, hid_t id2)
void *obj1, *obj2; /* Property objects to compare */
htri_t ret_value = FALSE; /* return value */
- FUNC_ENTER_API(H5Pequal, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("t", "ii", id1, id2);
/* Check arguments. */
@@ -1025,7 +1025,7 @@ H5Pisa_class(hid_t plist_id, hid_t pclass_id)
{
htri_t ret_value; /* return value */
- FUNC_ENTER_API(H5Pisa_class, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("t", "ii", plist_id, pclass_id);
/* Check arguments. */
@@ -1039,7 +1039,7 @@ H5Pisa_class(hid_t plist_id, hid_t pclass_id)
HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to compare property list classes");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* H5Pisa_class() */
@@ -1102,7 +1102,7 @@ H5Piterate(hid_t id, int *idx, H5P_iterate_t iter_func, void *iter_data)
int fake_idx = 0; /* Index when user doesn't provide one */
int ret_value; /* return value */
- FUNC_ENTER_API(H5Piterate, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE4("Is", "i*Isx*x", id, idx, iter_func, iter_data);
/* Check arguments. */
@@ -1126,7 +1126,7 @@ H5Piterate(hid_t id, int *idx, H5P_iterate_t iter_func, void *iter_data)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* H5Piterate() */
@@ -1164,7 +1164,7 @@ H5Pget(hid_t plist_id, const char *name, void *value)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*s*x", plist_id, name, value);
/* Check arguments. */
@@ -1180,7 +1180,7 @@ H5Pget(hid_t plist_id, const char *name, void *value)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to query property value");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* H5Pget() */
@@ -1216,7 +1216,7 @@ H5Premove(hid_t plist_id, const char *name)
H5P_genplist_t *plist; /* Property list to modify */
herr_t ret_value; /* return value */
- FUNC_ENTER_API(H5Premove, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*s", plist_id, name);
/* Check arguments. */
@@ -1230,7 +1230,7 @@ H5Premove(hid_t plist_id, const char *name)
HGOTO_ERROR(H5E_PLIST, H5E_CANTDELETE, FAIL, "unable to remove property");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* H5Premove() */
@@ -1278,7 +1278,7 @@ H5Pcopy_prop(hid_t dst_id, hid_t src_id, const char *name)
H5I_type_t src_id_type, dst_id_type; /* ID types */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pcopy_prop, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ii*s", dst_id, src_id, name);
/* Check arguments. */
@@ -1337,7 +1337,7 @@ H5Punregister(hid_t pclass_id, const char *name)
H5P_genclass_t *pclass; /* Property list class to modify */
herr_t ret_value; /* return value */
- FUNC_ENTER_API(H5Punregister, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*s", pclass_id, name);
/* Check arguments. */
@@ -1351,7 +1351,7 @@ H5Punregister(hid_t pclass_id, const char *name)
HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to remove property from class");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* H5Punregister() */
@@ -1381,7 +1381,7 @@ H5Pclose(hid_t plist_id)
{
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pclose, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", plist_id);
/* Allow default property lists to pass through without throwing an error */
@@ -1396,7 +1396,7 @@ H5Pclose(hid_t plist_id)
} /* end if */
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* H5Pclose() */
@@ -1426,7 +1426,7 @@ H5Pget_class_name(hid_t pclass_id)
H5P_genclass_t *pclass; /* Property class to query */
char *ret_value; /* return value */
- FUNC_ENTER_API(H5Pget_class_name, NULL);
+ FUNC_ENTER_API(NULL)
/* Check arguments. */
if(NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(pclass_id, H5I_GENPROP_CLS)))
@@ -1437,7 +1437,7 @@ H5Pget_class_name(hid_t pclass_id)
HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, NULL, "unable to query name of class");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* H5Pget_class_name() */
@@ -1467,7 +1467,7 @@ H5Pget_class_parent(hid_t pclass_id)
H5P_genclass_t *parent = NULL; /* Parent's property class */
hid_t ret_value; /* return value */
- FUNC_ENTER_API(H5Pget_class_parent, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", pclass_id);
/* Check arguments. */
@@ -1517,7 +1517,7 @@ H5Pclose_class(hid_t cls_id)
{
hid_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pclose_class, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", cls_id);
/* Check arguments */
diff --git a/src/H5Pdapl.c b/src/H5Pdapl.c
index 356c42d..51e62fe 100644
--- a/src/H5Pdapl.c
+++ b/src/H5Pdapl.c
@@ -126,7 +126,7 @@ H5P_dacc_reg_prop(H5P_genclass_t *pclass)
double rdcc_w0 = H5D_ACS_PREEMPT_READ_CHUNKS_DEF; /* Default raw data chunk cache dirty ratio */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_dacc_reg_prop)
+ FUNC_ENTER_NOAPI_NOINIT
/* Register the size of raw data chunk cache (elements) */
if(H5P_register_real(pclass, H5D_ACS_DATA_CACHE_NUM_SLOTS_NAME, H5D_ACS_DATA_CACHE_NUM_SLOTS_SIZE, &rdcc_nslots, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
@@ -181,7 +181,7 @@ H5Pset_chunk_cache(hid_t dapl_id, size_t rdcc_nslots, size_t rdcc_nbytes, double
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_chunk_cache, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "izzd", dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0);
/* Check arguments. Note that we allow negative values - they are
@@ -202,7 +202,7 @@ H5Pset_chunk_cache(hid_t dapl_id, size_t rdcc_nslots, size_t rdcc_nbytes, double
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set preempt read chunks");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
}
@@ -233,7 +233,7 @@ H5Pget_chunk_cache(hid_t dapl_id, size_t *rdcc_nslots, size_t *rdcc_nbytes, doub
H5P_genplist_t *def_plist; /* Default file access property list */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_chunk_cache, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*z*z*d", dapl_id, rdcc_nslots, rdcc_nbytes, rdcc_w0);
/* Get the plist structure */
@@ -269,5 +269,5 @@ H5Pget_chunk_cache(hid_t dapl_id, size_t *rdcc_nslots, size_t *rdcc_nbytes, doub
} /* end if */
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
}
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 8680edb..6a3067d 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -182,7 +182,7 @@ H5P_dcrt_reg_prop(H5P_genclass_t *pclass)
H5O_efl_t efl = H5D_CRT_EXT_FILE_LIST_DEF; /* Default external file list */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_dcrt_reg_prop)
+ FUNC_ENTER_NOAPI_NOINIT
/* Register the storage layout property */
if(H5P_register_real(pclass, H5D_CRT_LAYOUT_NAME, H5D_CRT_LAYOUT_SIZE, &layout, NULL, NULL, NULL, NULL, NULL, H5D_CRT_LAYOUT_CMP, NULL) < 0)
@@ -231,7 +231,7 @@ H5P_dcrt_copy(hid_t dst_plist_id, hid_t src_plist_id, void UNUSED *copy_data)
H5P_genplist_t *dst_plist; /* Pointer to destination property list */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_dcrt_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* Verify property list IDs */
if(NULL == (dst_plist = (H5P_genplist_t *)H5I_object(dst_plist_id)))
@@ -341,7 +341,7 @@ H5P_dcrt_close(hid_t dcpl_id, void UNUSED *close_data)
H5P_genplist_t *plist; /* Property list */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_dcrt_close)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(NULL == (plist = (H5P_genplist_t *)H5I_object(dcpl_id)))
@@ -388,7 +388,7 @@ H5P_dcrt_layout_cmp(const void *_layout1, const void *_layout2, size_t UNUSED si
*layout2 = (const H5O_layout_t *)_layout2;
herr_t ret_value = 0; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_dcrt_layout_cmp)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(layout1);
@@ -457,7 +457,7 @@ H5P_fill_value_cmp(const void *_fill1, const void *_fill2, size_t UNUSED size)
int cmp_value; /* Value from comparison */
herr_t ret_value = 0; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_fill_value_cmp)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(fill1);
@@ -519,7 +519,7 @@ H5P_dcrt_ext_file_list_cmp(const void *_efl1, const void *_efl2, size_t UNUSED s
int cmp_value; /* Value from comparison */
herr_t ret_value = 0; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_dcrt_ext_file_list_cmp)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(efl1);
@@ -594,7 +594,7 @@ H5P_set_layout(H5P_genplist_t *plist, const H5O_layout_t *layout)
unsigned alloc_time_state; /* State of allocation time property */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_set_layout)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get the allocation time state */
if(H5P_get(plist, H5D_CRT_ALLOC_TIME_STATE_NAME, &alloc_time_state) < 0)
@@ -661,7 +661,7 @@ H5P_init_def_layout(void)
const H5O_storage_compact_t def_store_compact = H5D_DEF_STORAGE_COMPACT_INIT;
const H5O_storage_chunk_t def_store_chunk = H5D_DEF_STORAGE_CHUNK_INIT;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_init_def_layout)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Initialize the default layout info for non-contigous layouts */
H5D_def_layout_compact_g.storage.u.compact = def_store_compact;
@@ -702,7 +702,7 @@ H5Pset_layout(hid_t plist_id, H5D_layout_t layout_type)
const H5O_layout_t *layout; /* Pointer to default layout information for type specified */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_layout, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iDl", plist_id, layout_type);
/* Check arguments */
@@ -777,7 +777,7 @@ H5Pget_layout(hid_t plist_id)
H5O_layout_t layout; /* Layout property */
H5D_layout_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Pget_layout, H5D_LAYOUT_ERROR)
+ FUNC_ENTER_API(H5D_LAYOUT_ERROR)
H5TRACE1("Dl", "i", plist_id);
/* Get the plist structure */
@@ -829,7 +829,7 @@ H5Pset_chunk(hid_t plist_id, int ndims, const hsize_t dim[/*ndims*/])
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_chunk, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "iIs*[a1]h", plist_id, ndims, dim);
/* Check arguments */
@@ -909,7 +909,7 @@ H5Pget_chunk(hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/)
H5O_layout_t layout; /* Layout information */
int ret_value; /* Return value */
- FUNC_ENTER_API(H5Pget_chunk, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("Is", "iIsx", plist_id, max_ndims, dim);
/* Get the plist structure */
@@ -982,7 +982,7 @@ H5Pset_external(hid_t plist_id, const char *name, off_t offset, hsize_t size)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_external, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*soh", plist_id, name, offset, size);
/* Check arguments */
@@ -1062,7 +1062,7 @@ H5Pget_external_count(hid_t plist_id)
H5P_genplist_t *plist; /* Property list pointer */
int ret_value; /* return value */
- FUNC_ENTER_API(H5Pget_external_count, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Is", "i", plist_id);
/* Get the plist structure */
@@ -1120,7 +1120,7 @@ H5Pget_external(hid_t plist_id, unsigned idx, size_t name_size, char *name/*out*
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_external, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "iIuzxxx", plist_id, idx, name_size, name, offset, size);
/* Get the plist structure */
@@ -1179,7 +1179,7 @@ H5Pset_szip(hid_t plist_id, unsigned options_mask, unsigned pixels_per_block)
unsigned int config_flags;
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_szip, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "iIuIu", plist_id, options_mask, pixels_per_block);
if(H5Zget_filter_info(H5Z_FILTER_SZIP, &config_flags) < 0)
@@ -1249,7 +1249,7 @@ H5Pset_shuffle(hid_t plist_id)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_shuffle, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", plist_id);
/* Check arguments */
@@ -1295,7 +1295,7 @@ H5Pset_nbit(hid_t plist_id)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_nbit, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", plist_id);
/* Check arguments */
@@ -1358,7 +1358,7 @@ H5Pset_scaleoffset(hid_t plist_id, H5Z_SO_scale_type_t scale_type, int scale_fac
unsigned cd_values[2]; /* Filter parameters */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_scaleoffset, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "iZaIs", plist_id, scale_type, scale_factor);
/* Check arguments */
@@ -1429,7 +1429,7 @@ H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value)
H5O_fill_t fill; /* Fill value to modify */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_fill_value, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ii*x", plist_id, type_id, value);
/* Get the plist structure */
@@ -1523,7 +1523,7 @@ H5P_get_fill_value(H5P_genplist_t *plist, const H5T_t *type, void *value/*out*/,
hid_t dst_id = -1; /*destination datatype id */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5P_get_fill_value, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/*
* If no fill value is defined then return an error. We can't even
@@ -1613,7 +1613,7 @@ H5Pget_fill_value(hid_t plist_id, hid_t type_id, void *value/*out*/)
H5T_t *type; /* Datatype */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_fill_value, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "iix", plist_id, type_id, value);
/* Check arguments */
@@ -1652,7 +1652,7 @@ H5P_is_fill_value_defined(const H5O_fill_t *fill, H5D_fill_value_t *status)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5P_is_fill_value_defined, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(fill);
HDassert(status);
@@ -1694,7 +1694,7 @@ H5P_fill_value_defined(H5P_genplist_t *plist, H5D_fill_value_t *status)
H5O_fill_t fill; /* Fill value to query */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5P_fill_value_defined, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(status);
@@ -1729,7 +1729,7 @@ H5Pfill_value_defined(hid_t plist_id, H5D_fill_value_t *status)
H5P_genplist_t *plist; /* Property list to query */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_API(H5Pfill_value_defined, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*DF", plist_id, status);
HDassert(status);
@@ -1772,7 +1772,7 @@ H5Pset_alloc_time(hid_t plist_id, H5D_alloc_time_t alloc_time)
unsigned alloc_time_state; /* State of allocation time property */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_alloc_time, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iDa", plist_id, alloc_time);
/* Check arguments */
@@ -1853,7 +1853,7 @@ H5Pget_alloc_time(hid_t plist_id, H5D_alloc_time_t *alloc_time/*out*/)
{
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_alloc_time, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ix", plist_id, alloc_time);
/* Get values */
@@ -1898,7 +1898,7 @@ H5Pset_fill_time(hid_t plist_id, H5D_fill_time_t fill_time)
H5O_fill_t fill; /* Fill value property to modify */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_fill_time, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iDf", plist_id, fill_time);
/* Check arguments */
@@ -1946,7 +1946,7 @@ H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t *fill_time/*out*/)
{
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_fill_time, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ix", plist_id, fill_time);
/* Set values */
diff --git a/src/H5Pdeprec.c b/src/H5Pdeprec.c
index 5050c95..5d62d61 100644
--- a/src/H5Pdeprec.c
+++ b/src/H5Pdeprec.c
@@ -97,7 +97,7 @@ DESCRIPTION
static herr_t
H5P_init_deprec_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_init_deprec_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5P_init())
} /* H5P_init_deprec_interface() */
@@ -253,7 +253,7 @@ H5Pregister1(hid_t cls_id, const char *name, size_t size, void *def_value,
H5P_genclass_t *orig_pclass; /* Original property class */
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Pregister1, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE10("e", "i*sz*xxxxxxx", cls_id, name, size, def_value, prp_create,
prp_set, prp_get, prp_delete, prp_copy, prp_close);
@@ -285,7 +285,7 @@ H5Pregister1(hid_t cls_id, const char *name, size_t size, void *def_value,
} /* end if */
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* H5Pregister1() */
@@ -437,7 +437,7 @@ H5Pinsert1(hid_t plist_id, const char *name, size_t size, void *value,
H5P_genplist_t *plist; /* Property list to modify */
herr_t ret_value; /* return value */
- FUNC_ENTER_API(H5Pinsert1, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE9("e", "i*sz*xxxxxx", plist_id, name, size, value, prp_set, prp_get,
prp_delete, prp_copy, prp_close);
@@ -454,7 +454,7 @@ H5Pinsert1(hid_t plist_id, const char *name, size_t size, void *value,
HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to register property in plist")
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* H5Pinsert1() */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index 15668e0..e9b443b 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -215,7 +215,7 @@ H5P_dxfr_reg_prop(H5P_genclass_t *pclass)
void *def_xfer_xform = H5D_XFER_XFORM_DEF; /* Default value for data transform */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_dxfr_reg_prop)
+ FUNC_ENTER_NOAPI_NOINIT
/* Register the max. temp buffer size property */
if(H5P_register_real(pclass, H5D_XFER_MAX_TEMP_BUF_NAME, H5D_XFER_MAX_TEMP_BUF_SIZE, &def_max_temp_buf, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
@@ -336,7 +336,7 @@ H5P_dxfr_create(hid_t dxpl_id, void UNUSED *create_data)
H5P_genplist_t *plist; /* Property list */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_dxfr_create)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
@@ -386,7 +386,7 @@ H5P_dxfr_copy(hid_t dst_dxpl_id, hid_t src_dxpl_id, void UNUSED *copy_data)
H5P_genplist_t *src_plist; /* Source property list */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_dxfr_copy)
+ FUNC_ENTER_NOAPI_NOINIT
if(NULL == (dst_plist = (H5P_genplist_t *)H5I_object(dst_dxpl_id)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
@@ -437,7 +437,7 @@ H5P_dxfr_close(hid_t dxpl_id, void UNUSED *close_data)
H5P_genplist_t *plist; /* Property list */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_dxfr_close)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(NULL == (plist = (H5P_genplist_t *)H5I_object(dxpl_id)))
@@ -477,7 +477,7 @@ H5P_dxfr_xform_del(hid_t UNUSED prop_id, const char UNUSED *name, size_t UNUSED
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5P_dxfr_xform_del)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(value);
@@ -509,7 +509,7 @@ H5P_dxfr_xform_copy(const char UNUSED *name, size_t UNUSED size, void *value)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5P_dxfr_xform_copy)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(value);
@@ -540,7 +540,7 @@ H5P_dxfr_xform_close(const char UNUSED *name, size_t UNUSED size, void *value)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5P_dxfr_xform_close)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(value);
@@ -574,7 +574,7 @@ H5Pset_data_transform(hid_t plist_id, const char *expression)
H5Z_data_xform_t *data_xform_prop = NULL; /* New data xform property */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_data_transform, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*s", plist_id, expression);
/* Check arguments */
@@ -640,7 +640,7 @@ H5Pget_data_transform(hid_t plist_id, char *expression /*out*/, size_t size)
char* pexp;
ssize_t ret_value; /* return value */
- FUNC_ENTER_API(H5Pget_data_transform, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("Zs", "ixz", plist_id, expression, size);
/* Get the plist structure */
@@ -708,7 +708,7 @@ H5Pset_buffer(hid_t plist_id, size_t size, void *tconv, void *bkg)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_buffer, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "iz*x*x", plist_id, size, tconv, bkg);
/* Check arguments */
@@ -755,7 +755,7 @@ H5Pget_buffer(hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/)
size_t size; /* Type conversion buffer size */
size_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Pget_buffer, 0)
+ FUNC_ENTER_API(0)
H5TRACE3("z", "ixx", plist_id, tconv, bkg);
/* Get the plist structure */
@@ -807,7 +807,7 @@ H5Pset_preserve(hid_t plist_id, hbool_t status)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_preserve, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ib", plist_id, status);
/* Get the plist structure */
@@ -847,7 +847,7 @@ H5Pget_preserve(hid_t plist_id)
H5P_genplist_t *plist; /* Property list pointer */
int ret_value; /* return value */
- FUNC_ENTER_API(H5Pget_preserve, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Is", "i", plist_id);
/* Get the plist structure */
@@ -889,7 +889,7 @@ H5Pset_edc_check(hid_t plist_id, H5Z_EDC_t check)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_edc_check, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iZe", plist_id, check);
/* Check argument */
@@ -932,7 +932,7 @@ H5Pget_edc_check(hid_t plist_id)
H5P_genplist_t *plist; /* Property list pointer */
H5Z_EDC_t ret_value; /* return value */
- FUNC_ENTER_API(H5Pget_edc_check, H5Z_ERROR_EDC)
+ FUNC_ENTER_API(H5Z_ERROR_EDC)
H5TRACE1("Ze", "i", plist_id);
/* Get the plist structure */
@@ -975,7 +975,7 @@ H5Pset_filter_callback(hid_t plist_id, H5Z_filter_func_t func, void *op_data)
herr_t ret_value=SUCCEED; /* return value */
H5Z_cb_t cb_struct;
- FUNC_ENTER_API(H5Pset_filter_callback, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ix*x", plist_id, func, op_data);
/* Get the plist structure */
@@ -1017,7 +1017,7 @@ H5Pset_type_conv_cb(hid_t plist_id, H5T_conv_except_func_t op, void *operate_dat
herr_t ret_value=SUCCEED; /* return value */
H5T_conv_cb_t cb_struct;
- FUNC_ENTER_API(H5Pset_type_conv_cb, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ix*x", plist_id, op, operate_data);
/* Get the plist structure */
@@ -1059,7 +1059,7 @@ H5Pget_type_conv_cb(hid_t plist_id, H5T_conv_except_func_t *op, void **operate_d
H5T_conv_cb_t cb_struct;
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_type_conv_cb, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*x**x", plist_id, op, operate_data);
/* Get the plist structure */
@@ -1104,7 +1104,7 @@ H5Pget_btree_ratios(hid_t plist_id, double *left/*out*/, double *middle/*out*/,
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_btree_ratios, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "ixxx", plist_id, left, middle, right);
/* Get the plist structure */
@@ -1158,7 +1158,7 @@ H5Pset_btree_ratios(hid_t plist_id, double left, double middle,
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_btree_ratios, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "iddd", plist_id, left, middle, right);
/* Check arguments */
@@ -1211,7 +1211,7 @@ H5P_set_vlen_mem_manager(H5P_genplist_t *plist, H5MM_allocate_t alloc_func,
{
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_NOAPI(H5P_set_vlen_mem_manager, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
assert(plist);
@@ -1258,7 +1258,7 @@ H5Pset_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t alloc_func,
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_vlen_mem_manager, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "ix*xx*x", plist_id, alloc_func, alloc_info, free_func,
free_info);
@@ -1298,7 +1298,7 @@ H5Pget_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t *alloc_func/*out*/,
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_vlen_mem_manager, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "ixxxx", plist_id, alloc_func, alloc_info, free_func, free_info);
/* Get the plist structure */
@@ -1352,7 +1352,7 @@ H5Pset_hyper_vector_size(hid_t plist_id, size_t vector_size)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_hyper_vector_size, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iz", plist_id, vector_size);
/* Check arguments */
@@ -1392,7 +1392,7 @@ H5Pget_hyper_vector_size(hid_t plist_id, size_t *vector_size/*out*/)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_hyper_vector_size, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ix", plist_id, vector_size);
/* Get the plist structure */
@@ -1427,7 +1427,7 @@ H5Pget_mpio_actual_chunk_opt_mode(hid_t plist_id, H5D_mpio_actual_chunk_opt_mode
H5P_genplist_t *plist;
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_mpio_actual_chunk_opt_mode, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*Do", plist_id, actual_chunk_opt_mode);
/* Get the plist structure */
@@ -1462,7 +1462,7 @@ H5Pget_mpio_actual_io_mode(hid_t plist_id, H5D_mpio_actual_io_mode_t *actual_io_
H5P_genplist_t *plist;
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_mpio_actual_io_mode, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*Di", plist_id, actual_io_mode);
/* Get the plist structure */
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index 7dea0b2..c3371c9 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -217,7 +217,7 @@ H5P_facc_reg_prop(H5P_genclass_t *pclass)
unsigned efc_size = H5F_ACS_EFC_SIZE_DEF; /* Default external file cache size */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_facc_reg_prop)
+ FUNC_ENTER_NOAPI_NOINIT
/* Register the initial metadata cache resize configuration */
if(H5P_register_real(pclass, H5F_ACS_META_CACHE_INIT_CONFIG_NAME, H5F_ACS_META_CACHE_INIT_CONFIG_SIZE, &mdc_initCacheCfg, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
@@ -329,7 +329,7 @@ H5P_facc_create(hid_t fapl_id, void UNUSED *copy_data)
H5P_genplist_t *plist; /* Property list */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5P_facc_create)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check argument */
if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
@@ -379,7 +379,7 @@ H5P_facc_copy(hid_t dst_fapl_id, hid_t src_fapl_id, void UNUSED *copy_data)
H5P_genplist_t *src_plist; /* Source property list */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5P_facc_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get driver ID from source property list */
if(NULL == (src_plist = (H5P_genplist_t *)H5I_object(src_fapl_id)))
@@ -430,7 +430,7 @@ H5P_facc_close(hid_t fapl_id, void UNUSED *close_data)
H5P_genplist_t *plist; /* Property list */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5P_facc_close, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check argument */
if(NULL == (plist = (H5P_genplist_t *)H5I_object(fapl_id)))
@@ -491,9 +491,9 @@ herr_t
H5Pset_alignment(hid_t fapl_id, hsize_t threshold, hsize_t alignment)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* return value */
+ herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_alignment, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ihh", fapl_id, threshold, alignment);
/* Check args */
@@ -511,7 +511,7 @@ H5Pset_alignment(hid_t fapl_id, hsize_t threshold, hsize_t alignment)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set alignment");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
}
@@ -541,9 +541,9 @@ H5Pget_alignment(hid_t fapl_id, hsize_t *threshold/*out*/,
hsize_t *alignment/*out*/)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* Return value */
+ herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_alignment, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ixx", fapl_id, threshold, alignment);
/* Get the plist structure */
@@ -559,7 +559,7 @@ H5Pget_alignment(hid_t fapl_id, hsize_t *threshold/*out*/,
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get alignment");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
}
@@ -595,9 +595,9 @@ H5P_set_driver(H5P_genplist_t *plist, hid_t new_driver_id, const void *new_drive
{
hid_t driver_id; /* VFL driver ID */
void *driver_info; /* VFL driver info */
- herr_t ret_value=SUCCEED; /* Return value */
+ herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5P_set_driver, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if(NULL == H5I_object_verify(new_driver_id, H5I_VFL))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file driver ID")
@@ -672,7 +672,7 @@ H5Pset_driver(hid_t plist_id, hid_t new_driver_id, const void *new_driver_info)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_driver, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ii*x", plist_id, new_driver_id, new_driver_info);
/* Check arguments */
@@ -728,7 +728,7 @@ H5P_get_driver(H5P_genplist_t *plist)
{
hid_t ret_value=FAIL; /* Return value */
- FUNC_ENTER_NOAPI(H5P_get_driver, FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
/* Get the current driver ID */
if(TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS) ) {
@@ -745,7 +745,7 @@ H5P_get_driver(H5P_genplist_t *plist)
ret_value = H5_DEFAULT_VFD;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
@@ -783,7 +783,7 @@ H5Pget_driver(hid_t plist_id)
H5P_genplist_t *plist; /* Property list pointer */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Pget_driver, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", plist_id);
if(NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
@@ -827,7 +827,7 @@ H5P_get_driver_info(H5P_genplist_t *plist)
{
void *ret_value=NULL;
- FUNC_ENTER_NOAPI(H5P_get_driver_info, NULL);
+ FUNC_ENTER_NOAPI(NULL)
/* Get the current driver info */
if( TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS) ) {
@@ -841,7 +841,7 @@ H5P_get_driver_info(H5P_genplist_t *plist)
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5P_get_driver_info() */
@@ -877,7 +877,7 @@ H5Pget_driver_info(hid_t plist_id)
H5P_genplist_t *plist; /* Property list pointer */
void *ret_value; /* Return value */
- FUNC_ENTER_API(H5Pget_driver_info, NULL);
+ FUNC_ENTER_API(NULL)
if(NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a property list")
@@ -912,9 +912,9 @@ herr_t
H5Pset_family_offset(hid_t fapl_id, hsize_t offset)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* return value */
+ herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_family_offset, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ih", fapl_id, offset);
/* Get the plist structure */
@@ -927,7 +927,7 @@ H5Pset_family_offset(hid_t fapl_id, hsize_t offset)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set family offset");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
}
@@ -951,9 +951,9 @@ done:
static herr_t
H5P_set_family_offset(H5P_genplist_t *plist, hsize_t offset)
{
- herr_t ret_value=SUCCEED;
+ herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5P_set_family_offset, FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
if( TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS) ) {
if(H5P_set(plist, H5F_ACS_FAMILY_OFFSET_NAME, &offset) < 0)
@@ -963,7 +963,7 @@ H5P_set_family_offset(H5P_genplist_t *plist, hsize_t offset)
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
@@ -989,9 +989,9 @@ herr_t
H5Pget_family_offset(hid_t fapl_id, hsize_t *offset)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* return value */
+ herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_family_offset, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*h", fapl_id, offset);
/* Get the plist structure */
@@ -1004,7 +1004,7 @@ H5Pget_family_offset(hid_t fapl_id, hsize_t *offset)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't get family offset");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
}
@@ -1028,9 +1028,9 @@ done:
static herr_t
H5P_get_family_offset(H5P_genplist_t *plist, hsize_t *offset)
{
- herr_t ret_value=SUCCEED;
+ herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5P_get_family_offset, FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
if( TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS) ) {
if(H5P_get(plist, H5F_ACS_FAMILY_OFFSET_NAME, offset) < 0)
@@ -1040,7 +1040,7 @@ H5P_get_family_offset(H5P_genplist_t *plist, hsize_t *offset)
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
@@ -1066,9 +1066,9 @@ herr_t
H5Pset_multi_type(hid_t fapl_id, H5FD_mem_t type)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* return value */
+ herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_multi_type, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iMt", fapl_id, type);
/* Get the plist structure */
@@ -1081,7 +1081,7 @@ H5Pset_multi_type(hid_t fapl_id, H5FD_mem_t type)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set data type for multi driver");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
}
@@ -1105,9 +1105,9 @@ done:
static herr_t
H5P_set_multi_type(H5P_genplist_t *plist, H5FD_mem_t type)
{
- herr_t ret_value=SUCCEED;
+ herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5P_set_multi_type, FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
if( TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS) ) {
if(H5P_set(plist, H5F_ACS_MULTI_TYPE_NAME, &type) < 0)
@@ -1117,7 +1117,7 @@ H5P_set_multi_type(H5P_genplist_t *plist, H5FD_mem_t type)
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
@@ -1143,9 +1143,9 @@ herr_t
H5Pget_multi_type(hid_t fapl_id, H5FD_mem_t *type)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* return value */
+ herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_multi_type, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*Mt", fapl_id, type);
/* Get the plist structure */
@@ -1158,7 +1158,7 @@ H5Pget_multi_type(hid_t fapl_id, H5FD_mem_t *type)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't get data type for multi driver");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
}
@@ -1182,9 +1182,9 @@ done:
static herr_t
H5P_get_multi_type(H5P_genplist_t *plist, H5FD_mem_t *type)
{
- herr_t ret_value=SUCCEED;
+ herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5P_get_multi_type, FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
if( TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS) ) {
if(H5P_get(plist, H5F_ACS_MULTI_TYPE_NAME, type) < 0)
@@ -1194,7 +1194,7 @@ H5P_get_multi_type(H5P_genplist_t *plist, H5FD_mem_t *type)
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
@@ -1236,9 +1236,9 @@ H5Pset_cache(hid_t plist_id, int UNUSED mdc_nelmts,
size_t rdcc_nslots, size_t rdcc_nbytes, double rdcc_w0)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* return value */
+ herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_cache, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "iIszzd", plist_id, mdc_nelmts, rdcc_nslots, rdcc_nbytes,
rdcc_w0);
@@ -1259,7 +1259,7 @@ H5Pset_cache(hid_t plist_id, int UNUSED mdc_nelmts,
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set preempt read chunks");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
}
@@ -1296,9 +1296,9 @@ H5Pget_cache(hid_t plist_id, int *mdc_nelmts,
size_t *rdcc_nslots, size_t *rdcc_nbytes, double *rdcc_w0)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* return value */
+ herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_cache, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "i*Is*z*z*d", plist_id, mdc_nelmts, rdcc_nslots, rdcc_nbytes,
rdcc_w0);
@@ -1323,7 +1323,7 @@ H5Pget_cache(hid_t plist_id, int *mdc_nelmts,
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get preempt read chunks");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
}
@@ -1346,7 +1346,7 @@ H5Pset_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_mdc_config, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*x", plist_id, config_ptr);
/* Get the plist structure */
@@ -1367,7 +1367,7 @@ H5Pset_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set metadata cache initial config")
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* H5Pset_mdc_config() */
@@ -1394,7 +1394,7 @@ H5Pget_mdc_config(hid_t plist_id, H5AC_cache_config_t *config_ptr)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_mdc_config, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*x", plist_id, config_ptr);
/* Get the plist structure */
@@ -1457,9 +1457,9 @@ herr_t
H5Pset_gc_references(hid_t plist_id, unsigned gc_ref)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* return value */
+ herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_gc_references, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iIu", plist_id, gc_ref);
/* Get the plist structure */
@@ -1471,7 +1471,7 @@ H5Pset_gc_references(hid_t plist_id, unsigned gc_ref)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set garbage collect reference");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
}
@@ -1499,9 +1499,9 @@ herr_t
H5Pget_gc_references(hid_t plist_id, unsigned *gc_ref/*out*/)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* return value */
+ herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_gc_references, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ix", plist_id, gc_ref);
/* Get the plist structure */
@@ -1514,7 +1514,7 @@ H5Pget_gc_references(hid_t plist_id, unsigned *gc_ref/*out*/)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get garbage collect reference");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
}
@@ -1538,7 +1538,7 @@ H5Pset_fclose_degree(hid_t plist_id, H5F_close_degree_t degree)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_fclose_degree, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iFd", plist_id, degree);
/* Get the plist structure */
@@ -1574,7 +1574,7 @@ H5Pget_fclose_degree(hid_t plist_id, H5F_close_degree_t *degree)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_fclose_degree, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*Fd", plist_id, degree);
/* Get the plist structure */
@@ -1622,9 +1622,9 @@ herr_t
H5Pset_meta_block_size(hid_t plist_id, hsize_t size)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* return value */
+ herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_meta_block_size, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ih", plist_id, size);
/* Get the plist structure */
@@ -1636,7 +1636,7 @@ H5Pset_meta_block_size(hid_t plist_id, hsize_t size)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set meta data block size");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
}
@@ -1664,9 +1664,9 @@ herr_t
H5Pget_meta_block_size(hid_t plist_id, hsize_t *size/*out*/)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* return value */
+ herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_meta_block_size, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ix", plist_id, size);
/* Get the plist structure */
@@ -1680,7 +1680,7 @@ H5Pget_meta_block_size(hid_t plist_id, hsize_t *size/*out*/)
} /* end if */
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
}
@@ -1717,9 +1717,9 @@ herr_t
H5Pset_sieve_buf_size(hid_t plist_id, size_t size)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* return value */
+ herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_sieve_buf_size, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iz", plist_id, size);
/* Get the plist structure */
@@ -1731,7 +1731,7 @@ H5Pset_sieve_buf_size(hid_t plist_id, size_t size)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set sieve buffer size");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* end H5Pset_sieve_buf_size() */
@@ -1759,9 +1759,9 @@ herr_t
H5Pget_sieve_buf_size(hid_t plist_id, size_t *size/*out*/)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* return value */
+ herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_sieve_buf_size, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ix", plist_id, size);
/* Get the plist structure */
@@ -1774,7 +1774,7 @@ H5Pget_sieve_buf_size(hid_t plist_id, size_t *size/*out*/)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get sieve buffer size");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* end H5Pget_sieve_buf_size() */
@@ -1806,9 +1806,9 @@ herr_t
H5Pset_small_data_block_size(hid_t plist_id, hsize_t size)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* return value */
+ herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_small_data_block_size, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ih", plist_id, size);
/* Get the plist structure */
@@ -1820,7 +1820,7 @@ H5Pset_small_data_block_size(hid_t plist_id, hsize_t size)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set 'small data' block size");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* end H5Pset_small_data_block_size() */
@@ -1843,9 +1843,9 @@ herr_t
H5Pget_small_data_block_size(hid_t plist_id, hsize_t *size/*out*/)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* return value */
+ herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_small_data_block_size, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ix", plist_id, size);
/* Get the plist structure */
@@ -1859,7 +1859,7 @@ H5Pget_small_data_block_size(hid_t plist_id, hsize_t *size/*out*/)
} /* end if */
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* end H5Pget_small_data_block_size() */
@@ -1957,7 +1957,7 @@ H5Pset_libver_bounds(hid_t plist_id, H5F_libver_t low,
hbool_t latest; /* Whether to use the latest version or not */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_libver_bounds, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "iFvFv", plist_id, low, high);
/* Check args */
@@ -2002,7 +2002,7 @@ H5Pget_libver_bounds(hid_t plist_id, H5F_libver_t *low/*out*/,
hbool_t latest; /* Whether to use the latest version or not */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_libver_bounds, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ixx", plist_id, low, high);
/* Get the plist structure */
@@ -2047,7 +2047,7 @@ H5Pset_elink_file_cache_size(hid_t plist_id, unsigned efc_size)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_elink_file_cache_size, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iIu", plist_id, efc_size);
/* Get the plist structure */
@@ -2085,7 +2085,7 @@ H5Pget_elink_file_cache_size(hid_t plist_id, unsigned *efc_size)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_elink_file_cache_size, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*Iu", plist_id, efc_size);
/* Get the plist structure */
diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c
index 4442187..b30cc49 100644
--- a/src/H5Pfcpl.c
+++ b/src/H5Pfcpl.c
@@ -152,7 +152,7 @@ H5P_fcrt_reg_prop(H5P_genclass_t *pclass)
unsigned sohm_btree_min = H5F_CRT_SHMSG_BTREE_MIN_DEF;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_fcrt_reg_prop)
+ FUNC_ENTER_NOAPI_NOINIT
/* Register the user block size */
if(H5P_register_real(pclass, H5F_CRT_USER_BLOCK_NAME, H5F_CRT_USER_BLOCK_SIZE, &userblock_size, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
@@ -227,7 +227,7 @@ H5Pget_version(hid_t plist_id, unsigned *super/*out*/, unsigned *freelist/*out*/
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_version, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "ixxxx", plist_id, super, freelist, stab, shhdr);
/* Get the plist structure */
@@ -269,7 +269,7 @@ H5Pset_userblock(hid_t plist_id, hsize_t size)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_userblock, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ih", plist_id, size);
/* Sanity check non-zero userblock sizes */
@@ -320,9 +320,9 @@ herr_t
H5Pget_userblock(hid_t plist_id, hsize_t *size)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* return value */
+ herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_userblock, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*h", plist_id, size);
/* Get the plist structure */
@@ -335,7 +335,7 @@ H5Pget_userblock(hid_t plist_id, hsize_t *size)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL,"can't get user block");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
}
@@ -359,7 +359,7 @@ H5Pset_sizes(hid_t plist_id, size_t sizeof_addr, size_t sizeof_size)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_sizes, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "izz", plist_id, sizeof_addr, sizeof_size);
/* Check arguments */
@@ -416,7 +416,7 @@ H5Pget_sizes(hid_t plist_id, size_t *sizeof_addr, size_t *sizeof_size)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_sizes, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*z*z", plist_id, sizeof_addr, sizeof_size);
/* Get the plist structure */
@@ -479,9 +479,9 @@ H5Pset_sym_k(hid_t plist_id, unsigned ik, unsigned lk)
{
unsigned btree_k[H5B_NUM_BTREE_ID];
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* Return value */
+ herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_sym_k, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "iIuIu", plist_id, ik, lk);
/* Get the plist structure */
@@ -501,7 +501,7 @@ H5Pset_sym_k(hid_t plist_id, unsigned ik, unsigned lk)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set rank for symbol table leaf nodes");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
}
@@ -530,9 +530,9 @@ H5Pget_sym_k(hid_t plist_id, unsigned *ik /*out */ , unsigned *lk /*out */ )
{
unsigned btree_k[H5B_NUM_BTREE_ID];
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* Return value */
+ herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_sym_k, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ixx", plist_id, ik, lk);
/* Get the plist structure */
@@ -550,7 +550,7 @@ H5Pget_sym_k(hid_t plist_id, unsigned *ik /*out */ , unsigned *lk /*out */ )
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for symbol table leaf nodes");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
}
@@ -578,9 +578,9 @@ H5Pset_istore_k(hid_t plist_id, unsigned ik)
{
unsigned btree_k[H5B_NUM_BTREE_ID];
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* Return value */
+ herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_istore_k, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iIu", plist_id, ik);
/* Check arguments */
@@ -599,7 +599,7 @@ H5Pset_istore_k(hid_t plist_id, unsigned ik)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set rank for btree interanl nodes");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
}
@@ -631,7 +631,7 @@ H5Pget_istore_k(hid_t plist_id, unsigned *ik /*out */ )
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_istore_k, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ix", plist_id, ik);
/* Get the plist structure */
@@ -675,7 +675,7 @@ H5Pset_shared_mesg_nindexes(hid_t plist_id, unsigned nindexes)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_shared_mesg_nindexes, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iIu", plist_id, nindexes);
/* Check argument */
@@ -690,7 +690,7 @@ H5Pset_shared_mesg_nindexes(hid_t plist_id, unsigned nindexes)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set number of indexes");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* end H5Pset_shared_mesg_nindexes() */
@@ -713,7 +713,7 @@ H5Pget_shared_mesg_nindexes(hid_t plist_id, unsigned *nindexes)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_shared_mesg_nindexes, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*Iu", plist_id, nindexes);
/* Get the plist structure */
@@ -754,7 +754,7 @@ H5Pset_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned mesg_type_
unsigned minsizes[H5O_SHMESG_MAX_NINDEXES]; /* Array of min_mesg_sizes*/
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_shared_mesg_index, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "iIuIuIu", plist_id, index_num, mesg_type_flags, min_mesg_size);
/* Check arguments */
@@ -815,9 +815,9 @@ H5Pget_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned *mesg_type
unsigned nindexes; /* Number of SOHM indexes */
unsigned type_flags[H5O_SHMESG_MAX_NINDEXES]; /* Array of mesg_type_flags*/
unsigned minsizes[H5O_SHMESG_MAX_NINDEXES]; /* Array of min_mesg_sizes*/
- herr_t ret_value=SUCCEED; /* Return value */
+ herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_shared_mesg_index, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "iIu*Iu*Iu", plist_id, index_num, mesg_type_flags,
min_mesg_size);
@@ -845,7 +845,7 @@ H5Pget_shared_mesg_index(hid_t plist_id, unsigned index_num, unsigned *mesg_type
*min_mesg_size = minsizes[index_num];
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* end H5Pset_shared_mesg_index() */
@@ -872,9 +872,9 @@ herr_t
H5Pset_shared_mesg_phase_change(hid_t plist_id, unsigned max_list, unsigned min_btree)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* Return value */
+ herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_shared_mesg_phase_change, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "iIuIu", plist_id, max_list, min_btree);
/* Check that values are sensible. The min_btree value must be no greater
@@ -905,7 +905,7 @@ H5Pset_shared_mesg_phase_change(hid_t plist_id, unsigned max_list, unsigned min_
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set B-tree minimum in property list");
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* end H5Pset_shared_mesg_phase_change() */
@@ -926,9 +926,9 @@ herr_t
H5Pget_shared_mesg_phase_change(hid_t plist_id, unsigned *max_list, unsigned *min_btree)
{
H5P_genplist_t *plist; /* Property list pointer */
- herr_t ret_value=SUCCEED; /* Return value */
+ herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_shared_mesg_phase_change, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*Iu*Iu", plist_id, max_list, min_btree);
/* Get the plist structure */
@@ -946,6 +946,6 @@ H5Pget_shared_mesg_phase_change(hid_t plist_id, unsigned *max_list, unsigned *mi
}
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* end H5Pget_shared_mesg_phase_change() */
diff --git a/src/H5Pfmpl.c b/src/H5Pfmpl.c
index 43c6055..7828fb2 100644
--- a/src/H5Pfmpl.c
+++ b/src/H5Pfmpl.c
@@ -110,7 +110,7 @@ H5P_fmnt_reg_prop(H5P_genclass_t *pclass)
hbool_t local = H5F_MNT_SYM_LOCAL_DEF; /* Whether symlinks are local to file */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_fmnt_reg_prop)
+ FUNC_ENTER_NOAPI_NOINIT
/* Register property of whether symlinks is local to file */
if(H5P_register_real(pclass, H5F_MNT_SYM_LOCAL_NAME, H5F_MNT_SYM_LOCAL_SIZE, &local, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
diff --git a/src/H5Pgcpl.c b/src/H5Pgcpl.c
index 72784eb..983929d 100644
--- a/src/H5Pgcpl.c
+++ b/src/H5Pgcpl.c
@@ -110,7 +110,7 @@ H5P_gcrt_reg_prop(H5P_genclass_t *pclass)
H5O_linfo_t linfo = H5G_CRT_LINK_INFO_DEF; /* Default link info settings */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_gcrt_reg_prop)
+ FUNC_ENTER_NOAPI_NOINIT
/* Register group info property */
if(H5P_register_real(pclass, H5G_CRT_GROUP_INFO_NAME, H5G_CRT_GROUP_INFO_SIZE, &ginfo, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
@@ -143,7 +143,7 @@ H5Pset_local_heap_size_hint(hid_t plist_id, size_t size_hint)
H5O_ginfo_t ginfo; /* Group information structure */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_local_heap_size_hint, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iz", plist_id, size_hint);
/* Get the plist structure */
@@ -183,7 +183,7 @@ H5Pget_local_heap_size_hint(hid_t plist_id, size_t *size_hint /*out*/)
{
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_local_heap_size_hint, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ix", plist_id, size_hint);
if(size_hint) {
@@ -231,7 +231,7 @@ H5Pset_link_phase_change(hid_t plist_id, unsigned max_compact, unsigned min_dens
H5O_ginfo_t ginfo; /* Group information structure */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_link_phase_change, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "iIuIu", plist_id, max_compact, min_dense);
/* Range check values */
@@ -284,7 +284,7 @@ H5Pget_link_phase_change(hid_t plist_id, unsigned *max_compact /*out*/, unsigned
{
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_link_phase_change, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ixx", plist_id, max_compact, min_dense);
/* Get values */
@@ -337,7 +337,7 @@ H5Pset_est_link_info(hid_t plist_id, unsigned est_num_entries, unsigned est_name
H5O_ginfo_t ginfo; /* Group information structure */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_est_link_info, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "iIuIu", plist_id, est_num_entries, est_name_len);
/* Range check values */
@@ -388,7 +388,7 @@ H5Pget_est_link_info(hid_t plist_id, unsigned *est_num_entries /*out*/, unsigned
{
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_est_link_info, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ixx", plist_id, est_num_entries, est_name_len);
/* Get values */
@@ -433,7 +433,7 @@ H5Pset_link_creation_order(hid_t plist_id, unsigned crt_order_flags)
H5O_linfo_t linfo; /* Link information structure */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_link_creation_order, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iIu", plist_id, crt_order_flags);
/* Check for bad combination of flags */
@@ -478,7 +478,7 @@ H5Pget_link_creation_order(hid_t plist_id, unsigned *crt_order_flags /*out*/)
{
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_link_creation_order, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ix", plist_id, crt_order_flags);
/* Get values */
diff --git a/src/H5Pint.c b/src/H5Pint.c
index 5a0c54d..08b8af6 100644
--- a/src/H5Pint.c
+++ b/src/H5Pint.c
@@ -265,7 +265,7 @@ H5P_do_prop_cb1(H5SL_t *slist, H5P_genprop_t *prop, H5P_prp_cb1_t cb)
H5P_genprop_t *pcopy=NULL; /* Copy of property to insert into skip list */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_do_prop_cb1)
+ FUNC_ENTER_NOAPI_NOINIT
/* Allocate space for a temporary copy of the property value */
if(NULL == (tmp_value = H5MM_malloc(prop->size)))
@@ -326,7 +326,7 @@ H5P_init(void)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5P_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
@@ -351,7 +351,7 @@ H5P_init_interface(void)
size_t pass_init; /* # of classes initialized in each pass */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Initialize the Generic Property class & object groups.
@@ -451,7 +451,7 @@ H5P_term_interface(void)
int nclass=0;
int n=0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(H5_interface_initialize_g) {
/* Destroy HDF5 library property classes & lists */
@@ -551,7 +551,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_NOAPI_NOINIT(H5P_copy_pclass)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(pclass);
@@ -632,7 +632,7 @@ H5P_copy_plist(const H5P_genplist_t *old_plist, hbool_t app_ref)
hbool_t has_parent_class; /* Flag to indicate that this property list's class has a parent */
hid_t ret_value=FAIL; /* return value */
- FUNC_ENTER_NOAPI(H5P_copy_plist, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(old_plist);
@@ -842,7 +842,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_NOAPI_NOINIT(H5P_dup_prop)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(oprop);
HDassert(type != H5P_PROP_WITHIN_UNKNOWN);
@@ -956,7 +956,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_NOAPI_NOINIT(H5P_create_prop)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(name);
HDassert((size>0 && value!=NULL) || (size==0));
@@ -1036,7 +1036,7 @@ H5P_add_prop(H5SL_t *slist, H5P_genprop_t *prop)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5P_add_prop, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(slist);
HDassert(prop);
@@ -1074,7 +1074,7 @@ H5P_find_prop_plist(H5P_genplist_t *plist, const char *name)
{
H5P_genprop_t *ret_value; /* Property pointer return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_find_prop_plist)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(plist);
HDassert(name);
@@ -1134,7 +1134,7 @@ H5P_find_prop_pclass(H5P_genclass_t *pclass, const char *name)
{
H5P_genprop_t *ret_value; /* Property pointer return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_find_prop_pclass)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(pclass);
HDassert(name);
@@ -1169,7 +1169,7 @@ done:
static herr_t
H5P_free_prop(H5P_genprop_t *prop)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_free_prop)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(prop);
@@ -1213,7 +1213,7 @@ H5P_free_prop_cb(void *item, void UNUSED *key, void *op_data)
H5P_genprop_t *tprop=(H5P_genprop_t *)item; /* Temporary pointer to property */
hbool_t make_cb = *(hbool_t *)op_data; /* Whether to make property 'close' callback */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_free_prop_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(tprop);
@@ -1252,7 +1252,7 @@ H5P_free_del_name_cb(void *item, void UNUSED *key, void UNUSED *op_data)
{
char *del_name=(char *)item; /* Temporary pointer to deleted name */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_free_del_name_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(del_name);
@@ -1288,7 +1288,7 @@ H5P_free_del_name_cb(void *item, void UNUSED *key, void UNUSED *op_data)
herr_t
H5P_access_class(H5P_genclass_t *pclass, H5P_class_mod_t mod)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_access_class)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(pclass);
HDassert(mod > H5P_MOD_ERR && mod < H5P_MOD_MAX);
@@ -1384,7 +1384,7 @@ H5P_check_class(void *_obj, hid_t UNUSED id, void *_key)
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_NOAPI_NOINIT_NOFUNC(H5P_check_class)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(obj);
HDassert(H5I_GENPROP_CLS==H5I_get_type(id));
@@ -1443,7 +1443,7 @@ H5P_create_class(H5P_genclass_t *par_class, const char *name, hbool_t internal,
H5P_genclass_t *pclass=NULL; /* Property list class created */
H5P_genclass_t *ret_value; /* return value */
- FUNC_ENTER_NOAPI(H5P_create_class, NULL)
+ FUNC_ENTER_NOAPI(NULL)
HDassert(name);
/* Allow internal classes to break some rules */
@@ -1540,7 +1540,7 @@ H5P_create(H5P_genclass_t *pclass)
H5SL_t *seen=NULL; /* Skip list to hold names of properties already seen */
H5P_genplist_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_create)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(pclass);
@@ -1679,7 +1679,7 @@ H5P_create_id(H5P_genclass_t *pclass, hbool_t app_ref)
hid_t plist_id = FAIL; /* Property list ID */
hid_t ret_value; /* return value */
- FUNC_ENTER_NOAPI(H5P_create_id, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(pclass);
@@ -1889,7 +1889,7 @@ H5P_register_real(H5P_genclass_t *pclass, const char *name, size_t size,
H5P_genprop_t *new_prop = NULL; /* Temporary property pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5P_register_real, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(pclass);
HDassert(0 == pclass->plists);
@@ -2089,7 +2089,7 @@ H5P_register(H5P_genclass_t **ppclass, const char *name, size_t size,
H5P_genclass_t *new_class = NULL; /* New class pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5P_register, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(ppclass);
@@ -2299,7 +2299,7 @@ H5P_insert(H5P_genplist_t *plist, const char *name, size_t size,
H5P_genprop_t *new_prop = NULL; /* Temporary property pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_insert)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(plist);
HDassert(name);
@@ -2392,7 +2392,7 @@ H5P_set(H5P_genplist_t *plist, const char *name, const void *value)
H5P_genprop_t *prop; /* Temporary property pointer */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5P_set, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(plist);
HDassert(name);
@@ -2541,7 +2541,7 @@ H5P_exist_plist(H5P_genplist_t *plist, const char *name)
{
htri_t ret_value = FAIL; /* return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_exist_plist)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(plist);
HDassert(name);
@@ -2601,7 +2601,7 @@ H5P_exist_pclass(H5P_genclass_t *pclass, const char *name)
{
htri_t ret_value = FAIL; /* return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_exist_pclass)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(pclass);
HDassert(name);
@@ -2658,7 +2658,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_NOAPI_NOINIT(H5P_get_size_plist)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(plist);
HDassert(name);
@@ -2704,7 +2704,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_NOAPI_NOINIT(H5P_get_size_pclass)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(pclass);
HDassert(name);
@@ -2746,7 +2746,7 @@ H5P_get_class(const H5P_genplist_t *plist)
{
H5P_genclass_t *ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_get_class)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(plist);
@@ -2780,7 +2780,7 @@ H5P_get_class(const H5P_genplist_t *plist)
herr_t
H5P_get_nprops_plist(const H5P_genplist_t *plist, size_t *nprops)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_get_nprops_plist)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(plist);
HDassert(nprops);
@@ -2818,7 +2818,7 @@ H5P_get_nprops_pclass(const H5P_genclass_t *pclass, size_t *nprops, hbool_t recu
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5P_get_nprops_pclass, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(pclass);
HDassert(nprops);
@@ -2866,7 +2866,7 @@ H5P_cmp_prop(const H5P_genprop_t *prop1, const H5P_genprop_t *prop2)
int cmp_value; /* Value from comparison */
int ret_value = 0; /* return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_cmp_prop)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(prop1);
HDassert(prop2);
@@ -2957,7 +2957,7 @@ H5P_cmp_class(const H5P_genclass_t *pclass1, const H5P_genclass_t *pclass2)
int cmp_value; /* Value from comparison */
int ret_value = 0; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_cmp_class)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(pclass1);
HDassert(pclass2);
@@ -3063,7 +3063,7 @@ H5P_cmp_plist(const H5P_genplist_t *plist1, const H5P_genplist_t *plist2)
int cmp_value; /* Value from comparison */
int ret_value = 0; /* return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_cmp_plist)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(plist1);
HDassert(plist2);
@@ -3169,7 +3169,7 @@ H5P_isa_class_real(H5P_genclass_t *pclass1, H5P_genclass_t *pclass2)
{
htri_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_isa_class_real)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(pclass1);
HDassert(pclass2);
@@ -3222,7 +3222,7 @@ H5P_isa_class(hid_t plist_id, hid_t pclass_id)
H5P_genclass_t *pclass; /* Property list class */
htri_t ret_value; /* return value */
- FUNC_ENTER_NOAPI(H5P_isa_class, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
if(NULL == (plist = (H5P_genplist_t *)H5I_object_verify(plist_id, H5I_GENPROP_LST)))
@@ -3272,7 +3272,7 @@ H5P_object_verify(hid_t plist_id, hid_t pclass_id)
{
H5P_genplist_t *ret_value; /* return value */
- FUNC_ENTER_NOAPI(H5P_object_verify, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Compare the property list's class against the other class */
if(H5P_isa_class(plist_id, pclass_id) != TRUE)
@@ -3349,7 +3349,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_NOAPI_NOINIT(H5P_iterate_plist)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(idx);
HDassert(iter_func);
@@ -3505,7 +3505,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_NOAPI_NOINIT(H5P_iterate_pclass)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(idx);
HDassert(iter_func);
@@ -3577,7 +3577,7 @@ H5P_peek_unsigned(H5P_genplist_t *plist, const char *name)
{
unsigned ret_value; /* return value */
- FUNC_ENTER_NOAPI(H5P_peek_unsigned, UFAIL)
+ FUNC_ENTER_NOAPI(UFAIL)
HDassert(plist);
HDassert(name);
@@ -3622,7 +3622,7 @@ H5P_peek_hid_t(H5P_genplist_t *plist, const char *name)
{
hid_t ret_value; /* return value */
- FUNC_ENTER_NOAPI(H5P_peek_hid_t, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(plist);
HDassert(name);
@@ -3667,7 +3667,7 @@ H5P_peek_voidp(H5P_genplist_t *plist, const char *name)
{
void * ret_value; /* return value */
- FUNC_ENTER_NOAPI(H5P_peek_voidp, NULL)
+ FUNC_ENTER_NOAPI(NULL)
HDassert(plist);
HDassert(name);
@@ -3712,7 +3712,7 @@ H5P_peek_size_t(H5P_genplist_t *plist, const char *name)
{
size_t ret_value; /* return value */
- FUNC_ENTER_NOAPI(H5P_peek_size_t, UFAIL)
+ FUNC_ENTER_NOAPI(UFAIL)
HDassert(plist);
HDassert(name);
@@ -3760,7 +3760,7 @@ H5P_get(const H5P_genplist_t *plist, const char *name, void *value)
H5P_genprop_t *prop; /* Temporary property pointer */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5P_get, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(plist);
HDassert(name);
@@ -3907,7 +3907,7 @@ H5P_remove(hid_t plist_id, H5P_genplist_t *plist, const char *name)
char *del_name; /* Pointer to deleted name */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5P_remove, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(plist);
HDassert(name);
@@ -4044,7 +4044,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_NOAPI_NOINIT(H5P_copy_prop_plist)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(name);
@@ -4151,7 +4151,7 @@ H5P_copy_prop_pclass(hid_t dst_id, hid_t src_id, const char *name)
H5P_genprop_t *prop; /* Temporary property pointer */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_copy_prop_pclass)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(name);
@@ -4226,7 +4226,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_NOAPI_NOINIT(H5P_unregister)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(pclass);
HDassert(name);
@@ -4291,7 +4291,7 @@ H5P_close(void *_plist)
unsigned make_cb=0; /* Operator data for property free callback */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_close)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(plist);
@@ -4450,7 +4450,7 @@ H5P_get_class_name(H5P_genclass_t *pclass)
{
char *ret_value; /* return value */
- FUNC_ENTER_NOAPI(H5P_get_class_name, NULL)
+ FUNC_ENTER_NOAPI(NULL)
HDassert(pclass);
@@ -4491,7 +4491,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_NOAPI_NOINIT(H5P_get_class_path)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(pclass);
@@ -4558,7 +4558,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_NOAPI_NOINIT(H5P_open_class_path)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(path);
@@ -4631,7 +4631,7 @@ H5P_get_class_parent(const H5P_genclass_t *pclass)
{
H5P_genclass_t *ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_get_class_parent)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(pclass);
@@ -4665,7 +4665,7 @@ H5P_close_class(void *_pclass)
H5P_genclass_t *pclass = (H5P_genclass_t *)_pclass;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_close_class)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(pclass);
diff --git a/src/H5Plapl.c b/src/H5Plapl.c
index 438a297..6c80493 100644
--- a/src/H5Plapl.c
+++ b/src/H5Plapl.c
@@ -155,7 +155,7 @@ H5P_lacc_reg_prop(H5P_genclass_t *pclass)
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_lacc_reg_prop)
+ FUNC_ENTER_NOAPI_NOINIT
/* Register property for number of links traversed */
if(H5P_register_real(pclass, H5L_ACS_NLINKS_NAME, H5L_ACS_NLINKS_SIZE, &nlinks, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
@@ -202,7 +202,7 @@ H5P_lacc_elink_fapl_del(hid_t UNUSED prop_id, const char UNUSED *name, size_t UN
hid_t l_fapl_id;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5P_lacc_elink_fapl_del, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(value);
@@ -236,7 +236,7 @@ H5P_lacc_elink_fapl_copy(const char UNUSED *name, size_t UNUSED size, void *valu
hid_t l_fapl_id;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5P_lacc_elink_fapl_copy, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(value);
@@ -277,7 +277,7 @@ H5P_lacc_elink_fapl_close(const char UNUSED *name, size_t UNUSED size, void *val
hid_t l_fapl_id;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5P_lacc_elink_fapl_close)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(value);
@@ -306,7 +306,7 @@ done:
static herr_t
H5P_lacc_elink_pref_del(hid_t UNUSED prop_id, const char UNUSED *name, size_t UNUSED size, void *value)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_lacc_elink_pref_del)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(value);
@@ -332,7 +332,7 @@ H5P_lacc_elink_pref_del(hid_t UNUSED prop_id, const char UNUSED *name, size_t UN
static herr_t
H5P_lacc_elink_pref_copy(const char UNUSED *name, size_t UNUSED size, void *value)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_lacc_elink_pref_copy)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(value);
@@ -358,7 +358,7 @@ H5P_lacc_elink_pref_copy(const char UNUSED *name, size_t UNUSED size, void *valu
static herr_t
H5P_lacc_elink_pref_close(const char UNUSED *name, size_t UNUSED size, void *value)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_lacc_elink_pref_close)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(value);
@@ -395,7 +395,7 @@ H5Pset_nlinks(hid_t plist_id, size_t nlinks)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_nlinks, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iz", plist_id, nlinks);
if(nlinks <= 0)
@@ -436,7 +436,7 @@ H5Pget_nlinks(hid_t plist_id, size_t *nlinks)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_nlinks, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*z", plist_id, nlinks);
if(!nlinks)
@@ -476,7 +476,7 @@ H5Pset_elink_prefix(hid_t plist_id, const char *prefix)
char *my_prefix; /* Copy of prefix string */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_elink_prefix, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*s", plist_id, prefix);
/* Get the plist structure */
@@ -527,7 +527,7 @@ H5Pget_elink_prefix(hid_t plist_id, char *prefix, size_t size)
size_t len; /* Length of prefix string */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Pget_elink_prefix, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("Zs", "i*sz", plist_id, prefix, size);
/* Get the plist structure */
@@ -577,7 +577,7 @@ H5Pset_elink_fapl(hid_t lapl_id, hid_t fapl_id)
hid_t l_fapl_id, new_fapl_id;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_elink_fapl, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ii", lapl_id, fapl_id);
/* Check arguments */
@@ -628,7 +628,7 @@ H5Pget_elink_fapl(hid_t lapl_id)
hid_t l_fapl_id;
hid_t ret_value=FAIL; /* Return value */
- FUNC_ENTER_API(H5Pget_elink_fapl, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", lapl_id);
/* Get the plist structure */
@@ -672,7 +672,7 @@ H5Pset_elink_acc_flags(hid_t lapl_id, unsigned flags)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_elink_acc_flags, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iIu", lapl_id, flags);
/* Check that flags are valid */
@@ -711,7 +711,7 @@ H5Pget_elink_acc_flags(hid_t lapl_id, unsigned *flags)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_elink_acc_flags, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*Iu", lapl_id, flags);
/* Get the plist structure */
@@ -749,7 +749,7 @@ H5Pset_elink_cb(hid_t lapl_id, H5L_elink_traverse_t func, void *op_data)
H5L_elink_cb_t cb_info; /* Callback info struct */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_elink_cb, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ix*x", lapl_id, func, op_data);
/* Check if the callback function is NULL and the user data is non-NULL.
@@ -794,7 +794,7 @@ H5Pget_elink_cb(hid_t lapl_id, H5L_elink_traverse_t *func, void **op_data)
H5L_elink_cb_t cb_info; /* Callback info struct */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_elink_cb, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*x**x", lapl_id, func, op_data);
/* Get the plist structure */
diff --git a/src/H5Plcpl.c b/src/H5Plcpl.c
index ffc68fa..60b4e37 100644
--- a/src/H5Plcpl.c
+++ b/src/H5Plcpl.c
@@ -116,7 +116,7 @@ H5P_lcrt_reg_prop(H5P_genclass_t *pclass)
unsigned intmd_group = H5L_CRT_INTERMEDIATE_GROUP_DEF; /* Default setting for creating intermediate groups */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5P_lcrt_reg_prop, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Register create intermediate groups property */
if(H5P_register_real(pclass, H5L_CRT_INTERMEDIATE_GROUP_NAME, H5L_CRT_INTERMEDIATE_GROUP_SIZE, &intmd_group, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
@@ -147,7 +147,7 @@ H5Pset_create_intermediate_group(hid_t plist_id, unsigned crt_intmd_group)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_create_intermediate_group, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iIu", plist_id, crt_intmd_group);
/* Get the plist structure */
@@ -182,7 +182,7 @@ H5Pget_create_intermediate_group(hid_t plist_id, unsigned *crt_intmd_group /*out
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_create_intermediate_group, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ix", plist_id, crt_intmd_group);
/* Get the plist structure */
diff --git a/src/H5Pocpl.c b/src/H5Pocpl.c
index dec2cfe..9e33c5e 100755
--- a/src/H5Pocpl.c
+++ b/src/H5Pocpl.c
@@ -133,7 +133,7 @@ H5P_ocrt_reg_prop(H5P_genclass_t *pclass)
H5O_pline_t pline = H5O_CRT_PIPELINE_DEF; /* Default I/O pipeline setting */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_ocrt_reg_prop)
+ FUNC_ENTER_NOAPI_NOINIT
/* Register max. compact attribute storage property */
if(H5P_register_real(pclass, H5O_CRT_ATTR_MAX_COMPACT_NAME, H5O_CRT_ATTR_MAX_COMPACT_SIZE, &attr_max_compact, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
@@ -180,7 +180,7 @@ H5P_ocrt_copy(hid_t dst_plist_id, hid_t src_plist_id, void UNUSED *copy_data)
H5P_genplist_t *dst_plist; /* Pointer to destination property list */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_ocrt_copy)
+ FUNC_ENTER_NOAPI_NOINIT
/* Verify property list IDs */
if(NULL == (dst_plist = (H5P_genplist_t *)H5I_object(dst_plist_id)))
@@ -228,7 +228,7 @@ H5P_ocrt_close(hid_t dcpl_id, void UNUSED *close_data)
H5P_genplist_t *plist; /* Property list */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5P_ocrt_close)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check arguments */
if(NULL == (plist = (H5P_genplist_t *)H5I_object(dcpl_id)))
@@ -275,7 +275,7 @@ H5Pset_attr_phase_change(hid_t plist_id, unsigned max_compact, unsigned min_dens
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_attr_phase_change, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "iIuIu", plist_id, max_compact, min_dense);
/* Range check values */
@@ -319,7 +319,7 @@ H5Pget_attr_phase_change(hid_t plist_id, unsigned *max_compact, unsigned *min_de
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_attr_phase_change, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*Iu*Iu", plist_id, max_compact, min_dense);
/* Get the plist structure */
@@ -360,7 +360,7 @@ H5Pset_attr_creation_order(hid_t plist_id, unsigned crt_order_flags)
uint8_t ohdr_flags; /* Object header flags */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_attr_creation_order, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iIu", plist_id, crt_order_flags);
/* Check for bad combination of flags */
@@ -409,7 +409,7 @@ H5Pget_attr_creation_order(hid_t plist_id, unsigned *crt_order_flags)
{
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_attr_creation_order, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*Iu", plist_id, crt_order_flags);
/* Get values */
@@ -471,7 +471,7 @@ H5Pset_obj_track_times(hid_t plist_id, hbool_t track_times)
uint8_t ohdr_flags; /* Object header flags */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_obj_track_times, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ib", plist_id, track_times);
/* Get the plist structure */
@@ -514,7 +514,7 @@ H5Pget_obj_track_times(hid_t plist_id, hbool_t *track_times)
{
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_obj_track_times, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*b", plist_id, track_times);
/* Get values */
@@ -582,7 +582,7 @@ H5P_modify_filter(H5P_genplist_t *plist, H5Z_filter_t filter, unsigned flags,
H5O_pline_t pline;
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOAPI(H5P_modify_filter, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Get the pipeline property to modify */
if(H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
@@ -651,7 +651,7 @@ H5Pmodify_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags,
H5P_genplist_t *plist; /* Property list */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pmodify_filter, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "iZfIuz*[a3]Iu", plist_id, filter, flags, cd_nelmts, cd_values);
/* Check args */
@@ -728,7 +728,7 @@ H5Pset_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags,
H5O_pline_t pline; /* Filter pipeline */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_filter, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "iZfIuz*[a3]Iu", plist_id, filter, flags, cd_nelmts, cd_values);
/* Check args */
@@ -794,7 +794,7 @@ H5Pget_nfilters(hid_t plist_id)
H5O_pline_t pline; /* Filter pipeline */
int ret_value; /* return value */
- FUNC_ENTER_API(H5Pget_nfilters, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Is", "i", plist_id);
/* Get the plist structure */
@@ -855,7 +855,7 @@ H5Pget_filter2(hid_t plist_id, unsigned idx, unsigned int *flags/*out*/,
const H5Z_filter_info_t *filter; /* Pointer to filter information */
H5Z_filter_t ret_value; /* return value */
- FUNC_ENTER_API(H5Pget_filter2, H5Z_FILTER_ERROR)
+ FUNC_ENTER_API(H5Z_FILTER_ERROR)
H5TRACE8("Zf", "iIux*zxzxx", plist_id, idx, flags, cd_nelmts, cd_values,
namelen, name, filter_config);
@@ -938,7 +938,7 @@ H5P_get_filter_by_id(H5P_genplist_t *plist, H5Z_filter_t id, unsigned int *flags
H5Z_filter_info_t *filter; /* Pointer to filter information */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5P_get_filter_by_id, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Get pipeline info */
if(H5P_get(plist, H5O_CRT_PIPELINE_NAME, &pline) < 0)
@@ -996,7 +996,7 @@ H5Pget_filter_by_id2(hid_t plist_id, H5Z_filter_t id, unsigned int *flags/*out*/
const H5Z_filter_info_t *filter; /* Pointer to filter information */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_filter_by_id2, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE8("e", "iZfx*zxzx*Iu", plist_id, id, flags, cd_nelmts, cd_values,
namelen, name, filter_config);
@@ -1064,7 +1064,7 @@ H5Pall_filters_avail(hid_t plist_id)
H5O_pline_t pline; /* Filter pipeline */
htri_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Pall_filters_avail, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("t", "i", plist_id);
/* Get the plist structure */
@@ -1111,7 +1111,7 @@ H5Premove_filter(hid_t plist_id, H5Z_filter_t filter)
H5O_pline_t pline; /* Filter pipeline */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Premove_filter, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iZf", plist_id, filter);
/* Get the plist structure */
@@ -1175,7 +1175,7 @@ H5Pset_deflate(hid_t plist_id, unsigned level)
H5O_pline_t pline; /* Filter pipeline */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_deflate, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iIu", plist_id, level);
/* Check arguments */
@@ -1230,7 +1230,7 @@ H5Pset_fletcher32(hid_t plist_id)
H5O_pline_t pline; /* Filter pipeline */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_fletcher32, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", plist_id);
/* Get the plist structure */
@@ -1272,7 +1272,7 @@ H5P_get_filter(const H5Z_filter_info_t *filter, unsigned int *flags/*out*/,
size_t namelen, char name[]/*out*/,
unsigned *filter_config /*out*/)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5P_get_filter)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check arguments */
HDassert(filter);
@@ -1353,7 +1353,7 @@ H5P_ocrt_pipeline_cmp(const void *_pline1, const void *_pline2, size_t UNUSED si
int cmp_value; /* Value from comparison */
herr_t ret_value = 0; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5P_ocrt_pipeline_cmp)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(pline1);
@@ -1450,7 +1450,7 @@ H5Pget_filter1(hid_t plist_id, unsigned idx, unsigned int *flags/*out*/,
H5P_genplist_t *plist; /* Property list pointer */
H5Z_filter_t ret_value; /* return value */
- FUNC_ENTER_API(H5Pget_filter1, H5Z_FILTER_ERROR)
+ FUNC_ENTER_API(H5Z_FILTER_ERROR)
H5TRACE7("Zf", "iIux*zxzx", plist_id, idx, flags, cd_nelmts, cd_values, namelen,
name);
@@ -1531,7 +1531,7 @@ H5Pget_filter_by_id1(hid_t plist_id, H5Z_filter_t id, unsigned int *flags/*out*/
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pget_filter_by_id1, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE7("e", "iZfx*zxzx", plist_id, id, flags, cd_nelmts, cd_values, namelen,
name);
diff --git a/src/H5Pocpypl.c b/src/H5Pocpypl.c
index 963dddc..af50d80 100755
--- a/src/H5Pocpypl.c
+++ b/src/H5Pocpypl.c
@@ -115,7 +115,7 @@ H5P_ocpy_reg_prop(H5P_genclass_t *pclass)
unsigned ocpy_option = H5O_CPY_OPTION_DEF; /* Default object copy flags */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5P_ocpy_reg_prop, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Register copy options property */
if(H5P_register_real(pclass, H5O_CPY_OPTION_NAME, H5O_CPY_OPTION_SIZE, &ocpy_option, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
@@ -153,7 +153,7 @@ H5Pset_copy_object(hid_t plist_id, unsigned cpy_option)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Pset_copy_object, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iIu", plist_id, cpy_option);
/* Check parameters */
@@ -191,7 +191,7 @@ H5Pget_copy_object(hid_t plist_id, unsigned *cpy_option /*out*/)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_copy_object, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ix", plist_id, cpy_option);
/* Get the plist structure */
diff --git a/src/H5Pstrcpl.c b/src/H5Pstrcpl.c
index 5125511..91cf70b 100644
--- a/src/H5Pstrcpl.c
+++ b/src/H5Pstrcpl.c
@@ -114,7 +114,7 @@ H5P_strcrt_reg_prop(H5P_genclass_t *pclass)
H5T_cset_t char_encoding = H5P_STRCRT_CHAR_ENCODING_DEF; /* Default character set encoding */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5P_strcrt_reg_prop, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Register character encoding */
if(H5P_register_real(pclass, H5P_STRCRT_CHAR_ENCODING_NAME, H5P_STRCRT_CHAR_ENCODING_SIZE, &char_encoding, NULL, NULL, NULL, NULL, NULL, NULL, NULL) < 0)
@@ -145,7 +145,7 @@ H5Pset_char_encoding(hid_t plist_id, H5T_cset_t encoding)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pset_char_encoding, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iTc", plist_id, encoding);
/* Check arguments */
@@ -161,7 +161,7 @@ H5Pset_char_encoding(hid_t plist_id, H5T_cset_t encoding)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set character encoding")
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* end H5P_set_char_encoding() */
@@ -182,7 +182,7 @@ H5Pget_char_encoding(hid_t plist_id, H5T_cset_t *encoding /*out*/)
H5P_genplist_t *plist; /* Property list pointer */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Pget_char_encoding, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ix", plist_id, encoding);
/* Get the plist structure */
@@ -195,6 +195,6 @@ H5Pget_char_encoding(hid_t plist_id, H5T_cset_t *encoding /*out*/)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get character encoding flag")
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* end H5Pget_char_encoding() */
diff --git a/src/H5Ptest.c b/src/H5Ptest.c
index 575d6d3..b36da6a 100644
--- a/src/H5Ptest.c
+++ b/src/H5Ptest.c
@@ -63,7 +63,7 @@ H5P_get_class_path_test(hid_t pclass_id)
H5P_genclass_t *pclass; /* Property class to query */
char *ret_value; /* return value */
- FUNC_ENTER_NOAPI(H5P_get_class_path_test, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Check arguments. */
if(NULL == (pclass = (H5P_genclass_t *)H5I_object_verify(pclass_id, H5I_GENPROP_CLS)))
@@ -104,7 +104,7 @@ H5P_open_class_path_test(const char *path)
H5P_genclass_t *pclass=NULL;/* Property class to query */
hid_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5P_open_class_path_test, FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments. */
if (NULL == path || *path=='\0')
@@ -122,7 +122,7 @@ done:
if(ret_value<0 && pclass)
H5P_close_class(pclass);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* H5P_open_class_path_test() */
@@ -149,7 +149,7 @@ H5P_reset_external_file_test(hid_t dcpl_id)
H5P_genplist_t *plist; /* Property list */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5P_reset_external_file_test, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments */
if(NULL == (plist = (H5P_genplist_t *)H5I_object(dcpl_id)))
diff --git a/src/H5R.c b/src/H5R.c
index 2d2766d..3908426 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -63,7 +63,7 @@ H5R_init(void)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5R_init, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
@@ -88,14 +88,14 @@ H5R_init_interface(void)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5R_init_interface);
+ FUNC_ENTER_NOAPI_NOINIT
/* Initialize the atom group for the file IDs */
if(H5I_register_type(H5I_REFERENCE, (size_t)H5I_REFID_HASHSIZE, H5R_RESERVED_ATOMS, (H5I_free_t)NULL) < 0)
HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable to initialize interface");
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
@@ -121,7 +121,7 @@ H5R_term_interface(void)
{
int n=0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5R_term_interface);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if (H5_interface_initialize_g) {
if ((n=H5I_nmembers(H5I_REFERENCE))) {
@@ -133,7 +133,7 @@ H5R_term_interface(void)
}
}
- FUNC_LEAVE_NOAPI(n);
+ FUNC_LEAVE_NOAPI(n)
}
@@ -173,7 +173,7 @@ H5R_create(void *_ref, H5G_loc_t *loc, const char *name, H5R_type_t ref_type, H5
hbool_t obj_found = FALSE; /* Object location found */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5R_create)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(_ref);
HDassert(loc);
@@ -312,7 +312,7 @@ H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t
H5S_t *space = NULL; /* Pointer to dataspace containing region */
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Rcreate, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "*xi*sRti", ref, loc_id, name, ref_type, space_id);
/* Check args */
@@ -372,7 +372,7 @@ H5R_dereference(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type, const void *_re
H5O_type_t obj_type; /* Type of object */
hid_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5R_dereference)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(_ref);
HDassert(ref_type > H5R_BADTYPE || ref_type < H5R_MAXTYPE);
@@ -515,7 +515,7 @@ H5Rdereference(hid_t id, H5R_type_t ref_type, const void *_ref)
H5F_t *file = NULL; /* File object */
hid_t ret_value;
- FUNC_ENTER_API(H5Rdereference, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("i", "iRt*x", id, ref_type, _ref);
/* Check args */
@@ -568,7 +568,7 @@ H5R_get_region(H5F_t *file, hid_t dxpl_id, const void *_ref)
uint8_t *buf = NULL; /* Buffer to store serialized selection in */
H5S_t *ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5R_get_region)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(_ref);
HDassert(file);
@@ -637,7 +637,7 @@ H5Rget_region(hid_t id, H5R_type_t ref_type, const void *ref)
H5S_t *space = NULL; /* Dataspace object */
hid_t ret_value;
- FUNC_ENTER_API(H5Rget_region, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("i", "iRt*x", id, ref_type, ref);
/* Check args */
@@ -691,7 +691,7 @@ H5R_get_obj_type(H5F_t *file, hid_t dxpl_id, H5R_type_t ref_type,
unsigned rc; /* Reference count of object */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5R_get_obj_type)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(file);
HDassert(_ref);
@@ -777,7 +777,7 @@ H5Rget_obj_type2(hid_t id, H5R_type_t ref_type, const void *ref,
H5G_loc_t loc; /* Object location */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Rget_obj_type2, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "iRt*x*Ot", id, ref_type, ref, obj_type);
/* Check args */
@@ -833,7 +833,7 @@ H5R_get_name(H5F_t *f, hid_t lapl_id, hid_t dxpl_id, hid_t id, H5R_type_t ref_ty
H5O_loc_t oloc; /* Object location describing object for reference */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5R_get_name)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(f);
@@ -931,7 +931,7 @@ H5Rget_name(hid_t id, H5R_type_t ref_type, const void *_ref, char *name,
H5F_t *file; /* File object */
ssize_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Rget_name, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("Zs", "iRt*x*sz", id, ref_type, _ref, name, size);
/* Check args */
diff --git a/src/H5RC.c b/src/H5RC.c
index ecec03a..6abe837 100644
--- a/src/H5RC.c
+++ b/src/H5RC.c
@@ -57,7 +57,7 @@ H5RC_create(void *o, H5RC_free_func_t free_func)
{
H5RC_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5RC_create, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Sanity check */
HDassert(o);
@@ -101,7 +101,7 @@ H5RC_decr(H5RC_t *rc)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5RC_decr, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(rc);
diff --git a/src/H5RS.c b/src/H5RS.c
index 06fc81e..dc6795e 100644
--- a/src/H5RS.c
+++ b/src/H5RS.c
@@ -63,7 +63,7 @@ H5RS_xstrdup(const char *s)
{
char *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5RS_xstrdup)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(s) {
size_t len = HDstrlen(s) + 1;
@@ -103,7 +103,7 @@ H5RS_create(const char *s)
{
H5RS_str_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5RS_create, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Allocate ref-counted string structure */
if(NULL == (ret_value = H5FL_MALLOC(H5RS_str_t)))
@@ -143,7 +143,7 @@ H5RS_wrap(const char *s)
{
H5RS_str_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5RS_wrap, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Allocate ref-counted string structure */
if(NULL == (ret_value = H5FL_MALLOC(H5RS_str_t)))
@@ -185,7 +185,7 @@ H5RS_own(char *s)
{
H5RS_str_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5RS_own, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Allocate ref-counted string structure */
if(NULL == (ret_value = H5FL_MALLOC(H5RS_str_t)))
@@ -223,7 +223,7 @@ done:
herr_t
H5RS_decr(H5RS_str_t *rs)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5RS_decr)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(rs);
@@ -261,7 +261,7 @@ H5RS_decr(H5RS_str_t *rs)
herr_t
H5RS_incr(H5RS_str_t *rs)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5RS_incr)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(rs);
@@ -305,7 +305,7 @@ H5RS_incr(H5RS_str_t *rs)
H5RS_str_t *
H5RS_dup(H5RS_str_t *ret_value)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5RS_dup)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check for valid reference counted string */
if(ret_value != NULL)
@@ -341,7 +341,7 @@ H5RS_dup_str(const char *s)
size_t path_len; /* Length of the path */
H5RS_str_t *ret_value;
- FUNC_ENTER_NOAPI(H5RS_dup_str, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Sanity check */
HDassert(s);
@@ -389,7 +389,7 @@ int
H5RS_cmp(const H5RS_str_t *rs1, const H5RS_str_t *rs2)
{
/* Can't return invalid value from this function */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5RS_cmp)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(rs1);
@@ -422,7 +422,7 @@ H5RS_cmp(const H5RS_str_t *rs1, const H5RS_str_t *rs2)
ssize_t
H5RS_len(const H5RS_str_t *rs)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5RS_len)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(rs);
@@ -456,7 +456,7 @@ H5RS_len(const H5RS_str_t *rs)
char *
H5RS_get_str(const H5RS_str_t *rs)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5RS_get_str)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(rs);
@@ -488,7 +488,7 @@ H5RS_get_str(const H5RS_str_t *rs)
unsigned
H5RS_get_count(const H5RS_str_t *rs)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5RS_get_count)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(rs);
diff --git a/src/H5Rdeprec.c b/src/H5Rdeprec.c
index 0e2acc8..1dd97ee 100644
--- a/src/H5Rdeprec.c
+++ b/src/H5Rdeprec.c
@@ -100,7 +100,7 @@ DESCRIPTION
static herr_t
H5R_init_deprec_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5R_init_deprec_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5R_init())
} /* H5R_init_deprec_interface() */
@@ -136,7 +136,7 @@ H5Rget_obj_type1(hid_t id, H5R_type_t ref_type, const void *ref)
H5O_type_t obj_type; /* Object type */
H5G_obj_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Rget_obj_type1, H5G_UNKNOWN)
+ FUNC_ENTER_API(H5G_UNKNOWN)
H5TRACE3("Go", "iRt*x", id, ref_type, ref);
/* Check args */
diff --git a/src/H5S.c b/src/H5S.c
index 21029ef..59f3085 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -75,7 +75,7 @@ H5S_init_interface(void)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT
/* Initialize the atom group for the file IDs */
if(H5I_register_type(H5I_DATASPACE, (size_t)H5I_DATASPACEID_HASHSIZE, H5S_RESERVED_ATOMS, (H5I_free_t)H5S_close) < 0)
@@ -117,7 +117,7 @@ H5S_term_interface(void)
{
int n = 0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(H5_interface_initialize_g) {
if((n = H5I_nmembers(H5I_DATASPACE))) {
@@ -161,7 +161,7 @@ H5S_create(H5S_class_t type)
H5S_t *new_ds = NULL; /* New dataspace created */
H5S_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5S_create, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Create a new dataspace */
if(NULL == (new_ds = H5FL_MALLOC(H5S_t)))
@@ -239,7 +239,7 @@ H5Screate(H5S_class_t type)
H5S_t *new_ds=NULL; /* New dataspace structure */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Screate, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "Sc", type);
/* Check args */
@@ -282,7 +282,7 @@ H5S_extent_release(H5S_extent_t *extent)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5S_extent_release, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
assert(extent);
@@ -316,7 +316,7 @@ H5S_close(H5S_t *ds)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5S_close, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(ds);
@@ -357,7 +357,7 @@ H5Sclose(hid_t space_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Sclose, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", space_id);
/* Check args */
@@ -396,7 +396,7 @@ H5Scopy(hid_t space_id)
H5S_t *dst = NULL;
hid_t ret_value;
- FUNC_ENTER_API(H5Scopy, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", space_id);
/* Check args */
@@ -442,7 +442,7 @@ H5Sextent_copy(hid_t dst_id,hid_t src_id)
H5S_t *dst;
hid_t ret_value = SUCCEED;
- FUNC_ENTER_API(H5Sextent_copy, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "ii", dst_id, src_id);
/* Check args */
@@ -480,7 +480,7 @@ H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src, hbool_t copy_max)
unsigned u;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5S_extent_copy, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Copy the regular fields */
dst->type = src->type;
@@ -553,7 +553,7 @@ H5S_copy(const H5S_t *src, hbool_t share_selection, hbool_t copy_max)
H5S_t *dst = NULL;
H5S_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5S_copy, NULL)
+ FUNC_ENTER_NOAPI(NULL)
if(NULL == (dst = H5FL_MALLOC(H5S_t)))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
@@ -604,7 +604,7 @@ H5S_get_simple_extent_npoints(const H5S_t *ds)
{
hssize_t ret_value;
- FUNC_ENTER_NOAPI(H5S_get_simple_extent_npoints, -1)
+ FUNC_ENTER_NOAPI(-1)
/* check args */
HDassert(ds);
@@ -640,7 +640,7 @@ H5Sget_simple_extent_npoints(hid_t space_id)
H5S_t *ds;
hssize_t ret_value;
- FUNC_ENTER_API(H5Sget_simple_extent_npoints, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Hs", "i", space_id);
/* Check args */
@@ -681,7 +681,7 @@ H5S_get_npoints_max(const H5S_t *ds)
hsize_t ret_value;
unsigned u;
- FUNC_ENTER_NOAPI(H5S_get_npoints_max, 0)
+ FUNC_ENTER_NOAPI(0)
/* check args */
assert(ds);
@@ -744,7 +744,7 @@ H5Sget_simple_extent_ndims(hid_t space_id)
H5S_t *ds;
int ret_value;
- FUNC_ENTER_API(H5Sget_simple_extent_ndims, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Is", "i", space_id);
/* Check args */
@@ -784,7 +784,7 @@ H5S_get_simple_extent_ndims(const H5S_t *ds)
{
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5S_get_simple_extent_ndims, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(ds);
@@ -835,7 +835,7 @@ H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[]/*out*/,
H5S_t *ds;
int ret_value;
- FUNC_ENTER_API(H5Sget_simple_extent_dims, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("Is", "ixx", space_id, dims, maxdims);
/* Check args */
@@ -869,7 +869,7 @@ H5S_extent_get_dims(const H5S_extent_t *ext, hsize_t dims[], hsize_t max_dims[])
int i; /* Local index variable */
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5S_extent_get_dims, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(ext);
@@ -926,7 +926,7 @@ H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[], hsize_t max_dims[])
{
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5S_get_simple_extent_dims, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(ds);
@@ -958,7 +958,7 @@ H5S_write(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned update_flags, H5S_t *ds)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5S_write, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(oh);
@@ -999,7 +999,7 @@ H5S_append(H5F_t *f, hid_t dxpl_id, H5O_t *oh, H5S_t *ds)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5S_append, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(oh);
@@ -1035,7 +1035,7 @@ H5S_read(const H5O_loc_t *loc, hid_t dxpl_id)
H5S_t *ds = NULL; /* Dataspace to return */
H5S_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5S_read, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(loc);
@@ -1082,7 +1082,7 @@ H5S_is_simple(const H5S_t *sdim)
{
htri_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_is_simple)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args and all the boring stuff. */
HDassert(sdim);
@@ -1115,7 +1115,7 @@ H5Sis_simple(hid_t space_id)
H5S_t *space; /* dataspace to modify */
htri_t ret_value;
- FUNC_ENTER_API(H5Sis_simple, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("t", "i", space_id);
/* Check args and all the boring stuff. */
@@ -1172,7 +1172,7 @@ H5Sset_extent_simple(hid_t space_id, int rank, const hsize_t dims[/*rank*/],
int u; /* local counting variable */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Sset_extent_simple, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "iIs*[a1]h*[a1]h", space_id, rank, dims, max);
/* Check args */
@@ -1228,7 +1228,7 @@ H5S_set_extent_simple(H5S_t *space, unsigned rank, const hsize_t *dims,
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_set_extent_simple)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(rank <= H5S_MAX_RANK);
@@ -1321,7 +1321,7 @@ H5Screate_simple(int rank, const hsize_t dims[/*rank*/],
int i;
hid_t ret_value;
- FUNC_ENTER_API(H5Screate_simple, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("i", "Is*[a0]h*[a0]h", rank, dims, maxdims);
/* Check arguments */
@@ -1387,7 +1387,7 @@ H5S_create_simple(unsigned rank, const hsize_t dims[/*rank*/],
{
H5S_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5S_create_simple, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Check arguments */
assert(rank <=H5S_MAX_RANK);
@@ -1427,7 +1427,7 @@ H5Sencode(hid_t obj_id, void *buf, size_t *nalloc)
H5S_t *dspace;
herr_t ret_value=SUCCEED;
- FUNC_ENTER_API (H5Sencode, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*x*z", obj_id, buf, nalloc);
/* Check argument and retrieve object */
@@ -1467,7 +1467,7 @@ H5S_encode(H5S_t *obj, unsigned char *buf, size_t *nalloc)
H5F_t *f = NULL; /* Fake file structure*/
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5S_encode)
+ FUNC_ENTER_NOAPI_NOINIT
/* Allocate "fake" file structure */
if(NULL == (f = H5F_fake_alloc((uint8_t)0)))
@@ -1540,7 +1540,7 @@ H5Sdecode(const void *buf)
H5S_t *ds;
hid_t ret_value;
- FUNC_ENTER_API (H5Sdecode, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "*x", buf);
if(buf == NULL)
@@ -1584,7 +1584,7 @@ H5S_decode(const unsigned char *buf)
uint8_t sizeof_size; /* 'Size of sizes' for file */
H5S_t *ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5S_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* Decode the type of the information */
if(*buf++ != H5O_SDSPACE_ID)
@@ -1666,7 +1666,7 @@ H5S_get_simple_extent_type(const H5S_t *space)
{
H5S_class_t ret_value;
- FUNC_ENTER_NOAPI(H5S_get_simple_extent_type, H5S_NO_CLASS)
+ FUNC_ENTER_NOAPI(H5S_NO_CLASS)
assert(space);
@@ -1701,7 +1701,7 @@ H5Sget_simple_extent_type(hid_t sid)
H5S_t *space;
H5S_class_t ret_value;
- FUNC_ENTER_API(H5Sget_simple_extent_type, H5S_NO_CLASS)
+ FUNC_ENTER_API(H5S_NO_CLASS)
H5TRACE1("Sc", "i", sid);
/* Check arguments */
@@ -1735,7 +1735,7 @@ H5Sset_extent_none(hid_t space_id)
H5S_t *space; /* dataspace to modify */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Sset_extent_none, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", space_id);
/* Check args */
@@ -1775,7 +1775,7 @@ H5Soffset_simple(hid_t space_id, const hssize_t *offset)
H5S_t *space; /* dataspace to modify */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Soffset_simple, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*Hs", space_id, offset);
/* Check args */
@@ -1815,7 +1815,7 @@ H5S_set_extent(H5S_t *space, const hsize_t *size)
unsigned u; /* Local index variable */
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI(H5S_set_extent, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(space && H5S_SIMPLE == H5S_GET_EXTENT_TYPE(space));
@@ -1864,7 +1864,7 @@ H5S_has_extent(const H5S_t *ds)
{
hbool_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_has_extent)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(ds);
@@ -1897,7 +1897,7 @@ H5S_set_extent_real(H5S_t *space, const hsize_t *size)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5S_set_extent_real, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(space && H5S_SIMPLE == H5S_GET_EXTENT_TYPE(space));
@@ -1944,7 +1944,7 @@ H5Sextent_equal(hid_t space1_id, hid_t space2_id)
const H5S_t *ds1, *ds2; /* Dataspaces to compare */
htri_t ret_value;
- FUNC_ENTER_API(H5Sextent_equal, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("t", "ii", space1_id, space2_id);
/* check args */
@@ -1980,7 +1980,7 @@ H5S_extent_equal(const H5S_t *ds1, const H5S_t *ds2)
unsigned u; /* Local index variable */
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_extent_equal)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(ds1);
@@ -2038,7 +2038,7 @@ done:
hsize_t
H5S_extent_nelem(const H5S_extent_t *ext)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_extent_nelem)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
HDassert(ext);
@@ -2063,9 +2063,7 @@ H5S_extent_nelem(const H5S_extent_t *ext)
herr_t
H5S_set_latest_version(H5S_t *ds)
{
- herr_t ret_value = SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5S_set_latest_version, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ds);
@@ -2073,8 +2071,7 @@ H5S_set_latest_version(H5S_t *ds)
/* Set encoding of extent to latest version */
ds->extent.version = H5O_SDSPACE_VERSION_LATEST;
-done:
- FUNC_LEAVE_NOAPI(ret_value)
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5S_set_latest_version() */
#ifndef H5_NO_DEPRECATED_SYMBOLS
@@ -2099,7 +2096,7 @@ H5S_extend(H5S_t *space, const hsize_t *size)
unsigned u;
int ret_value = 0;
- FUNC_ENTER_NOAPI(H5S_extend, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(space && H5S_SIMPLE == H5S_GET_EXTENT_TYPE(space));
diff --git a/src/H5SL.c b/src/H5SL.c
index b34d300..b6c9f8e 100644
--- a/src/H5SL.c
+++ b/src/H5SL.c
@@ -545,7 +545,7 @@ static size_t H5SL_fac_nalloc_g;
static herr_t
H5SL_init_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Allocate space for array of factories */
H5SL_fac_g = (H5FL_fac_head_t **)H5MM_malloc(sizeof(H5FL_fac_head_t *));
@@ -586,7 +586,7 @@ H5SL_new_node(void *item, const void *key, uint32_t hashval)
{
H5SL_node_t *ret_value; /* New skip list node */
- FUNC_ENTER_NOAPI_NOINIT(H5SL_new_node)
+ FUNC_ENTER_NOAPI_NOINIT
/* Allocate the node */
if(NULL == (ret_value = (H5SL_node_t *)H5FL_MALLOC(H5SL_node_t)))
@@ -637,7 +637,7 @@ H5SL_insert_common(H5SL_t *slist, void *item, const void *key)
uint32_t hashval = 0; /* Hash value for key */
H5SL_node_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SL_insert_common);
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(slist);
@@ -717,7 +717,7 @@ H5SL_insert_common(H5SL_t *slist, void *item, const void *key)
ret_value=x;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5SL_insert_common() */
@@ -751,7 +751,7 @@ H5SL_release_common(H5SL_t *slist, H5SL_operator_t op, void *op_data)
H5SL_node_t *node, *next_node; /* Pointers to skip list nodes */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5SL_release_common);
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
assert(slist);
@@ -790,7 +790,7 @@ H5SL_release_common(H5SL_t *slist, H5SL_operator_t op, void *op_data)
slist->nobjs=0;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5SL_release_common() */
@@ -822,7 +822,7 @@ H5SL_close_common(H5SL_t *slist, H5SL_operator_t op, void *op_data)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5SL_close_common)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(slist);
@@ -870,7 +870,7 @@ H5SL_create(H5SL_type_t type, H5SL_cmp_t cmp)
H5SL_node_t *header; /* Pointer to skip list header node */
H5SL_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5SL_create,NULL);
+ FUNC_ENTER_NOAPI(NULL)
/* Check args */
HDassert(type>=H5SL_TYPE_INT && type<=H5SL_TYPE_GENERIC);
@@ -937,7 +937,7 @@ done:
size_t
H5SL_count(H5SL_t *slist)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_count);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(slist);
@@ -945,7 +945,7 @@ H5SL_count(H5SL_t *slist)
/* Check internal consistency */
/* (Pre-condition) */
- FUNC_LEAVE_NOAPI(slist->nobjs);
+ FUNC_LEAVE_NOAPI(slist->nobjs)
} /* end H5SL_count() */
@@ -975,7 +975,7 @@ H5SL_insert(H5SL_t *slist, void *item, const void *key)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SL_insert);
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
assert(slist);
@@ -989,7 +989,7 @@ H5SL_insert(H5SL_t *slist, void *item, const void *key)
HGOTO_ERROR(H5E_SLIST,H5E_CANTINSERT,FAIL,"can't create new skip list node")
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5SL_insert() */
@@ -1022,7 +1022,7 @@ H5SL_add(H5SL_t *slist, void *item, const void *key)
{
H5SL_node_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SL_add);
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
assert(slist);
@@ -1036,7 +1036,7 @@ H5SL_add(H5SL_t *slist, void *item, const void *key)
HGOTO_ERROR(H5E_SLIST,H5E_CANTINSERT,NULL,"can't create new skip list node")
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5SL_add() */
@@ -1066,7 +1066,7 @@ H5SL_remove(H5SL_t *slist, const void *key)
uint32_t hashval = 0; /* Hash value for key */
void *ret_value = NULL; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SL_remove)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(slist);
@@ -1151,7 +1151,7 @@ H5SL_remove_first(H5SL_t *slist)
size_t level = slist->curr_level; /* Skip list level */
size_t i; /* Index */
- FUNC_ENTER_NOAPI_NOINIT(H5SL_remove_first)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(slist);
@@ -1249,7 +1249,7 @@ H5SL_search(H5SL_t *slist, const void *key)
uint32_t hashval = 0; /* Hash value for key */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_search);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(slist);
@@ -1305,7 +1305,7 @@ H5SL_search(H5SL_t *slist, const void *key)
ret_value=NULL;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5SL_search() */
@@ -1338,7 +1338,7 @@ H5SL_less(H5SL_t *slist, const void *key)
uint32_t hashval = 0; /* Hash value for key */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_less);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(slist);
@@ -1407,7 +1407,7 @@ H5SL_less(H5SL_t *slist, const void *key)
} /* end else */
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5SL_less() */
@@ -1440,7 +1440,7 @@ H5SL_greater(H5SL_t *slist, const void *key)
uint32_t hashval = 0; /* Hash value for key */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_greater);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(slist);
@@ -1500,7 +1500,7 @@ H5SL_greater(H5SL_t *slist, const void *key)
ret_value = NULL;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5SL_greater() */
@@ -1532,7 +1532,7 @@ H5SL_find(H5SL_t *slist, const void *key)
uint32_t hashval = 0; /* Hash value for key */
H5SL_node_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_find);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(slist);
@@ -1588,7 +1588,7 @@ H5SL_find(H5SL_t *slist, const void *key)
ret_value=NULL;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5SL_find() */
@@ -1621,7 +1621,7 @@ H5SL_below(H5SL_t *slist, const void *key)
uint32_t hashval = 0; /* Hash value for key */
H5SL_node_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_below)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(slist);
@@ -1720,7 +1720,7 @@ H5SL_above(H5SL_t *slist, const void *key)
uint32_t hashval = 0; /* Hash value for key */
H5SL_node_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_above)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(slist);
@@ -1803,7 +1803,7 @@ done:
H5SL_node_t *
H5SL_first(H5SL_t *slist)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_first);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(slist);
@@ -1811,7 +1811,7 @@ H5SL_first(H5SL_t *slist)
/* Check internal consistency */
/* (Pre-condition) */
- FUNC_LEAVE_NOAPI(slist->header->forward[0]);
+ FUNC_LEAVE_NOAPI(slist->header->forward[0])
} /* end H5SL_first() */
@@ -1837,7 +1837,7 @@ H5SL_first(H5SL_t *slist)
H5SL_node_t *
H5SL_next(H5SL_node_t *slist_node)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_next);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(slist_node);
@@ -1845,7 +1845,7 @@ H5SL_next(H5SL_node_t *slist_node)
/* Check internal consistency */
/* (Pre-condition) */
- FUNC_LEAVE_NOAPI(slist_node->forward[0]);
+ FUNC_LEAVE_NOAPI(slist_node->forward[0])
} /* end H5SL_next() */
@@ -1871,7 +1871,7 @@ H5SL_next(H5SL_node_t *slist_node)
H5SL_node_t *
H5SL_prev(H5SL_node_t *slist_node)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_prev);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(slist_node);
@@ -1880,7 +1880,7 @@ H5SL_prev(H5SL_node_t *slist_node)
/* (Pre-condition) */
/* Walk backward, detecting the header node (which has it's key set to NULL) */
- FUNC_LEAVE_NOAPI(slist_node->backward->key==NULL ? NULL : slist_node->backward);
+ FUNC_LEAVE_NOAPI(slist_node->backward->key==NULL ? NULL : slist_node->backward)
} /* end H5SL_prev() */
@@ -1906,7 +1906,7 @@ H5SL_prev(H5SL_node_t *slist_node)
H5SL_node_t *
H5SL_last(H5SL_t *slist)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_last);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(slist);
@@ -1915,7 +1915,7 @@ H5SL_last(H5SL_t *slist)
/* (Pre-condition) */
/* Find last node, avoiding the header node */
- FUNC_LEAVE_NOAPI(slist->last==slist->header ? NULL : slist->last);
+ FUNC_LEAVE_NOAPI(slist->last==slist->header ? NULL : slist->last)
} /* end H5SL_last() */
@@ -1940,7 +1940,7 @@ H5SL_last(H5SL_t *slist)
void *
H5SL_item(H5SL_node_t *slist_node)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_item);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(slist_node);
@@ -1948,7 +1948,7 @@ H5SL_item(H5SL_node_t *slist_node)
/* Check internal consistency */
/* (Pre-condition) */
- FUNC_LEAVE_NOAPI(slist_node->item);
+ FUNC_LEAVE_NOAPI(slist_node->item)
} /* end H5SL_item() */
@@ -1991,7 +1991,7 @@ H5SL_iterate(H5SL_t *slist, H5SL_operator_t op, void *op_data)
H5SL_node_t *node; /* Pointers to skip list nodes */
herr_t ret_value = 0; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_iterate)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(slist);
@@ -2037,7 +2037,7 @@ H5SL_iterate(H5SL_t *slist, H5SL_operator_t op, void *op_data)
herr_t
H5SL_release(H5SL_t *slist)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_release);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(slist);
@@ -2048,7 +2048,7 @@ H5SL_release(H5SL_t *slist)
/* Free skip list nodes */
H5SL_release_common(slist,NULL,NULL); /* always succeeds */
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5SL_release() */
@@ -2083,7 +2083,7 @@ H5SL_release(H5SL_t *slist)
herr_t
H5SL_free(H5SL_t *slist, H5SL_operator_t op, void *op_data)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_free);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(slist);
@@ -2094,7 +2094,7 @@ H5SL_free(H5SL_t *slist, H5SL_operator_t op, void *op_data)
/* Free skip list nodes */
H5SL_release_common(slist,op,op_data); /* always succeeds */
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5SL_free() */
@@ -2129,7 +2129,7 @@ H5SL_destroy(H5SL_t *slist, H5SL_operator_t op, void *op_data)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_destroy);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(slist);
@@ -2140,7 +2140,7 @@ H5SL_destroy(H5SL_t *slist, H5SL_operator_t op, void *op_data)
/* Close skip list */
(void)H5SL_close_common(slist,op,op_data); /* always succeeds */
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5SL_destroy() */
@@ -2166,7 +2166,7 @@ H5SL_destroy(H5SL_t *slist, H5SL_operator_t op, void *op_data)
herr_t
H5SL_close(H5SL_t *slist)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_close);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(slist);
@@ -2177,7 +2177,7 @@ H5SL_close(H5SL_t *slist)
/* Close skip list */
(void)H5SL_close_common(slist,NULL,NULL); /* always succeeds */
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5SL_close() */
@@ -2206,7 +2206,7 @@ int H5SL_term_interface(void)
herr_t ret;
int n = H5_interface_initialize_g ? 1 : 0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SL_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(n) {
/* Terminate all the factories */
@@ -2224,6 +2224,6 @@ int H5SL_term_interface(void)
H5_interface_initialize_g = 0;
} /* end if */
- FUNC_LEAVE_NOAPI(n);
+ FUNC_LEAVE_NOAPI(n)
} /* H5SL_term_interface() */
diff --git a/src/H5SM.c b/src/H5SM.c
index 468ce55..2fcaf7a 100755
--- a/src/H5SM.c
+++ b/src/H5SM.c
@@ -130,7 +130,7 @@ H5SM_init(H5F_t *f, H5P_genplist_t * fc_plist, const H5O_loc_t *ext_loc, hid_t d
unsigned x; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5SM_init, NULL)
+ FUNC_ENTER_NOAPI(NULL)
HDassert(f);
/* File should not already have a SOHM table */
@@ -256,7 +256,7 @@ H5SM_type_to_flag(unsigned type_id, unsigned *type_flag)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_type_to_flag)
+ FUNC_ENTER_NOAPI_NOINIT
/* Translate the H5O type_id into an H5SM type flag */
switch(type_id) {
@@ -304,7 +304,7 @@ H5SM_get_index(const H5SM_master_table_t *table, unsigned type_id)
unsigned type_flag;
ssize_t ret_value = FAIL;
- FUNC_ENTER_NOAPI_NOINIT(H5SM_get_index)
+ FUNC_ENTER_NOAPI_NOINIT
/* Translate the H5O type_id into an H5SM type flag */
if(H5SM_type_to_flag(type_id, &type_flag) < 0)
@@ -345,7 +345,7 @@ H5SM_type_shared(H5F_t *f, unsigned type_id, hid_t dxpl_id)
size_t u; /* Local index variable */
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_type_shared)
+ FUNC_ENTER_NOAPI_NOINIT
/* Translate the H5O type_id into an H5SM type flag */
if(H5SM_type_to_flag(type_id, &type_flag) < 0)
@@ -402,7 +402,7 @@ H5SM_get_fheap_addr(H5F_t *f, hid_t dxpl_id, unsigned type_id, haddr_t *fheap_ad
ssize_t index_num; /* Which index */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5SM_get_fheap_addr, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
HDassert(f);
@@ -451,7 +451,7 @@ H5SM_create_index(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id)
H5B2_t *bt2 = NULL; /* v2 B-tree handle for index */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5SM_create_index)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(header);
@@ -556,7 +556,7 @@ H5SM_delete_index(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_delete_index)
+ FUNC_ENTER_NOAPI_NOINIT
/* Determine whether index is a list or a B-tree. */
if(header->index_type == H5SM_LIST) {
@@ -629,7 +629,7 @@ H5SM_create_list(H5F_t *f, H5SM_index_header_t *header, hid_t dxpl_id)
haddr_t addr = HADDR_UNDEF; /* Address of the list on disk */
haddr_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5SM_create_list)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(f);
HDassert(header);
@@ -710,7 +710,7 @@ H5SM_convert_list_to_btree(H5F_t *f, H5SM_index_header_t *header,
void * encoding_buf = NULL;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_convert_list_to_btree)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(_list && *_list);
HDassert(header);
@@ -812,7 +812,7 @@ H5SM_convert_btree_to_list(H5F_t * f, H5SM_index_header_t * header, hid_t dxpl_i
haddr_t btree_addr;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5SM_convert_btree_to_list)
+ FUNC_ENTER_NOAPI_NOINIT
/* Remember the address of the old B-tree, but change the header over to be
* a list..
@@ -872,7 +872,7 @@ H5SM_can_share_common(const H5F_t *f, unsigned type_id, const void *mesg)
{
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_can_share_common)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check whether this message ought to be shared or not */
/* If sharing is disabled in this file, don't share the message */
@@ -921,7 +921,7 @@ H5SM_can_share(H5F_t *f, hid_t dxpl_id, H5SM_master_table_t *table,
htri_t tri_ret;
htri_t ret_value = TRUE;
- FUNC_ENTER_NOAPI(H5SM_can_share, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* "trivial" sharing checks */
if((tri_ret = H5SM_can_share_common(f, type_id, mesg)) < 0)
@@ -1044,7 +1044,7 @@ H5SM_try_share(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, unsigned defer_flags,
#endif
htri_t ret_value = TRUE;
- FUNC_ENTER_NOAPI(H5SM_try_share, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* If we previously deferred this operation, the saved message type should
* be the same as the one we get here. In debug mode, we make sure this
@@ -1150,7 +1150,7 @@ H5SM_incr_ref(void *record, void *_op_data, hbool_t *changed)
H5SM_incr_ref_opdata *op_data = (H5SM_incr_ref_opdata *) _op_data;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5SM_incr_ref)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(record);
HDassert(op_data);
@@ -1236,7 +1236,7 @@ H5SM_write_mesg(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
size_t empty_pos = UFAIL; /* Empty entry in list */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5SM_write_mesg)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(header);
@@ -1516,7 +1516,7 @@ H5SM_delete(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh, H5O_shared_t *sh_mesg)
unsigned type_id; /* Message type ID to operate on */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5SM_delete, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(H5F_addr_defined(H5F_SOHM_ADDR(f)));
@@ -1604,7 +1604,7 @@ H5SM_find_in_list(const H5SM_list_t *list, const H5SM_mesg_key_t *key, size_t *e
size_t x;
size_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_find_in_list)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(list);
/* Both key and empty_pos can be NULL, but not both! */
@@ -1657,7 +1657,7 @@ H5SM_get_hash_fh_cb(const void *obj, size_t obj_len, void *_udata)
{
H5SM_fh_ud_gh_t *udata = (H5SM_fh_ud_gh_t *)_udata; /* User data for fractal heap 'op' callback */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_get_hash_fh_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Compute hash value on raw message */
udata->hash = H5_checksum_lookup3(obj, obj_len, udata->type_id);
@@ -1690,7 +1690,7 @@ H5SM_decr_ref(void *record, void *op_data, hbool_t *changed)
{
H5SM_sohm_t *message = (H5SM_sohm_t *) record;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_decr_ref)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(record);
HDassert(op_data);
@@ -1745,7 +1745,7 @@ H5SM_delete_from_index(H5F_t *f, hid_t dxpl_id, H5O_t *open_oh,
unsigned type_id; /* Message type to operate on */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5SM_delete_from_index)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -1932,7 +1932,7 @@ H5SM_get_info(const H5O_loc_t *ext_loc, H5P_genplist_t *fc_plist, hid_t dxpl_id)
htri_t status; /* Status for message existing */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5SM_get_info, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(ext_loc);
@@ -2044,7 +2044,7 @@ herr_t
H5SM_reconstitute(H5O_shared_t *sh_mesg, H5F_t *f, unsigned msg_type_id,
H5O_fheap_id_t heap_id)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_reconstitute)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check args */
HDassert(sh_mesg);
@@ -2077,7 +2077,7 @@ H5SM_get_refcount_bt2_cb(const void *_record, void *_op_data)
const H5SM_sohm_t *record = (const H5SM_sohm_t *)_record; /* v2 B-tree record for message */
H5SM_sohm_t *op_data = (H5SM_sohm_t *)_op_data; /* "op data" from v2 B-tree find */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_get_refcount_bt2_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
@@ -2121,7 +2121,7 @@ H5SM_get_refcount(H5F_t *f, hid_t dxpl_id, unsigned type_id,
void * encoding_buf = NULL; /* Buffer for encoded message */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_get_refcount)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -2248,7 +2248,7 @@ H5SM_read_iter_op(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, unsigned sequence,
H5SM_read_udata_t *udata = (H5SM_read_udata_t *) _udata;
herr_t ret_value = H5_ITER_CONT;
- FUNC_ENTER_NOAPI_NOINIT(H5SM_read_iter_op)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -2305,7 +2305,7 @@ H5SM_read_mesg_fh_cb(const void *obj, size_t obj_len, void *_udata)
H5SM_read_udata_t *udata = (H5SM_read_udata_t *)_udata;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5SM_read_mesg_fh_cb)
+ FUNC_ENTER_NOAPI_NOINIT
/* Allocate a buffer to hold the message */
if(NULL == (udata->encoding_buf = H5MM_malloc(obj_len)))
@@ -2343,7 +2343,7 @@ H5SM_read_mesg(H5F_t *f, const H5SM_sohm_t *mesg, H5HF_t *fheap,
H5O_t *oh = NULL; /* Object header for message in object header */
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5SM_read_mesg)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(f);
HDassert(mesg);
@@ -2436,7 +2436,7 @@ done:
herr_t
H5SM_table_free(H5SM_master_table_t *table)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_table_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(table);
@@ -2465,7 +2465,7 @@ H5SM_table_free(H5SM_master_table_t *table)
herr_t
H5SM_list_free(H5SM_list_t *list)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_list_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(list);
HDassert(list->messages);
@@ -2503,7 +2503,7 @@ H5SM_table_debug(H5F_t *f, hid_t dxpl_id, haddr_t table_addr,
unsigned x; /* Counter variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5SM_table_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(table_addr != HADDR_UNDEF);
@@ -2594,7 +2594,7 @@ H5SM_list_debug(H5F_t *f, hid_t dxpl_id, haddr_t list_addr,
unsigned x; /* Counter variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5SM_list_debug, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(f);
HDassert(list_addr != HADDR_UNDEF);
@@ -2684,7 +2684,7 @@ H5SM_ih_size(H5F_t *f, hid_t dxpl_id, H5F_info_t *finfo)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5SM_ih_size, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(f);
diff --git a/src/H5SMbtree2.c b/src/H5SMbtree2.c
index 156a6c5..daa1e4f 100755
--- a/src/H5SMbtree2.c
+++ b/src/H5SMbtree2.c
@@ -102,7 +102,7 @@ H5SM_bt2_crt_context(void *_f)
H5SM_bt2_ctx_t *ctx; /* Callback context structure */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_bt2_crt_context)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -140,7 +140,7 @@ H5SM_bt2_dst_context(void *_ctx)
{
H5SM_bt2_ctx_t *ctx = (H5SM_bt2_ctx_t *)_ctx; /* Callback context structure */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_bt2_dst_context)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@@ -172,7 +172,7 @@ H5SM_bt2_store(void *native, const void *udata)
{
const H5SM_mesg_key_t *key = (const H5SM_mesg_key_t *)udata;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_bt2_store)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Copy the source message to the B-tree */
*(H5SM_sohm_t *)native = key->message;
@@ -200,7 +200,7 @@ H5SM_bt2_debug(FILE *stream, const H5F_t UNUSED *f, hid_t UNUSED dxpl_id,
{
const H5SM_sohm_t *sohm = (const H5SM_sohm_t *)record;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_bt2_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(sohm->location == H5SM_IN_HEAP)
HDfprintf(stream, "%*s%-*s {%a, %lo, %Hx}\n", indent, "", fwidth,
@@ -236,7 +236,7 @@ H5SM_bt2_crt_dbg_context(H5F_t *f, hid_t UNUSED dxpl_id, haddr_t UNUSED addr)
H5SM_bt2_ctx_t *ctx; /* Callback context structure */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_bt2_crt_dbg_context)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
@@ -279,7 +279,7 @@ H5SM_bt2_convert_to_list_op(const void * record, void *op_data)
const H5SM_list_t *list = (const H5SM_list_t *)op_data;
size_t mesg_idx; /* Index of message to modify */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_bt2_convert_to_list_op)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity checks */
HDassert(record);
diff --git a/src/H5SMcache.c b/src/H5SMcache.c
index 1dfbaab..d89af73 100644
--- a/src/H5SMcache.c
+++ b/src/H5SMcache.c
@@ -125,7 +125,7 @@ H5SM_table_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void UNUSED *udata)
size_t x; /* Counter variable for index headers */
H5SM_master_table_t *ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5SM_table_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* Verify that we're reading version 0 of the table; this is the only
* version defined so far.
@@ -254,7 +254,7 @@ H5SM_table_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5SM_ma
uint8_t tbl_buf[H5SM_TBL_BUF_SIZE]; /* Buffer for table */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_table_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -359,7 +359,7 @@ H5SM_table_dest(H5F_t UNUSED *f, H5SM_master_table_t* table)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_table_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(table);
@@ -391,7 +391,7 @@ H5SM_table_clear(H5F_t *f, H5SM_master_table_t *table, hbool_t destroy)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_table_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -425,7 +425,7 @@ done:
static herr_t
H5SM_table_size(const H5F_t UNUSED *f, const H5SM_master_table_t *table, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_table_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(f);
@@ -466,7 +466,7 @@ H5SM_list_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata)
size_t x; /* Counter variable for messages in list */
H5SM_list_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_list_load)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(udata->header);
@@ -563,7 +563,7 @@ H5SM_list_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5SM_lis
uint8_t lst_buf[H5SM_LST_BUF_SIZE]; /* Buffer for list index */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_list_flush)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
HDassert(f);
@@ -653,7 +653,7 @@ H5SM_list_dest(H5F_t *f, H5SM_list_t* list)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_list_dest)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(list);
@@ -697,7 +697,7 @@ H5SM_list_clear(H5F_t *f, H5SM_list_t *list, hbool_t destroy)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_list_clear)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -731,7 +731,7 @@ done:
static herr_t
H5SM_list_size(const H5F_t UNUSED *f, const H5SM_list_t *list, size_t *size_ptr)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_list_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check arguments */
HDassert(f);
diff --git a/src/H5SMmessage.c b/src/H5SMmessage.c
index b3dbeb3..6a45985 100644
--- a/src/H5SMmessage.c
+++ b/src/H5SMmessage.c
@@ -92,7 +92,7 @@ H5SM_compare_cb(const void *obj, size_t obj_len, void *_udata)
{
H5SM_compare_udata_t *udata = (H5SM_compare_udata_t *)_udata;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_compare_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* If the encoding sizes are different, it's not the same object */
if(udata->key->encoding_size > obj_len)
@@ -134,7 +134,7 @@ H5SM_compare_iter_op(H5O_t *oh, H5O_mesg_t *mesg/*in,out*/, unsigned sequence,
H5SM_compare_udata_t *udata = (H5SM_compare_udata_t *) _udata;
herr_t ret_value = H5_ITER_CONT;
- FUNC_ENTER_NOAPI_NOINIT(H5SM_compare_iter_op)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
@@ -196,7 +196,7 @@ H5SM_message_compare(const void *rec1, const void *rec2)
const H5SM_sohm_t *mesg = (const H5SM_sohm_t *) rec2;
herr_t ret_value = 0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_message_compare)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* If the key has an fheap ID, we're looking for a message that's
* already in the index; if the fheap ID matches, we've found the message
@@ -295,7 +295,7 @@ H5SM_message_encode(uint8_t *raw, const void *_nrecord, void *_ctx)
H5SM_bt2_ctx_t *ctx = (H5SM_bt2_ctx_t *)_ctx; /* Callback context structure */
const H5SM_sohm_t *message = (const H5SM_sohm_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_message_encode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(ctx);
@@ -339,7 +339,7 @@ H5SM_message_decode(const uint8_t *raw, void *_nrecord, void *_ctx)
H5SM_bt2_ctx_t *ctx = (H5SM_bt2_ctx_t *)_ctx; /* Callback context structure */
H5SM_sohm_t *message = (H5SM_sohm_t *)_nrecord;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5SM_message_decode)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
message->location = (H5SM_storage_loc_t)*raw++;
UINT32DECODE(raw, message->hash);
diff --git a/src/H5SMtest.c b/src/H5SMtest.c
index d754f62..d10f8a2 100644
--- a/src/H5SMtest.c
+++ b/src/H5SMtest.c
@@ -82,7 +82,7 @@ H5SM_get_mesg_count_test(H5F_t *f, hid_t dxpl_id, unsigned type_id,
H5SM_master_table_t *table = NULL; /* SOHM master table */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5SM_get_mesg_count_test)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(f);
diff --git a/src/H5ST.c b/src/H5ST.c
index 77e4bb4..7b61aa1 100644
--- a/src/H5ST.c
+++ b/src/H5ST.c
@@ -52,7 +52,7 @@ H5ST_create(void)
{
H5ST_tree_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5ST_create, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Allocate wrapper for TST */
if(NULL == (ret_value = H5FL_MALLOC(H5ST_tree_t)))
@@ -87,7 +87,7 @@ done:
static herr_t
H5ST_close_internal(H5ST_ptr_t p)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5ST_close_internal)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Recursively free TST */
if(p) {
@@ -125,7 +125,7 @@ H5ST_close(H5ST_tree_t *tree)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5ST_close, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check arguments */
if(NULL == tree)
@@ -172,7 +172,7 @@ H5ST_insert(H5ST_tree_t *tree, const char *s, void *obj)
H5ST_ptr_t up=NULL; /* Pointer to up node */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5ST_insert,FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
/* Find the correct location to insert object */
p = &tree->root;
@@ -247,7 +247,7 @@ H5ST_search(H5ST_tree_t *tree, const char *s)
H5ST_ptr_t p; /* Temporary pointer to TST node */
htri_t ret_value=FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5ST_search)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
p = tree->root;
while (p) {
@@ -291,7 +291,7 @@ H5ST_find_internal(H5ST_ptr_t p, const char *s)
{
H5ST_ptr_t ret_value = NULL; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5ST_find_internal)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
while (p) {
if (*s < p->splitchar)
@@ -334,7 +334,7 @@ H5ST_find(H5ST_tree_t *tree, const char *s)
{
H5ST_ptr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5ST_find, NULL)
+ FUNC_ENTER_NOAPI(NULL)
if(NULL == (ret_value = H5ST_find_internal(tree->root, s)))
HGOTO_ERROR(H5E_TST, H5E_NOTFOUND, NULL, "key not found in TST")
@@ -369,7 +369,7 @@ H5ST_locate(H5ST_tree_t *tree, const char *s)
H5ST_ptr_t node; /* Pointer to node located */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5ST_locate, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Locate the node to remove */
if(NULL == (node = H5ST_find_internal(tree->root, s)))
@@ -406,7 +406,7 @@ H5ST_findfirst_internal(H5ST_ptr_t p)
{
H5ST_ptr_t ret_value = NULL; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5ST_findfirst_internal)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
while(p) {
/* Find least node in current tree */
@@ -452,7 +452,7 @@ H5ST_findfirst(H5ST_tree_t *tree)
{
H5ST_ptr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5ST_findfirst, NULL)
+ FUNC_ENTER_NOAPI(NULL)
if(NULL == (ret_value = H5ST_findfirst_internal(tree->root)))
HGOTO_ERROR(H5E_TST,H5E_NOTFOUND,NULL,"no nodes in TST");
@@ -485,7 +485,7 @@ H5ST_getnext(H5ST_ptr_t p)
{
H5ST_ptr_t ret_value = NULL; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5ST_getnext)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* If the node to continue from has higher-valued nodes attached */
if(p->hikid) {
@@ -544,7 +544,7 @@ H5ST_findnext(H5ST_ptr_t p)
H5ST_ptr_t q; /* Temporary pointer to TST node */
H5ST_ptr_t ret_value = NULL; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5ST_findnext)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Find the next node at the current level, or go back up the tree */
do {
@@ -587,7 +587,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_NOAPI_NOINIT_NOFUNC(H5ST_delete_internal)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Find node to replace one being deleted */
if(p->lokid) {
@@ -663,7 +663,7 @@ H5ST_delete(H5ST_tree_t *tree, H5ST_ptr_t p)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5ST_delete, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if(H5ST_delete_internal(&tree->root, p) < 0)
HGOTO_ERROR(H5E_TST, H5E_CANTDELETE, FAIL, "can't delete node from TST")
@@ -698,7 +698,7 @@ H5ST_remove(H5ST_tree_t *tree, const char *s)
H5ST_ptr_t node; /* Pointer to node to remove */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5ST_remove, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Locate the node to remove */
if(NULL == (node = H5ST_find_internal(tree->root, s)))
@@ -738,7 +738,7 @@ done:
herr_t
H5ST_dump_internal(H5ST_ptr_t p)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5ST_dump_internal)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(p) {
printf("p=%p\n", p);
@@ -782,7 +782,7 @@ H5ST_dump_internal(H5ST_ptr_t p)
herr_t
H5ST_dump(H5ST_tree_t *tree)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5ST_dump, NULL)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Dump the tree */
H5ST_dump_internal(tree->root);
diff --git a/src/H5Sall.c b/src/H5Sall.c
index c98781a..c99d699 100644
--- a/src/H5Sall.c
+++ b/src/H5Sall.c
@@ -115,7 +115,7 @@ static const H5S_sel_iter_class_t H5S_sel_iter_all[1] = {{
herr_t
H5S_all_iter_init (H5S_sel_iter_t *iter, const H5S_t *space)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5S_all_iter_init);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert (space && H5S_SEL_ALL==H5S_GET_SELECT_TYPE(space));
@@ -131,7 +131,7 @@ H5S_all_iter_init (H5S_sel_iter_t *iter, const H5S_t *space)
/* Initialize type of selection iterator */
iter->type=H5S_sel_iter_all;
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5S_all_iter_init() */
@@ -155,7 +155,7 @@ H5S_all_iter_coords (const H5S_sel_iter_t *iter, hsize_t *coords)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_all_iter_coords);
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
assert (iter);
@@ -166,7 +166,7 @@ H5S_all_iter_coords (const H5S_sel_iter_t *iter, hsize_t *coords)
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTGET, FAIL, "can't retrieve coordinates");
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* H5S_all_iter_coords() */
@@ -190,7 +190,7 @@ H5S_all_iter_block (const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
{
unsigned u; /* Local index variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_all_iter_block);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert (iter);
@@ -207,7 +207,7 @@ H5S_all_iter_block (const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
end[u]=iter->dims[u]-1;
} /* end for */
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5S_all_iter_coords() */
@@ -228,12 +228,12 @@ H5S_all_iter_block (const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
static hsize_t
H5S_all_iter_nelmts (const H5S_sel_iter_t *iter)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_all_iter_nelmts);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert (iter);
- FUNC_LEAVE_NOAPI(iter->elmt_left);
+ FUNC_LEAVE_NOAPI(iter->elmt_left)
} /* H5S_all_iter_nelmts() */
@@ -257,12 +257,12 @@ 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_NOAPI_NOINIT_NOFUNC(H5S_all_iter_has_next_block);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert (iter);
- FUNC_LEAVE_NOAPI(FALSE);
+ FUNC_LEAVE_NOAPI(FALSE)
} /* H5S_all_iter_has_next_block() */
@@ -287,7 +287,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_NOAPI_NOINIT_NOFUNC(H5S_all_iter_next);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert (iter);
@@ -297,7 +297,7 @@ H5S_all_iter_next(H5S_sel_iter_t *iter, size_t nelem)
iter->u.all.elmt_offset+=nelem;
iter->u.all.byte_offset+=(nelem*iter->elmt_size);
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5S_all_iter_next() */
@@ -321,12 +321,12 @@ 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_NOAPI_NOINIT_NOFUNC(H5S_all_iter_next_block);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert (iter);
- FUNC_LEAVE_NOAPI(FAIL);
+ FUNC_LEAVE_NOAPI(FAIL)
} /* H5S_all_iter_next_block() */
@@ -350,12 +350,12 @@ 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_NOAPI_NOINIT_NOFUNC(H5S_all_iter_release);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert (iter);
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5S_all_iter_release() */
@@ -379,7 +379,7 @@ H5S_all_iter_release (H5S_sel_iter_t UNUSED * iter)
static herr_t
H5S_all_release(H5S_t *space)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_all_release)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -413,7 +413,7 @@ H5S_all_release(H5S_t *space)
static herr_t
H5S_all_copy(H5S_t *dst, const H5S_t UNUSED *src, hbool_t UNUSED share_selection)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5S_all_copy)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(src);
HDassert(dst);
@@ -448,11 +448,11 @@ H5S_all_copy(H5S_t *dst, const H5S_t UNUSED *src, hbool_t UNUSED share_selection
htri_t
H5S_all_is_valid (const H5S_t UNUSED *space)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5S_all_is_valid);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(space);
- FUNC_LEAVE_NOAPI(TRUE);
+ FUNC_LEAVE_NOAPI(TRUE)
} /* end H5S_all_is_valid() */
@@ -478,7 +478,7 @@ H5S_all_is_valid (const H5S_t UNUSED *space)
hssize_t
H5S_all_serial_size (const H5S_t UNUSED *space)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5S_all_serial_size);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(space);
@@ -486,7 +486,7 @@ H5S_all_serial_size (const H5S_t UNUSED *space)
* <type (4 bytes)> + <version (4 bytes)> + <padding (4 bytes)> +
* <length (4 bytes)> = 16 bytes
*/
- FUNC_LEAVE_NOAPI(16);
+ FUNC_LEAVE_NOAPI(16)
} /* end H5S_all_serial_size() */
@@ -512,7 +512,7 @@ H5S_all_serial_size (const H5S_t UNUSED *space)
herr_t
H5S_all_serialize (const H5S_t *space, uint8_t *buf)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5S_all_serialize);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(space);
@@ -522,7 +522,7 @@ H5S_all_serialize (const H5S_t *space, uint8_t *buf)
UINT32ENCODE(buf, (uint32_t)0); /* Store the un-used padding */
UINT32ENCODE(buf, (uint32_t)0); /* Store the additional information length */
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* H5S_all_serialize() */
@@ -550,7 +550,7 @@ H5S_all_deserialize(H5S_t *space, const uint8_t UNUSED *buf)
{
herr_t ret_value; /* return value */
- FUNC_ENTER_NOAPI(H5S_all_deserialize, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(space);
@@ -594,7 +594,7 @@ H5S_all_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
unsigned rank; /* Dataspace rank */
unsigned i; /* index variable */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_all_bounds)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
HDassert(start);
@@ -636,7 +636,7 @@ H5S_all_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
herr_t
H5S_all_offset(const H5S_t UNUSED *space, hsize_t *offset)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5S_all_offset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
HDassert(offset);
@@ -669,11 +669,11 @@ H5S_all_offset(const H5S_t UNUSED *space, hsize_t *offset)
htri_t
H5S_all_is_contiguous(const H5S_t UNUSED *space)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5S_all_is_contiguous);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(space);
- FUNC_LEAVE_NOAPI(TRUE);
+ FUNC_LEAVE_NOAPI(TRUE)
} /* H5S_all_is_contiguous() */
@@ -698,11 +698,11 @@ H5S_all_is_contiguous(const H5S_t UNUSED *space)
htri_t
H5S_all_is_single(const H5S_t UNUSED *space)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5S_all_is_single);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(space);
- FUNC_LEAVE_NOAPI(TRUE);
+ FUNC_LEAVE_NOAPI(TRUE)
} /* H5S_all_is_single() */
@@ -728,12 +728,12 @@ H5S_all_is_single(const H5S_t UNUSED *space)
htri_t
H5S_all_is_regular(const H5S_t UNUSED *space)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5S_all_is_regular);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(space);
- FUNC_LEAVE_NOAPI(TRUE);
+ FUNC_LEAVE_NOAPI(TRUE)
} /* H5S_all_is_regular() */
@@ -758,7 +758,7 @@ H5S_all_is_regular(const H5S_t UNUSED *space)
herr_t
H5S_all_adjust_u(H5S_t UNUSED *space, const hsize_t UNUSED *offset)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5S_all_adjust_u)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -784,7 +784,7 @@ H5S_all_adjust_u(H5S_t UNUSED *space, const hsize_t UNUSED *offset)
static herr_t
H5S_all_project_scalar(const H5S_t UNUSED *space, hsize_t *offset)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_all_project_scalar)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space && H5S_SEL_ALL == H5S_GET_SELECT_TYPE(space));
@@ -815,7 +815,7 @@ H5S_all_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *offse
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_all_project_simple)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(base_space && H5S_SEL_ALL == H5S_GET_SELECT_TYPE(base_space));
@@ -854,7 +854,7 @@ H5S_select_all(H5S_t *space, hbool_t rel_prev)
{
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOAPI(H5S_select_all, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(space);
@@ -898,7 +898,7 @@ H5Sselect_all(hid_t spaceid)
H5S_t *space; /* Dataspace to modify selection of */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Sselect_all, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", spaceid);
/* Check args */
@@ -952,7 +952,7 @@ H5S_all_get_seq_list(const H5S_t UNUSED *space, unsigned UNUSED flags, H5S_sel_i
{
size_t elem_used; /* The number of elements used */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_all_get_seq_list);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(space);
@@ -983,6 +983,6 @@ H5S_all_get_seq_list(const H5S_t UNUSED *space, unsigned UNUSED flags, H5S_sel_i
iter->u.all.elmt_offset+=elem_used;
iter->u.all.byte_offset+=len[0];
- FUNC_LEAVE_NOAPI(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED)
} /* end H5S_all_get_seq_list() */
diff --git a/src/H5Sdbg.c b/src/H5Sdbg.c
index 352795e..df033da 100644
--- a/src/H5Sdbg.c
+++ b/src/H5Sdbg.c
@@ -93,7 +93,7 @@ H5S_debug(H5F_t *f, hid_t dxpl_id, const void *_mesg, FILE *stream, int indent,
{
const H5S_t *mesg = (const H5S_t*)_mesg;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
switch(H5S_GET_EXTENT_TYPE(mesg)) {
case H5S_NULL:
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index 2622101..1eeb098 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -140,7 +140,7 @@ H5FL_DEFINE_STATIC(H5S_hyper_span_info_t);
static herr_t
H5S_hyper_print_spans_helper(FILE *f, struct H5S_hyper_span_t *span,unsigned depth)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_print_spans_helper)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
while(span) {
HDfprintf(f,"%s: depth=%u, span=%p, (%d, %d), nelem=%u, pstride=%u\n",FUNC,depth,span,(int)span->low,(int)span->high,(unsigned)span->nelem,(unsigned)span->pstride);
@@ -157,7 +157,7 @@ H5S_hyper_print_spans_helper(FILE *f, struct H5S_hyper_span_t *span,unsigned dep
herr_t
H5S_hyper_print_spans(FILE *f, const struct H5S_hyper_span_info_t *span_lst)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_print_spans)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(span_lst!=NULL) {
HDfprintf(f,"%s: spans=%p, count=%u, scratch=%p, head=%p\n",FUNC,span_lst,span_lst->count,span_lst->scratch,span_lst->head);
@@ -170,7 +170,7 @@ H5S_hyper_print_spans(FILE *f, const struct H5S_hyper_span_info_t *span_lst)
herr_t
H5S_space_print_spans(FILE *f, const H5S_t *space)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_space_print_spans)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
H5S_hyper_print_spans(f,space->select.sel_info.hslab->span_lst);
@@ -182,7 +182,7 @@ H5S_hyper_print_diminfo_helper(FILE *f, const char *field, unsigned ndims, const
{
unsigned u; /* Local index variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_print_diminfo_helper)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(dinfo!=NULL) {
HDfprintf(f,"%s: %s: start=[",FUNC,field);
@@ -207,7 +207,7 @@ H5S_hyper_print_diminfo_helper(FILE *f, const char *field, unsigned ndims, const
herr_t
H5S_hyper_print_diminfo(FILE *f, const H5S_t *space)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_print_diminfo)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
H5S_hyper_print_diminfo_helper(f,"opt_diminfo",space->extent.rank,space->select.sel_info.hslab->opt_diminfo);
H5S_hyper_print_diminfo_helper(f,"app_diminfo",space->extent.rank,space->select.sel_info.hslab->app_diminfo);
@@ -243,7 +243,7 @@ H5S_hyper_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
unsigned u; /* Index variable */
int i; /* Index variable */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_hyper_iter_init)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space && H5S_SEL_HYPERSLABS == H5S_GET_SELECT_TYPE(space));
@@ -428,7 +428,7 @@ H5S_hyper_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
static herr_t
H5S_hyper_iter_coords (const H5S_sel_iter_t *iter, hsize_t *coords)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_coords)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -520,7 +520,7 @@ H5S_hyper_iter_block (const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
{
unsigned u; /* Local index variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_block)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -568,7 +568,7 @@ H5S_hyper_iter_block (const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
static hsize_t
H5S_hyper_iter_nelmts (const H5S_sel_iter_t *iter)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_nelmts)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -600,7 +600,7 @@ H5S_hyper_iter_has_next_block(const H5S_sel_iter_t *iter)
unsigned u; /* Local index variable */
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_has_next_block)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -658,7 +658,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_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_next)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check for the special case of just one H5Sselect_hyperslab call made */
/* (i.e. a regular hyperslab selection */
@@ -873,7 +873,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_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_next_block)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check for the special case of just one H5Sselect_hyperslab call made */
/* (i.e. a regular hyperslab selection */
@@ -1055,7 +1055,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_NOAPI_NOINIT_NOFUNC(H5S_hyper_iter_release)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -1095,7 +1095,7 @@ H5S_hyper_new_span(hsize_t low, hsize_t high, H5S_hyper_span_info_t *down, H5S_h
{
H5S_hyper_span_t *ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_new_span)
+ FUNC_ENTER_NOAPI_NOINIT
/* Allocate a new span node */
if(NULL == (ret_value = H5FL_MALLOC(H5S_hyper_span_t)))
@@ -1143,7 +1143,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_NOAPI_NOINIT(H5S_hyper_span_precompute_helper)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(spans);
@@ -1201,7 +1201,7 @@ H5S_hyper_span_precompute(H5S_hyper_span_info_t *spans, size_t elmt_size)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_span_precompute)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(spans);
@@ -1237,7 +1237,7 @@ done:
static void
H5S_hyper_span_scratch(H5S_hyper_span_info_t *spans, void *scr_value)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_span_scratch)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(spans);
@@ -1290,7 +1290,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_NOAPI_NOINIT(H5S_hyper_copy_span_helper)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(spans);
@@ -1376,7 +1376,7 @@ H5S_hyper_copy_span(H5S_hyper_span_info_t *spans)
{
H5S_hyper_span_info_t *ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_copy_span)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(spans);
@@ -1419,7 +1419,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_NOAPI_NOINIT_NOFUNC(H5S_hyper_cmp_spans)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check for redundant comparison */
if(span_info1==span_info2)
@@ -1520,7 +1520,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_NOAPI_NOINIT(H5S_hyper_free_span_info)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(span_info);
@@ -1572,7 +1572,7 @@ H5S_hyper_free_span (H5S_hyper_span_t *span)
{
herr_t ret_value=SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_free_span)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(span);
@@ -1621,7 +1621,7 @@ H5S_hyper_copy (H5S_t *dst, const H5S_t *src, hbool_t share_selection)
const H5S_hyper_sel_t *src_hslab; /* Pointer to source hyperslab info */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_NOAPI(H5S_hyper_copy, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(src);
HDassert(dst);
@@ -1693,7 +1693,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_NOAPI_NOINIT_NOFUNC(H5S_hyper_is_valid_helper)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(spans);
HDassert(offset);
@@ -1755,7 +1755,7 @@ H5S_hyper_is_valid (const H5S_t *space)
unsigned u; /* Counter */
htri_t ret_value=TRUE; /* return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_hyper_is_valid)
+ FUNC_ENTER_NOAPI_NOERR
HDassert(space);
@@ -1816,7 +1816,7 @@ H5S_hyper_span_nblocks(H5S_hyper_span_info_t *spans)
H5S_hyper_span_t *span; /* Hyperslab span */
hsize_t ret_value = 0; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_span_nblocks)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Count the number of elements in the span tree */
if(spans != NULL) {
@@ -1860,7 +1860,7 @@ H5S_get_select_hyper_nblocks(H5S_t *space)
{
hsize_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_get_select_hyper_nblocks)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
@@ -1902,7 +1902,7 @@ H5Sget_select_hyper_nblocks(hid_t spaceid)
H5S_t *space; /* Dataspace to modify selection of */
hssize_t ret_value; /* return value */
- FUNC_ENTER_API(H5Sget_select_hyper_nblocks, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Hs", "i", spaceid);
/* Check args */
@@ -1944,7 +1944,7 @@ H5S_hyper_serial_size(const H5S_t *space)
hsize_t block_count; /* block counter for regular hyperslabs */
hssize_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_hyper_serial_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
@@ -2000,7 +2000,7 @@ H5S_hyper_serialize_helper (const H5S_hyper_span_info_t *spans, hsize_t *start,
hsize_t u; /* Index variable */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_serialize_helper)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(spans);
@@ -2084,7 +2084,7 @@ H5S_hyper_serialize (const H5S_t *space, uint8_t *buf)
unsigned ndims; /* Rank of the dataspace */
int done; /* Whether we are done with the iteration */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_hyper_serialize)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
@@ -2247,7 +2247,7 @@ H5S_hyper_deserialize (H5S_t *space, const uint8_t *buf)
unsigned i,j; /* local counting variables */
herr_t ret_value=FAIL; /* return value */
- FUNC_ENTER_NOAPI(H5S_hyper_deserialize, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(space);
@@ -2330,7 +2330,7 @@ H5S_hyper_span_blocklist(H5S_hyper_span_info_t *spans, hsize_t start[], hsize_t
hsize_t u; /* Index variable */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_span_blocklist)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(spans);
@@ -2429,7 +2429,7 @@ H5S_get_select_hyper_blocklist(H5S_t *space, hbool_t internal, hsize_t startbloc
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_get_select_hyper_blocklist)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
HDassert(buf);
@@ -2587,7 +2587,7 @@ H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock,
H5S_t *space; /* Dataspace to modify selection of */
herr_t ret_value; /* return value */
- FUNC_ENTER_API(H5Sget_select_hyper_blocklist, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "ihh*[a2]h", spaceid, startblock, numblocks, buf);
/* Check args */
@@ -2643,7 +2643,7 @@ H5S_hyper_bounds_helper(const H5S_hyper_span_info_t *spans, const hssize_t *offs
H5S_hyper_span_t *curr; /* Hyperslab information nodes */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_bounds_helper)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(spans);
HDassert(offset);
@@ -2712,7 +2712,7 @@ H5S_hyper_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
unsigned i; /* index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5S_hyper_bounds, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(space);
HDassert(start);
@@ -2782,7 +2782,7 @@ H5S_hyper_offset(const H5S_t *space, hsize_t *offset)
int i; /* index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5S_hyper_offset, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(space);
HDassert(offset);
@@ -2886,7 +2886,7 @@ H5S_hyper_is_contiguous(const H5S_t *space)
unsigned u; /* index variable */
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_hyper_is_contiguous)
+ FUNC_ENTER_NOAPI_NOERR
HDassert(space);
@@ -3071,7 +3071,7 @@ H5S_hyper_is_single(const H5S_t *space)
unsigned u; /* index variable */
htri_t ret_value=TRUE; /* return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_hyper_is_single)
+ FUNC_ENTER_NOAPI_NOERR
HDassert(space);
@@ -3138,7 +3138,7 @@ H5S_hyper_is_regular(const H5S_t *space)
{
htri_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_hyper_is_regular)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -3180,7 +3180,7 @@ H5S_hyper_release(H5S_t *space)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5S_hyper_release, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(space && H5S_SEL_HYPERSLABS == H5S_GET_SELECT_TYPE(space));
@@ -3225,7 +3225,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_NOAPI_NOINIT_NOFUNC(H5S_hyper_recover_span)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(recover);
HDassert(curr_span);
@@ -3268,7 +3268,7 @@ H5S_hyper_coord_to_span(unsigned rank, hsize_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_NOAPI_NOINIT(H5S_hyper_coord_to_span)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(rank > 0);
HDassert(coords);
@@ -3337,7 +3337,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_NOAPI_NOINIT(H5S_hyper_add_span_element_helper)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(span_tree);
HDassert(rank > 0);
@@ -3535,7 +3535,7 @@ H5S_hyper_add_span_element(H5S_t *space, unsigned rank, hsize_t *coords)
H5S_hyper_span_info_t *head = NULL; /* Pointer to new head of span tree */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_add_span_element)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(space);
HDassert(rank > 0);
@@ -3611,7 +3611,7 @@ done:
herr_t
H5S_hyper_reset_scratch(H5S_t *space)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_reset_scratch)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
@@ -3649,7 +3649,7 @@ H5S_hyper_convert(H5S_t *space)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_convert)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(space);
@@ -3721,7 +3721,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_NOAPI_NOINIT(H5S_hyper_intersect_helper)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert((spans1 && spans2) || (spans1 == NULL && spans2 == NULL));
@@ -3788,7 +3788,7 @@ H5S_hyper_intersect (H5S_t *space1, H5S_t *space2)
{
htri_t ret_value=FAIL; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_intersect)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(space1);
@@ -3840,7 +3840,7 @@ H5S_hyper_intersect_block_helper (const H5S_hyper_span_info_t *spans, hsize_t *s
htri_t status; /* Status from recursive call */
htri_t ret_value=FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_intersect_block_helper)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(spans);
@@ -3907,7 +3907,7 @@ H5S_hyper_intersect_block (H5S_t *space, hsize_t *start, hsize_t *end)
{
htri_t ret_value=FAIL; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_intersect_block)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(space);
@@ -3956,7 +3956,7 @@ H5S_hyper_adjust_helper_u (H5S_hyper_span_info_t *spans, const hsize_t *offset)
{
H5S_hyper_span_t *span; /* Pointer to current span in span tree */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_adjust_helper_u)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(spans);
@@ -4014,7 +4014,7 @@ H5S_hyper_adjust_u(H5S_t *space, const hsize_t *offset)
unsigned u; /* Local index variable */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_adjust_u)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(space);
HDassert(offset);
@@ -4060,7 +4060,7 @@ H5S_hyper_project_scalar(const H5S_t *space, hsize_t *offset)
hsize_t block[H5S_MAX_RANK]; /* Block selected in base dataspace */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_project_scalar)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(space && H5S_SEL_HYPERSLABS == H5S_GET_SELECT_TYPE(space));
@@ -4128,7 +4128,7 @@ H5S_hyper_project_simple_lower(const H5S_t *base_space, H5S_t *new_space)
H5S_hyper_span_info_t *down; /* Pointer to list of spans */
unsigned curr_dim; /* Current dimension being operated on */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_project_simple_lower)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(base_space && H5S_SEL_HYPERSLABS == H5S_GET_SELECT_TYPE(base_space));
@@ -4176,7 +4176,7 @@ H5S_hyper_project_simple_higher(const H5S_t *base_space, H5S_t *new_space)
unsigned curr_dim; /* Current dimension being operated on */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_project_simple_higher)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(base_space && H5S_SEL_HYPERSLABS == H5S_GET_SELECT_TYPE(base_space));
@@ -4264,7 +4264,7 @@ H5S_hyper_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *off
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_project_simple)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(base_space && H5S_SEL_HYPERSLABS == H5S_GET_SELECT_TYPE(base_space));
@@ -4432,7 +4432,7 @@ H5S_hyper_adjust_helper_s(H5S_hyper_span_info_t *spans, const hssize_t *offset)
{
H5S_hyper_span_t *span; /* Pointer to current span in span tree */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_adjust_helper_s)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(spans);
@@ -4490,7 +4490,7 @@ H5S_hyper_adjust_s(H5S_t *space, const hssize_t *offset)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_adjust_s)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(space);
HDassert(offset);
@@ -4544,7 +4544,7 @@ H5S_hyper_normalize_offset(H5S_t *space, hssize_t *old_offset)
unsigned u; /* Local index variable */
herr_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_normalize_offset)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(space);
@@ -4598,7 +4598,7 @@ H5S_hyper_denormalize_offset(H5S_t *space, const hssize_t *old_offset)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_denormalize_offset)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(space);
HDassert(H5S_GET_SELECT_TYPE(space) == H5S_SEL_HYPERSLABS);
@@ -4643,7 +4643,7 @@ H5S_hyper_append_span (H5S_hyper_span_t **prev_span, H5S_hyper_span_info_t ** sp
H5S_hyper_span_t *new_span = NULL;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_append_span)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(prev_span);
HDassert(span_tree);
@@ -4767,7 +4767,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_NOAPI_NOINIT(H5S_hyper_clip_spans)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(a_spans);
@@ -5257,7 +5257,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_NOAPI_NOINIT(H5S_hyper_merge_spans_helper)
+ FUNC_ENTER_NOAPI_NOINIT
/* Make certain both 'a' & 'b' spans have down span trees or neither does */
HDassert((a_spans != NULL && b_spans != NULL) || (a_spans == NULL && b_spans == NULL));
@@ -5569,7 +5569,7 @@ done:
static herr_t
H5S_hyper_merge_spans (H5S_t *space, H5S_hyper_span_info_t *new_spans, hbool_t can_own)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_merge_spans)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -5625,7 +5625,7 @@ H5S_hyper_spans_nelem (H5S_hyper_span_info_t *spans)
H5S_hyper_span_t *span; /* Hyperslab span */
hsize_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_spans_nelem)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Count the number of elements in the span tree */
if(spans==NULL)
@@ -5687,7 +5687,7 @@ H5S_hyper_make_spans(unsigned rank, const hsize_t *start, const hsize_t *stride,
unsigned u; /* Counters */
H5S_hyper_span_info_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_make_spans)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(rank > 0);
@@ -5828,7 +5828,7 @@ H5S_hyper_rebuild_helper(const H5S_hyper_span_t *span, H5S_hyper_dim_t span_slab
H5S_hyper_dim_t canon_down_span_slab_info[H5S_MAX_RANK];
hbool_t ret_value = TRUE;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_rebuild_helper)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(span) {
/* Initialization */
@@ -5956,7 +5956,7 @@ H5S_hyper_rebuild(H5S_t *space)
unsigned rank, curr_dim;
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_rebuild)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -6018,7 +6018,7 @@ H5S_hyper_generate_spans(H5S_t *space)
unsigned u; /* Counter */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_hyper_generate_spans)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(space);
HDassert(H5S_GET_SELECT_TYPE(space) == H5S_SEL_HYPERSLABS);
@@ -6068,7 +6068,7 @@ H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op,
H5S_hyper_span_info_t *b_not_a=NULL; /* Span tree for hyperslab spans in new span tree and not in old span tree */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_generate_hyperslab)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(space);
@@ -6314,7 +6314,7 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
unsigned u; /* Counters */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5S_select_hyperslab, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(space);
@@ -6585,7 +6585,7 @@ H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[],
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Sselect_hyperslab, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "iSs*h*h*h*h", space_id, op, start, stride, count, block);
/* Check args */
@@ -6639,7 +6639,7 @@ H5S_operate_hyperslab (H5S_t *result, H5S_hyper_span_info_t *spans1, H5S_seloper
H5S_hyper_span_info_t *b_not_a=NULL; /* Span tree for hyperslab spans in new span tree and not in old span tree */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_operate_hyperslab)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(result);
@@ -6846,7 +6846,7 @@ H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op,
hbool_t span2_owned=FALSE; /* Flag to indicate that span2 was used in H5S_operate_hyperslab() */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_generate_hyperslab)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(space);
@@ -6923,7 +6923,7 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op,
unsigned u; /* Counters */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5S_select_hyperslab, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(space);
@@ -7180,7 +7180,7 @@ H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[],
H5S_t *space = NULL; /* Dataspace to modify selection of */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Sselect_hyperslab, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "iSs*h*h*h*h", space_id, op, start, stride, count, block);
/* Check args */
@@ -7249,7 +7249,7 @@ H5Scombine_hyperslab(hid_t space_id, H5S_seloper_t op, const hsize_t start[],
H5S_t *new_space = NULL; /* New dataspace created */
hid_t ret_value;
- FUNC_ENTER_API(H5Scombine_hyperslab, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("i", "iSs*h*h*h*h", space_id, op, start, stride, count, block);
/* Check args */
@@ -7302,7 +7302,7 @@ H5S_combine_select (H5S_t *space1, H5S_seloper_t op, H5S_t *space2)
hbool_t span2_owned=FALSE; /* Flag to indicate that span2 was used in H5S_operate_hyperslab() */
H5S_t *ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_combine_select)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(space1);
@@ -7374,7 +7374,7 @@ H5Scombine_select(hid_t space1_id, H5S_seloper_t op, hid_t space2_id)
H5S_t *new_space = NULL; /* New Dataspace */
hid_t ret_value;
- FUNC_ENTER_API(H5Scombine_select, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("i", "iSsi", space1_id, op, space2_id);
/* Check args */
@@ -7430,7 +7430,7 @@ H5S_select_select (H5S_t *space1, H5S_seloper_t op, H5S_t *space2)
hbool_t span2_owned=FALSE; /* Flag to indicate that span2 was used in H5S_operate_hyperslab() */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_select_select)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(space1);
@@ -7499,7 +7499,7 @@ H5Sselect_select(hid_t space1_id, H5S_seloper_t op, hid_t space2_id)
H5S_t *space2; /* Second Dataspace */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Sselect_select, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "iSsi", space1_id, op, space2_id);
/* Check args */
@@ -7583,7 +7583,7 @@ H5S_hyper_get_seq_list_gen(const H5S_t *space,H5S_sel_iter_t *iter,
unsigned u; /* Index variable */
int i; /* Index variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_get_seq_list_gen)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -8017,7 +8017,7 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space, H5S_sel_iter_t *iter,
unsigned u; /* Local index variable */
int i; /* Local index variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_get_seq_list_opt)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -8447,7 +8447,7 @@ H5S_hyper_get_seq_list_single(const H5S_t *space, H5S_sel_iter_t *iter,
unsigned u; /* Local index variable */
int i; /* Local index variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_get_seq_list_single)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -8715,7 +8715,7 @@ H5S_hyper_get_seq_list(const H5S_t *space, unsigned UNUSED flags, H5S_sel_iter_t
{
herr_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_hyper_get_seq_list)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
diff --git a/src/H5Smpio.c b/src/H5Smpio.c
index d6131b9..7cd4c31 100644
--- a/src/H5Smpio.c
+++ b/src/H5Smpio.c
@@ -78,7 +78,7 @@ H5S_mpio_all_type(const H5S_t *space, size_t elmt_size,
hsize_t nelmts; /* Total number of elmts */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_mpio_all_type)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(space);
@@ -119,7 +119,7 @@ done:
static herr_t
H5S_mpio_none_type(MPI_Datatype *new_type, int *count, hbool_t *is_derived_type)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_mpio_none_type)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* fill in the return values */
*new_type = MPI_BYTE;
@@ -173,7 +173,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_NOAPI_NOINIT(H5S_mpio_hyper_type)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(space);
@@ -439,7 +439,7 @@ H5S_mpio_span_hyper_type(const H5S_t *space, size_t elmt_size,
int mpi_code; /* MPI return code */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_mpio_span_hyper_type)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(space);
@@ -506,7 +506,7 @@ H5S_obtain_datatype(const hsize_t *down, H5S_hyper_span_t *span,
int mpi_code; /* MPI return status code */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_obtain_datatype)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity check */
HDassert(span);
@@ -677,7 +677,7 @@ H5S_mpio_space_type(const H5S_t *space, size_t elmt_size,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_mpio_space_type)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(space);
@@ -730,7 +730,7 @@ H5S_mpio_space_type(const H5S_t *space, size_t elmt_size,
} /* end switch */
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5S_mpio_space_type() */
#endif /* H5_HAVE_PARALLEL */
diff --git a/src/H5Snone.c b/src/H5Snone.c
index 1948f13..e9a3bf9 100644
--- a/src/H5Snone.c
+++ b/src/H5Snone.c
@@ -116,7 +116,7 @@ static const H5S_sel_iter_class_t H5S_sel_iter_none[1] = {{
herr_t
H5S_none_iter_init(H5S_sel_iter_t *iter, const H5S_t UNUSED *space)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5S_none_iter_init)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space && H5S_SEL_NONE==H5S_GET_SELECT_TYPE(space));
@@ -147,7 +147,7 @@ H5S_none_iter_init(H5S_sel_iter_t *iter, const H5S_t UNUSED *space)
static herr_t
H5S_none_iter_coords(const H5S_sel_iter_t UNUSED *iter, hsize_t UNUSED *coords)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_iter_coords)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -175,7 +175,7 @@ H5S_none_iter_coords(const H5S_sel_iter_t UNUSED *iter, hsize_t UNUSED *coords)
static herr_t
H5S_none_iter_block(const H5S_sel_iter_t UNUSED *iter, hsize_t UNUSED *start, hsize_t UNUSED *end)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_iter_block)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -203,7 +203,7 @@ H5S_none_iter_block(const H5S_sel_iter_t UNUSED *iter, hsize_t UNUSED *start, hs
static hsize_t
H5S_none_iter_nelmts(const H5S_sel_iter_t UNUSED *iter)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_iter_nelmts)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -232,7 +232,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_NOAPI_NOINIT_NOFUNC(H5S_none_iter_has_next_block)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -262,7 +262,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_NOAPI_NOINIT_NOFUNC(H5S_none_iter_next)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -292,7 +292,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_NOAPI_NOINIT_NOFUNC(H5S_none_iter_next)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -321,7 +321,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_NOAPI_NOINIT_NOFUNC(H5S_none_iter_release)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -350,7 +350,7 @@ H5S_none_iter_release(H5S_sel_iter_t UNUSED * iter)
static herr_t
H5S_none_release(H5S_t UNUSED * space)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_release)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -381,7 +381,7 @@ H5S_none_release(H5S_t UNUSED * space)
static herr_t
H5S_none_copy(H5S_t *dst, const H5S_t UNUSED *src, hbool_t UNUSED share_selection)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_copy)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(src);
HDassert(dst);
@@ -416,7 +416,7 @@ H5S_none_copy(H5S_t *dst, const H5S_t UNUSED *src, hbool_t UNUSED share_selectio
static htri_t
H5S_none_is_valid(const H5S_t UNUSED *space)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_is_valid)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
@@ -446,7 +446,7 @@ H5S_none_is_valid(const H5S_t UNUSED *space)
static hssize_t
H5S_none_serial_size(const H5S_t UNUSED *space)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_serial_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
@@ -480,7 +480,7 @@ H5S_none_serial_size(const H5S_t UNUSED *space)
static herr_t
H5S_none_serialize(const H5S_t *space, uint8_t *buf)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_serialize)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
@@ -518,7 +518,7 @@ H5S_none_deserialize(H5S_t *space, const uint8_t UNUSED *buf)
{
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_none_deserialize)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(space);
@@ -559,7 +559,7 @@ done:
static herr_t
H5S_none_bounds(const H5S_t UNUSED *space, hsize_t UNUSED *start, hsize_t UNUSED *end)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_bounds)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
HDassert(start);
@@ -592,7 +592,7 @@ H5S_none_bounds(const H5S_t UNUSED *space, hsize_t UNUSED *start, hsize_t UNUSED
herr_t
H5S_none_offset(const H5S_t UNUSED *space, hsize_t UNUSED *offset)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5S_none_offset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
HDassert(offset);
@@ -622,7 +622,7 @@ H5S_none_offset(const H5S_t UNUSED *space, hsize_t UNUSED *offset)
static htri_t
H5S_none_is_contiguous(const H5S_t UNUSED *space)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_is_contiguous)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
@@ -651,7 +651,7 @@ H5S_none_is_contiguous(const H5S_t UNUSED *space)
static htri_t
H5S_none_is_single(const H5S_t UNUSED *space)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_is_single)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
@@ -681,7 +681,7 @@ H5S_none_is_single(const H5S_t UNUSED *space)
static htri_t
H5S_none_is_regular(const H5S_t UNUSED *space)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_is_regular)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -711,7 +711,7 @@ H5S_none_is_regular(const H5S_t UNUSED *space)
herr_t
H5S_none_adjust_u(H5S_t UNUSED *space, const hsize_t UNUSED *offset)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5S_none_adjust_u)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -736,7 +736,7 @@ H5S_none_adjust_u(H5S_t UNUSED *space, const hsize_t UNUSED *offset)
static herr_t
H5S_none_project_scalar(const H5S_t UNUSED *space, hsize_t UNUSED *offset)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_project_scalar)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space && H5S_SEL_NONE == H5S_GET_SELECT_TYPE(space));
@@ -764,7 +764,7 @@ H5S_none_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *offs
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_none_project_simple)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(base_space && H5S_SEL_NONE == H5S_GET_SELECT_TYPE(base_space));
@@ -802,7 +802,7 @@ H5S_select_none(H5S_t *space)
{
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOAPI(H5S_select_none, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(space);
@@ -845,7 +845,7 @@ H5Sselect_none(hid_t spaceid)
H5S_t *space; /* Dataspace to modify selection of */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_API(H5Sselect_none, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", spaceid);
/* Check args */
@@ -897,7 +897,7 @@ H5S_none_get_seq_list(const H5S_t UNUSED *space, unsigned UNUSED flags, H5S_sel_
size_t UNUSED maxseq, size_t UNUSED maxelem, size_t *nseq, size_t *nelem,
hsize_t UNUSED *off, size_t UNUSED *len)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_none_get_seq_list)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
diff --git a/src/H5Spoint.c b/src/H5Spoint.c
index e544371..7e82295 100644
--- a/src/H5Spoint.c
+++ b/src/H5Spoint.c
@@ -123,7 +123,7 @@ H5FL_DEFINE_STATIC(H5S_pnt_list_t);
herr_t
H5S_point_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5S_point_iter_init)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space && H5S_SEL_POINTS==H5S_GET_SELECT_TYPE(space));
@@ -160,7 +160,7 @@ H5S_point_iter_init(H5S_sel_iter_t *iter, const H5S_t *space)
static herr_t
H5S_point_iter_coords (const H5S_sel_iter_t *iter, hsize_t *coords)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_coords)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -191,7 +191,7 @@ H5S_point_iter_coords (const H5S_sel_iter_t *iter, hsize_t *coords)
static herr_t
H5S_point_iter_block (const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_block)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -223,7 +223,7 @@ H5S_point_iter_block (const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
static hsize_t
H5S_point_iter_nelmts (const H5S_sel_iter_t *iter)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_nelmts)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -254,7 +254,7 @@ H5S_point_iter_has_next_block(const H5S_sel_iter_t *iter)
{
htri_t ret_value=TRUE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_has_next_block)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -289,7 +289,7 @@ done:
static herr_t
H5S_point_iter_next(H5S_sel_iter_t *iter, size_t nelem)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_iter_next)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -325,7 +325,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_NOAPI_NOINIT_NOFUNC(H5S_point_iter_next_block)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -357,7 +357,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_NOAPI_NOINIT_NOFUNC(H5S_point_iter_release)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(iter);
@@ -392,7 +392,7 @@ H5S_point_add(H5S_t *space, H5S_seloper_t op, size_t num_elem, const hsize_t *co
unsigned u; /* Counter */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_point_add)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(space);
HDassert(num_elem > 0);
@@ -492,7 +492,7 @@ H5S_point_release (H5S_t *space)
{
H5S_pnt_node_t *curr, *next; /* Point selection nodes */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_release)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -552,7 +552,7 @@ H5S_select_elements(H5S_t *space, H5S_seloper_t op, size_t num_elem,
{
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_select_elements)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(space);
@@ -607,7 +607,7 @@ H5S_point_copy(H5S_t *dst, const H5S_t *src, hbool_t UNUSED share_selection)
H5S_pnt_node_t *curr, *new_node, *new_tail; /* Point information nodes */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_point_copy)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(src);
HDassert(dst);
@@ -688,7 +688,7 @@ H5S_point_is_valid (const H5S_t *space)
unsigned u; /* Counter */
htri_t ret_value=TRUE; /* return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_is_valid)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
@@ -735,7 +735,7 @@ H5Sget_select_elem_npoints(hid_t spaceid)
H5S_t *space; /* Dataspace to modify selection of */
hssize_t ret_value; /* return value */
- FUNC_ENTER_API(H5Sget_select_elem_npoints, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Hs", "i", spaceid);
/* Check args */
@@ -776,7 +776,7 @@ H5S_point_serial_size (const H5S_t *space)
H5S_pnt_node_t *curr; /* Point information nodes */
hssize_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_serial_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
@@ -825,7 +825,7 @@ H5S_point_serialize (const H5S_t *space, uint8_t *buf)
uint32_t len=0; /* number of bytes used */
unsigned u; /* local counting variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_serialize)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
@@ -893,7 +893,7 @@ H5S_point_deserialize (H5S_t *space, const uint8_t *buf)
unsigned i, j; /* local counting variables */
herr_t ret_value = SUCCEED; /* return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_point_deserialize)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(space);
@@ -963,7 +963,7 @@ H5S_get_select_elem_pointlist(H5S_t *space, hsize_t startpoint, hsize_t numpoint
H5S_pnt_node_t *node; /* Point node */
unsigned rank; /* Dataspace rank */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_get_select_elem_pointlist)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
HDassert(buf);
@@ -1028,7 +1028,7 @@ H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint,
H5S_t *space; /* Dataspace to modify selection of */
herr_t ret_value; /* return value */
- FUNC_ENTER_API(H5Sget_select_elem_pointlist, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "ihh*[a2]h", spaceid, startpoint, numpoints, buf);
/* Check args */
@@ -1080,7 +1080,7 @@ H5S_point_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
unsigned u; /* index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_point_bounds)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(space);
HDassert(start);
@@ -1146,7 +1146,7 @@ H5S_point_offset(const H5S_t *space, hsize_t *offset)
int i; /* index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5S_point_offset, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(space);
HDassert(offset);
@@ -1206,7 +1206,7 @@ H5S_point_is_contiguous(const H5S_t *space)
{
htri_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_is_contiguous)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
@@ -1243,7 +1243,7 @@ H5S_point_is_single(const H5S_t *space)
{
htri_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_is_single)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
@@ -1283,7 +1283,7 @@ H5S_point_is_regular(const H5S_t *space)
{
htri_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_is_regular)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -1322,7 +1322,7 @@ H5S_point_adjust_u(H5S_t *space, const hsize_t *offset)
H5S_pnt_node_t *node; /* Point node */
unsigned rank; /* Dataspace rank */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_point_adjust_u)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
HDassert(offset);
@@ -1369,7 +1369,7 @@ H5S_point_project_scalar(const H5S_t *space, hsize_t *offset)
const H5S_pnt_node_t *node; /* Point node */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_point_project_scalar)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(space && H5S_SEL_POINTS == H5S_GET_SELECT_TYPE(space));
@@ -1412,7 +1412,7 @@ H5S_point_project_simple(const H5S_t *base_space, H5S_t *new_space, hsize_t *off
unsigned rank_diff; /* Difference in ranks between spaces */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_point_project_simple)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(base_space && H5S_SEL_POINTS == H5S_GET_SELECT_TYPE(base_space));
@@ -1554,7 +1554,7 @@ H5Sselect_elements(hid_t spaceid, H5S_seloper_t op, size_t num_elem,
H5S_t *space; /* Dataspace to modify selection of */
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Sselect_elements, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "iSsz*h", spaceid, op, num_elem, coord);
/* Check args */
@@ -1625,7 +1625,7 @@ H5S_point_get_seq_list(const H5S_t *space, unsigned flags, H5S_sel_iter_t *iter,
int i; /* Local index variable */
herr_t ret_value=SUCCEED; /* return value */
- FUNC_ENTER_NOAPI_NOINIT(H5S_point_get_seq_list)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(space);
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index db18780..91aed1e 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -63,7 +63,7 @@ static herr_t H5S_select_iter_next_block(H5S_sel_iter_t *iter);
herr_t
H5S_select_offset(H5S_t *space, const hssize_t *offset)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5S_select_offset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -109,7 +109,7 @@ H5S_select_copy (H5S_t *dst, const H5S_t *src, hbool_t share_selection)
{
herr_t ret_value; /* return value */
- FUNC_ENTER_NOAPI(H5S_select_copy, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
assert(dst);
@@ -150,7 +150,7 @@ H5S_select_release(H5S_t *ds)
{
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_select_release)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(ds);
@@ -187,7 +187,7 @@ H5S_select_get_seq_list(const H5S_t *space, unsigned flags,
{
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_select_get_seq_list)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(space);
@@ -222,7 +222,7 @@ H5S_select_serial_size(const H5S_t *space)
{
hssize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_select_serial_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(space);
@@ -260,7 +260,7 @@ H5S_select_serialize(const H5S_t *space, uint8_t *buf)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_select_serialize)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(space);
assert(buf);
@@ -295,7 +295,7 @@ H5Sget_select_npoints(hid_t spaceid)
H5S_t *space; /* Dataspace to modify selection of */
hssize_t ret_value; /* return value */
- FUNC_ENTER_API(H5Sget_select_npoints, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Hs", "i", spaceid);
/* Check args */
@@ -332,7 +332,7 @@ done:
hssize_t
H5S_get_select_npoints(const H5S_t *space)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5S_get_select_npoints)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -369,7 +369,7 @@ H5Sselect_valid(hid_t spaceid)
H5S_t *space; /* Dataspace to modify selection of */
htri_t ret_value; /* return value */
- FUNC_ENTER_API(H5Sselect_valid, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("t", "i", spaceid);
/* Check args */
@@ -411,7 +411,7 @@ H5S_select_valid(const H5S_t *space)
{
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_select_valid)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(space);
@@ -450,7 +450,7 @@ H5S_select_deserialize (H5S_t *space, const uint8_t *buf)
uint32_t sel_type; /* Pointer to the selection type */
herr_t ret_value=FAIL; /* return value */
- FUNC_ENTER_NOAPI(H5S_select_deserialize, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
assert(space);
@@ -520,7 +520,7 @@ H5Sget_select_bounds(hid_t spaceid, hsize_t start[], hsize_t end[])
H5S_t *space; /* Dataspace to modify selection of */
herr_t ret_value; /* return value */
- FUNC_ENTER_API(H5Sget_select_bounds, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*h*h", spaceid, start, end);
/* Check args */
@@ -568,7 +568,7 @@ H5S_get_select_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
{
herr_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_get_select_bounds)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(space);
@@ -609,7 +609,7 @@ H5S_get_select_offset(const H5S_t *space, hsize_t *offset)
{
herr_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_get_select_offset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -647,7 +647,7 @@ H5S_select_is_contiguous(const H5S_t *space)
{
herr_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_select_is_contiguous)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(space);
@@ -684,7 +684,7 @@ H5S_select_is_single(const H5S_t *space)
{
herr_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_select_is_single)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(space);
@@ -721,7 +721,7 @@ H5S_select_is_regular(const H5S_t *space)
{
herr_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_select_is_regular)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(space);
@@ -758,7 +758,7 @@ H5S_select_adjust_u(H5S_t *space, const hsize_t *offset)
{
herr_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_select_adjust_u)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -796,7 +796,7 @@ H5S_select_project_scalar(const H5S_t *space, hsize_t *offset)
{
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_select_project_scalar)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -836,7 +836,7 @@ H5S_select_project_simple(const H5S_t *space, H5S_t *new_space, hsize_t *offset)
{
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_select_project_simple)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(space);
@@ -871,7 +871,7 @@ H5S_select_iter_init(H5S_sel_iter_t *sel_iter, const H5S_t *space, size_t elmt_s
{
herr_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_select_iter_init)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(sel_iter);
@@ -926,7 +926,7 @@ H5S_select_iter_coords (const H5S_sel_iter_t *sel_iter, hsize_t *coords)
{
herr_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_select_iter_coords)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(sel_iter);
@@ -968,7 +968,7 @@ H5S_select_iter_block (const H5S_sel_iter_t *iter, hsize_t *start, hsize_t *end)
{
herr_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_select_iter_block)
+ FUNC_ENTER_NOAPI_NOINIT_NOINIT_NOERR
/* Check args */
assert(iter);
@@ -1008,7 +1008,7 @@ H5S_select_iter_nelmts (const H5S_sel_iter_t *sel_iter)
{
hsize_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_select_iter_nelmts)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(sel_iter);
@@ -1047,7 +1047,7 @@ H5S_select_iter_has_next_block (const H5S_sel_iter_t *iter)
{
herr_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_select_iter_has_next_block)
+ FUNC_ENTER_NOAPI_NOINIT_NOINIT_NOERR
/* Check args */
assert(iter);
@@ -1087,7 +1087,7 @@ H5S_select_iter_next(H5S_sel_iter_t *iter, size_t nelem)
{
herr_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_select_iter_next)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(iter);
@@ -1132,7 +1132,7 @@ H5S_select_iter_next_block(H5S_sel_iter_t *iter)
{
herr_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5S_select_iter_next_block)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(iter);
@@ -1170,7 +1170,7 @@ H5S_select_iter_release(H5S_sel_iter_t *sel_iter)
{
herr_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_select_iter_release)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(sel_iter);
@@ -1236,7 +1236,7 @@ H5S_select_iterate(void *buf, hid_t type_id, const H5S_t *space, H5D_operator_t
herr_t user_ret=0; /* User's return value */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5S_select_iterate, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(buf);
@@ -1345,7 +1345,7 @@ H5Sget_select_type(hid_t space_id)
H5S_t *space; /* dataspace to modify */
H5S_sel_type ret_value; /* Return value */
- FUNC_ENTER_API(H5Sget_select_type, H5S_SEL_ERROR)
+ FUNC_ENTER_API(H5S_SEL_ERROR)
H5TRACE1("St", "i", space_id);
/* Check args */
@@ -1384,7 +1384,7 @@ H5S_get_select_type(const H5S_t *space)
{
H5S_sel_type ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5S_get_select_type)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
assert(space);
@@ -1428,7 +1428,7 @@ H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2)
hbool_t iter_b_init = 0; /* Selection b iteration info has been initialized */
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI(H5S_select_shape_same, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(space1);
@@ -1767,7 +1767,7 @@ H5S_select_construct_projection(const H5S_t *base_space, H5S_t **new_space_ptr,
hsize_t projected_space_element_offset = 0; /* Offset of selected element in projected buffer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5S_select_construct_projection, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity checks */
HDassert(base_space != NULL);
@@ -1997,7 +1997,7 @@ H5S_select_fill(const void *fill, size_t fill_size, const H5S_t *space, void *_b
size_t max_elem; /* Total number of elements in selection */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5S_select_fill, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(fill);
diff --git a/src/H5Stest.c b/src/H5Stest.c
index 5758263..62a4179 100644
--- a/src/H5Stest.c
+++ b/src/H5Stest.c
@@ -56,7 +56,7 @@ H5S_select_shape_same_test(hid_t sid1, hid_t sid2)
H5S_t *space2; /* Pointer to 2nd dataspace */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5S_select_shape_same_test, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Get dataspace structures */
if(NULL == (space1 = (H5S_t *)H5I_object_verify(sid1, H5I_DATASPACE)))
@@ -97,7 +97,7 @@ H5S_get_rebuild_status_test(hid_t space_id)
H5S_t *space; /* Pointer to 1st dataspace */
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5S_get_rebuild_status_test, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Get dataspace structures */
if(NULL == (space = (H5S_t *)H5I_object_verify(space_id, H5I_DATASPACE)))
diff --git a/src/H5T.c b/src/H5T.c
index 688dfb3..fcc4ab3 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -521,11 +521,11 @@ H5T_init(void)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_init, FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
/* FUNC_ENTER() does all the work */
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
@@ -556,7 +556,7 @@ H5T_init_inf(void)
size_t u; /* Local index value */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5T_init_inf)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get the float datatype */
if(NULL == (dst_p = (H5T_t *)H5I_object(H5T_NATIVE_FLOAT_g)))
@@ -666,7 +666,7 @@ H5T_init_hw(void)
#endif /* H5_HAVE_GET_FPC_CSR */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_hw)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef H5_HAVE_GET_FPC_CSR
/* [This code is specific to SGI machines] */
@@ -739,7 +739,7 @@ H5T_init_interface(void)
H5P_genclass_t *crt_pclass; /* Property list class for datatype creation properties */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5T_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT
/* Initialize the atom group for the file IDs */
if(H5I_register_type(H5I_DATATYPE, (size_t)H5I_DATATYPEID_HASHSIZE, H5T_RESERVED_ATOMS, (H5I_free_t)H5T_close)<0)
@@ -1376,7 +1376,7 @@ H5T_unlock_cb(void *_dt, hid_t UNUSED id, void UNUSED *key)
{
H5T_t *dt = (H5T_t *)_dt;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_unlock_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert (dt && dt->shared);
if (H5T_STATE_IMMUTABLE==dt->shared->state)
@@ -1408,7 +1408,7 @@ H5T_term_interface(void)
int i, nprint=0, n=0;
H5T_path_t *path = NULL;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_term_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(H5_interface_initialize_g) {
/* Unregister all conversion functions */
@@ -1585,7 +1585,7 @@ H5Tcreate(H5T_class_t type, size_t size)
H5T_t *dt = NULL; /* New datatype constructed */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tcreate, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("i", "Ttz", type, size);
/* check args. We support string (fixed-size or variable-length) now. */
@@ -1636,7 +1636,7 @@ H5Tcopy(hid_t type_id)
H5T_t *new_dt = NULL;
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tcopy, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", type_id);
switch(H5I_get_type(type_id)) {
@@ -1713,7 +1713,7 @@ H5Tclose(hid_t type_id)
H5T_t *dt; /* Pointer to datatype to close */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tclose, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", type_id);
/* Check args */
@@ -1752,7 +1752,7 @@ H5Tequal(hid_t type1_id, hid_t type2_id)
const H5T_t *dt2; /* Pointer to second datatype */
htri_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tequal, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("t", "ii", type1_id, type2_id);
/* check args */
@@ -1798,7 +1798,7 @@ H5Tlock(hid_t type_id)
H5T_t *dt; /* Datatype to operate on */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tlock, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", type_id);
/* Check args */
@@ -1836,7 +1836,7 @@ H5Tget_class(hid_t type_id)
H5T_t *dt; /* Pointer to datatype */
H5T_class_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tget_class, H5T_NO_CLASS)
+ FUNC_ENTER_API(H5T_NO_CLASS)
H5TRACE1("Tt", "i", type_id);
/* Check args */
@@ -1874,7 +1874,7 @@ H5T_get_class(const H5T_t *dt, htri_t internal)
{
H5T_class_t ret_value;
- FUNC_ENTER_NOAPI(H5T_get_class, H5T_NO_CLASS);
+ FUNC_ENTER_NOAPI(H5T_NO_CLASS)
assert(dt);
@@ -1889,7 +1889,7 @@ H5T_get_class(const H5T_t *dt, htri_t internal)
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5T_get_class() */
@@ -1914,7 +1914,7 @@ H5Tdetect_class(hid_t type, H5T_class_t cls)
H5T_t *dt; /* Datatype to query */
htri_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tdetect_class, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("t", "iTt", type, cls);
/* Check args */
@@ -1960,7 +1960,7 @@ H5T_detect_class(const H5T_t *dt, H5T_class_t cls, hbool_t from_api)
unsigned i;
htri_t ret_value = FALSE; /* Return value */
- FUNC_ENTER_NOAPI(H5T_detect_class, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(dt);
HDassert(cls > H5T_NO_CLASS && cls < H5T_NCLASSES);
@@ -2035,7 +2035,7 @@ H5Tis_variable_str(hid_t dtype_id)
H5T_t *dt; /* Datatype to query */
htri_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tis_variable_str, FAIL);
+ FUNC_ENTER_API(FAIL)
H5TRACE1("t", "i", dtype_id);
/* Check args */
@@ -2047,7 +2047,7 @@ H5Tis_variable_str(hid_t dtype_id)
HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, "can't determine if datatype is VL-string")
done:
- FUNC_LEAVE_API(ret_value);
+ FUNC_LEAVE_API(ret_value)
} /* end H5Tis_variable_str() */
@@ -2066,9 +2066,9 @@ done:
htri_t
H5T_is_variable_str(const H5T_t *dt)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_is_variable_str)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
- FUNC_LEAVE_NOAPI(H5T_IS_VL_STRING(dt->shared));
+ FUNC_LEAVE_NOAPI(H5T_IS_VL_STRING(dt->shared))
} /* end H5T_is_variable_str() */
@@ -2094,7 +2094,7 @@ H5Tget_size(hid_t type_id)
H5T_t *dt; /* Datatype to query */
size_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tget_size, 0)
+ FUNC_ENTER_API(0)
H5TRACE1("z", "i", type_id);
/* Check args */
@@ -2139,7 +2139,7 @@ H5Tset_size(hid_t type_id, size_t size)
H5T_t *dt; /* Datatype to modify */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tset_size, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iz", type_id, size);
/* Check args */
@@ -2189,7 +2189,7 @@ H5Tget_super(hid_t type)
H5T_t *super = NULL; /* Supertype */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tget_super, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", type);
if(NULL == (dt = (H5T_t *)H5I_object_verify(type,H5I_DATATYPE)))
@@ -2231,7 +2231,7 @@ H5T_get_super(const H5T_t *dt)
{
H5T_t *ret_value=NULL;
- FUNC_ENTER_NOAPI(H5T_get_super, NULL);
+ FUNC_ENTER_NOAPI(NULL)
assert(dt);
@@ -2241,7 +2241,7 @@ H5T_get_super(const H5T_t *dt)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy parent data type");
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
@@ -2278,7 +2278,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_NOAPI_NOINIT(H5T_register);
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
assert(src);
@@ -2411,7 +2411,7 @@ done:
H5I_dec_ref(tmp_did);
} /* end if */
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5T_register() */
@@ -2442,7 +2442,7 @@ H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id,
H5T_t *dst; /*destination data type desc */
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_API(H5Tregister, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "Te*siix", pers, name, src_id, dst_id, func);
/* Check args */
@@ -2494,7 +2494,7 @@ H5T_unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst,
int nprint = 0; /*number of paths shut down */
int i; /*counter */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_unregister)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Remove matching entries from the soft list */
if(H5T_PERS_DONTCARE == pers || H5T_PERS_SOFT == pers) {
@@ -2588,7 +2588,7 @@ H5Tunregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id,
H5T_t *src = NULL, *dst = NULL; /* Datatype descriptors */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tunregister, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE5("e", "Te*siix", pers, name, src_id, dst_id, func);
/* Check arguments */
@@ -2630,7 +2630,7 @@ H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata)
H5T_path_t *path;
H5T_conv_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tfind, NULL)
+ FUNC_ENTER_API(NULL)
H5TRACE3("x", "ii**x", src_id, dst_id, pcdata);
/* Check args */
@@ -2678,7 +2678,7 @@ H5Tcompiler_conv(hid_t src_id, hid_t dst_id)
H5T_t *src, *dst;
htri_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tcompiler_conv, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("t", "ii", src_id, dst_id);
/* Check args */
@@ -2726,7 +2726,7 @@ H5Tconvert(hid_t src_id, hid_t dst_id, size_t nelmts, void *buf,
H5T_t *src, *dst; /*unatomized types */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tconvert, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "iiz*x*xi", src_id, dst_id, nelmts, buf, background, dxpl_id);
/* Check args */
@@ -2773,7 +2773,7 @@ H5Tencode(hid_t obj_id, void *buf, size_t *nalloc)
H5T_t *dtype;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_API (H5Tencode, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*x*z", obj_id, buf, nalloc);
/* Check argument and retrieve object */
@@ -2818,7 +2818,7 @@ H5Tdecode(const void *buf)
H5T_t *dt;
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tdecode, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "*x", buf);
/* Check args */
@@ -2866,7 +2866,7 @@ H5T_encode(H5T_t *obj, unsigned char *buf, size_t *nalloc)
H5F_t *f = NULL; /* Fake file structure*/
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI_NOINIT(H5T_encode)
+ FUNC_ENTER_NOAPI_NOINIT
/* Allocate "fake" file structure */
if(NULL == (f = H5F_fake_alloc((uint8_t)0)))
@@ -2922,7 +2922,7 @@ H5T_decode(const unsigned char *buf)
H5F_t *f = NULL; /* Fake file structure*/
H5T_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5T_decode)
+ FUNC_ENTER_NOAPI_NOINIT
/* Allocate "fake" file structure */
if(NULL == (f = H5F_fake_alloc((uint8_t)0)))
@@ -2979,7 +2979,7 @@ H5T_create(H5T_class_t type, size_t size)
H5T_t *dt = NULL;
H5T_t *ret_value = NULL;
- FUNC_ENTER_NOAPI(H5T_create, NULL)
+ FUNC_ENTER_NOAPI(NULL)
switch(type) {
case H5T_INTEGER:
@@ -3125,7 +3125,7 @@ H5T_copy(const H5T_t *old_dt, H5T_copy_t method)
char *s;
H5T_t *ret_value;
- FUNC_ENTER_NOAPI(H5T_copy, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* check args */
HDassert(old_dt);
@@ -3395,7 +3395,8 @@ H5T_lock (H5T_t *dt, hbool_t immutable)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_lock, FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
+
assert (dt);
switch (dt->shared->state) {
@@ -3413,7 +3414,7 @@ H5T_lock (H5T_t *dt, hbool_t immutable)
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
@@ -3435,7 +3436,7 @@ H5T_alloc(void)
H5T_t *dt = NULL; /* Pointer to datatype allocated */
H5T_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5T_alloc, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Allocate & initialize datatype wrapper info */
if(NULL == (dt = H5FL_CALLOC(H5T_t)))
@@ -3484,7 +3485,7 @@ H5T_free(H5T_t *dt)
unsigned i;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_free, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(dt && dt->shared);
@@ -3582,7 +3583,7 @@ H5T_close(H5T_t *dt)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_close, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(dt && dt->shared);
@@ -3667,7 +3668,7 @@ H5T_set_size(H5T_t *dt, size_t size)
size_t prec, offset;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_set_size, FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
assert(dt);
@@ -3823,7 +3824,7 @@ H5T_set_size(H5T_t *dt, size_t size)
}
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
@@ -3848,13 +3849,13 @@ done:
size_t
H5T_get_size(const H5T_t *dt)
{
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_get_size);
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
assert(dt);
- FUNC_LEAVE_NOAPI(dt->shared->size);
+ FUNC_LEAVE_NOAPI(dt->shared->size)
}
@@ -3885,7 +3886,7 @@ H5T_cmp(const H5T_t *dt1, const H5T_t *dt2, hbool_t superset)
int tmp;
int ret_value = 0;
- FUNC_ENTER_NOAPI(H5T_cmp, 0)
+ FUNC_ENTER_NOAPI(0)
/* Sanity check */
HDassert(dt1);
@@ -4330,7 +4331,7 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name,
int nprint = 0; /*lines of output printed */
H5T_path_t *ret_value; /*return value */
- FUNC_ENTER_NOAPI(H5T_path_find, NULL);
+ FUNC_ENTER_NOAPI(NULL)
/* Sanity check */
HDassert(src);
@@ -4563,7 +4564,7 @@ done:
if(dst_id >= 0)
H5I_dec_ref(dst_id);
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5T_path_find() */
@@ -4587,11 +4588,11 @@ done:
hbool_t
H5T_path_noop(const H5T_path_t *p)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_path_noop);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(p);
- FUNC_LEAVE_NOAPI(p->is_noop || (p->is_hard && 0==H5T_cmp(p->src, p->dst, FALSE)));
+ FUNC_LEAVE_NOAPI(p->is_noop || (p->is_hard && 0==H5T_cmp(p->src, p->dst, FALSE)))
} /* end H5T_path_noop() */
@@ -4628,14 +4629,14 @@ H5T_path_compound_subset(const H5T_path_t *p)
{
H5T_subset_info_t *ret_value = NULL;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_path_compound_subset);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(p);
if(p->are_compounds)
ret_value = H5T_conv_struct_subset(&(p->cdata));
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5T_path_compound_subset */
@@ -4656,11 +4657,11 @@ H5T_path_compound_subset(const H5T_path_t *p)
H5T_bkg_t
H5T_path_bkg(const H5T_path_t *p)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_path_bkg);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(p);
- FUNC_LEAVE_NOAPI(p->cdata.need_bkg);
+ FUNC_LEAVE_NOAPI(p->cdata.need_bkg)
} /* end H5T_path_bkg() */
@@ -4688,7 +4689,7 @@ H5T_compiler_conv(H5T_t *src, H5T_t *dst)
H5T_path_t *path;
htri_t ret_value;
- FUNC_ENTER_NOAPI_NOINIT(H5T_compiler_conv)
+ FUNC_ENTER_NOAPI_NOINIT
/* Find it */
if (NULL==(path=H5T_path_find(src, dst, NULL, NULL, H5AC_ind_dxpl_id, FALSE)))
@@ -4752,7 +4753,7 @@ H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id, size_t nelmts,
#endif
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_convert, FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
#ifdef H5T_DEBUG
if (H5DEBUG(T)) H5_timer_begin(&timer);
@@ -4770,7 +4771,7 @@ H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id, size_t nelmts,
#endif
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
@@ -4792,7 +4793,7 @@ H5T_oloc(H5T_t *dt)
{
H5O_loc_t *ret_value = NULL;
- FUNC_ENTER_NOAPI(H5T_oloc, NULL)
+ FUNC_ENTER_NOAPI(NULL)
HDassert(dt);
@@ -4831,7 +4832,7 @@ H5T_nameof(H5T_t *dt)
{
H5G_name_t *ret_value = NULL;
- FUNC_ENTER_NOAPI(H5T_nameof, NULL)
+ FUNC_ENTER_NOAPI(NULL)
HDassert(dt);
@@ -4872,7 +4873,7 @@ H5T_is_immutable(const H5T_t *dt)
{
htri_t ret_value = FALSE;
- FUNC_ENTER_NOAPI(H5T_is_immutable, FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
assert(dt);
@@ -4880,7 +4881,7 @@ H5T_is_immutable(const H5T_t *dt)
ret_value = TRUE;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
@@ -4905,7 +4906,7 @@ H5T_is_named(const H5T_t *dt)
{
htri_t ret_value = FALSE;
- FUNC_ENTER_NOAPI(H5T_is_named, FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
assert(dt);
@@ -4913,7 +4914,7 @@ H5T_is_named(const H5T_t *dt)
ret_value = TRUE;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
@@ -4942,7 +4943,7 @@ H5T_get_ref_type(const H5T_t *dt)
{
H5R_type_t ret_value = H5R_BADTYPE;
- FUNC_ENTER_NOAPI(H5T_get_ref_type, H5R_BADTYPE);
+ FUNC_ENTER_NOAPI(H5R_BADTYPE)
assert(dt);
@@ -4950,7 +4951,7 @@ H5T_get_ref_type(const H5T_t *dt)
ret_value=dt->shared->u.atomic.u.r.rtype;
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5T_get_ref_type() */
@@ -4976,7 +4977,7 @@ H5T_is_sensible(const H5T_t *dt)
{
htri_t ret_value;
- FUNC_ENTER_NOAPI(H5T_is_sensible, FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
assert(dt);
@@ -5004,7 +5005,7 @@ H5T_is_sensible(const H5T_t *dt)
} /* end switch */
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5041,7 +5042,7 @@ H5T_set_loc(H5T_t *dt, H5F_t *f, H5T_loc_t loc)
int accum_change; /* Amount of change in the offset of the fields */
size_t old_size; /* Previous size of a field */
- FUNC_ENTER_NOAPI(H5T_set_loc, FAIL);
+ FUNC_ENTER_NOAPI(FAIL)
assert(dt);
assert(loc>=H5T_LOC_BADLOC && loc<H5T_LOC_MAXLOC);
@@ -5148,7 +5149,7 @@ H5T_set_loc(H5T_t *dt, H5F_t *f, H5T_loc_t loc)
} /* end if */
done:
- FUNC_LEAVE_NOAPI(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value)
} /* end H5T_set_loc() */
@@ -5177,7 +5178,7 @@ H5T_is_relocatable(const H5T_t *dt)
{
htri_t ret_value = FALSE;
- FUNC_ENTER_NOAPI(H5T_is_relocatable, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(dt);
@@ -5211,7 +5212,7 @@ done:
static herr_t
H5T_upgrade_version_cb(H5T_t *dt, void *op_value)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_upgrade_version_cb)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(dt);
@@ -5259,7 +5260,7 @@ H5T_upgrade_version(H5T_t *dt, unsigned new_version)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_upgrade_version, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(dt);
@@ -5290,7 +5291,7 @@ H5T_set_latest_version(H5T_t *dt)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_set_latest_version, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(dt);
@@ -5324,7 +5325,7 @@ H5T_patch_file(H5T_t *dt, H5F_t *f)
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5T_patch_file, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(dt);
diff --git a/src/H5Tarray.c b/src/H5Tarray.c
index f7cddb9..714ecc9 100644
--- a/src/H5Tarray.c
+++ b/src/H5Tarray.c
@@ -94,7 +94,7 @@ DESCRIPTION
static herr_t
H5T_init_array_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_array_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_array_interface() */
@@ -127,7 +127,7 @@ H5Tarray_create2(hid_t base_id, unsigned ndims, const hsize_t dim[/* ndims */])
unsigned u; /* local index variable */
hid_t ret_value; /* return value */
- FUNC_ENTER_API(H5Tarray_create2, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("i", "iIu*h", base_id, ndims, dim);
/* Check args */
@@ -182,7 +182,7 @@ H5T_array_create(H5T_t *base, unsigned ndims, const hsize_t dim[/* ndims */])
H5T_t *ret_value; /* new array data type */
unsigned u; /* local index variable */
- FUNC_ENTER_NOAPI(H5T_array_create, NULL)
+ FUNC_ENTER_NOAPI(NULL)
HDassert(base);
HDassert(ndims <= H5S_MAX_RANK);
@@ -239,7 +239,7 @@ H5Tget_array_ndims(hid_t type_id)
H5T_t *dt; /* pointer to array datatype */
int ret_value; /* return value */
- FUNC_ENTER_API(H5Tget_array_ndims, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Is", "i", type_id);
/* Check args */
@@ -273,7 +273,7 @@ done:
int
H5T_get_array_ndims(const H5T_t *dt)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_get_array_ndims)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(dt);
HDassert(dt->shared->type == H5T_ARRAY);
@@ -302,7 +302,7 @@ H5Tget_array_dims2(hid_t type_id, hsize_t dims[])
H5T_t *dt; /* pointer to array data type */
int ret_value; /* return value */
- FUNC_ENTER_API(H5Tget_array_dims2, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("Is", "i*h", type_id, dims);
/* Check args */
@@ -339,7 +339,7 @@ H5T_get_array_dims(const H5T_t *dt, hsize_t dims[])
unsigned u; /* Local index variable */
int ret_value; /* return value */
- FUNC_ENTER_NOAPI(H5T_get_array_dims, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(dt);
HDassert(dt->shared->type == H5T_ARRAY);
@@ -386,7 +386,7 @@ H5Tarray_create1(hid_t base_id, int ndims, const hsize_t dim[/* ndims */],
unsigned u; /* local index variable */
hid_t ret_value; /* return value */
- FUNC_ENTER_API(H5Tarray_create1, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("i", "iIs*h*Is", base_id, ndims, dim, perm);
/* Check args */
@@ -437,7 +437,7 @@ H5Tget_array_dims1(hid_t type_id, hsize_t dims[], int UNUSED perm[])
H5T_t *dt; /* Array datatype to query */
int ret_value; /* return value */
- FUNC_ENTER_API(H5Tget_array_dims1, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("Is", "i*h*Is", type_id, dims, perm);
/* Check args */
diff --git a/src/H5Tbit.c b/src/H5Tbit.c
index a52d538..c9a9446 100644
--- a/src/H5Tbit.c
+++ b/src/H5Tbit.c
@@ -185,7 +185,7 @@ H5T_bit_shift(uint8_t *buf, ssize_t shift_dist, size_t offset, size_t size)
H5WB_t *wb = NULL; /* Wrapped buffer for temporary buffer */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_bit_shift, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(buf);
@@ -259,7 +259,7 @@ H5T_bit_get_d(uint8_t *buf, size_t offset, size_t size)
size_t i, hs;
uint64_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5T_bit_get_d)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(8 * sizeof(val) >= size);
@@ -417,8 +417,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_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_bit_find)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Some functions call this with value=TRUE */
HDassert(TRUE == 1);
@@ -522,8 +522,8 @@ H5T_bit_inc(uint8_t *buf, size_t start, size_t size)
unsigned carry = 1;
unsigned acc, mask;
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_bit_inc)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(buf);
@@ -593,8 +593,8 @@ H5T_bit_dec(uint8_t *buf, size_t start, size_t size)
uint8_t tmp;
unsigned borrow = 0;
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_bit_dec)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(buf);
HDassert(size);
@@ -668,8 +668,8 @@ H5T_bit_neg(uint8_t *buf, size_t start, size_t size)
size_t pos = start % 8;
uint8_t tmp[1];
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_bit_neg);
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(buf);
HDassert(size);
diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c
index 26f021d..a49d66e 100644
--- a/src/H5Tcommit.c
+++ b/src/H5Tcommit.c
@@ -99,7 +99,7 @@ DESCRIPTION
static herr_t
H5T_init_commit_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_commit_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_commit_interface() */
@@ -126,7 +126,7 @@ H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id,
H5T_t *type; /* Datatype for ID */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tcommit2, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "i*siiii", loc_id, name, type_id, lcpl_id, tcpl_id, tapl_id);
/* Check arguments */
@@ -159,7 +159,7 @@ H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id,
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not datatype access property list")
/* Commit the type */
- if(H5T_commit_named(&loc, name, type, lcpl_id, tcpl_id, tapl_id, H5AC_dxpl_id) < 0)
+ if(H5T__commit_named(&loc, name, type, lcpl_id, tcpl_id, tapl_id, H5AC_dxpl_id) < 0)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype")
done:
@@ -168,7 +168,7 @@ done:
/*-------------------------------------------------------------------------
- * Function: H5T_commit_named
+ * Function: H5T__commit_named
*
* Purpose: Internal routine to save a transient datatype to a file and
* turn the type ID into a "named", immutable type.
@@ -181,7 +181,7 @@ done:
*-------------------------------------------------------------------------
*/
herr_t
-H5T_commit_named(const H5G_loc_t *loc, const char *name, H5T_t *dt,
+H5T__commit_named(const H5G_loc_t *loc, const char *name, H5T_t *dt,
hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t dxpl_id)
{
H5O_obj_create_t ocrt_info; /* Information for object creation */
@@ -189,7 +189,7 @@ H5T_commit_named(const H5G_loc_t *loc, const char *name, H5T_t *dt,
H5T_state_t old_state = H5T_STATE_TRANSIENT; /* The state of the datatype before H5T_commit. */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5T_commit_named)
+ FUNC_ENTER_PACKAGE
/* Sanity checks */
HDassert(loc);
@@ -246,7 +246,7 @@ done:
} /* end if */
FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5T_commit_named() */
+} /* end H5T__commit_named() */
/*-------------------------------------------------------------------------
@@ -275,7 +275,7 @@ H5Tcommit_anon(hid_t loc_id, hid_t type_id, hid_t tcpl_id, hid_t tapl_id)
H5T_t *type = NULL; /* Datatype created */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tcommit_anon, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "iiii", loc_id, type_id, tcpl_id, tapl_id);
/* Check arguments */
@@ -342,7 +342,7 @@ H5T_commit(H5F_t *file, H5T_t *type, hid_t tcpl_id, hid_t dxpl_id)
size_t dtype_size; /* Size of the datatype message */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5T_commit)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(file);
HDassert(type);
@@ -462,7 +462,7 @@ H5Tcommitted(hid_t type_id)
H5T_t *type; /* Datatype to query */
htri_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tcommitted, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("t", "i", type_id);
/* Check arguments */
@@ -493,7 +493,7 @@ htri_t
H5T_committed(const H5T_t *type)
{
/* Use no-init for efficiency */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_committed)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(type);
@@ -520,7 +520,7 @@ H5T_link(const H5T_t *type, int adjust, hid_t dxpl_id)
{
int ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5T_link, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(type);
HDassert(type->sh_loc.type == H5O_SHARE_TYPE_COMMITTED);
@@ -561,7 +561,7 @@ H5Topen2(hid_t loc_id, const char *name, hid_t tapl_id)
hid_t dxpl_id = H5AC_dxpl_id; /* dxpl to use to open datatype */
hid_t ret_value = FAIL; /* Return value */
- FUNC_ENTER_API(H5Topen2, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("i", "i*si", loc_id, name, tapl_id);
/* Check args */
@@ -643,7 +643,7 @@ H5Tget_create_plist(hid_t dtype_id)
herr_t status; /* Generic status value */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tget_create_plist, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", dtype_id);
/* Check arguments */
@@ -707,7 +707,7 @@ H5T_open(const H5G_loc_t *loc, hid_t dxpl_id)
H5T_t *dt = NULL;
H5T_t *ret_value;
- FUNC_ENTER_NOAPI(H5T_open, NULL)
+ FUNC_ENTER_NOAPI(NULL)
HDassert(loc);
@@ -823,7 +823,7 @@ H5T_open_oid(const H5G_loc_t *loc, hid_t dxpl_id)
H5T_t *dt = NULL; /* Datatype from the file */
H5T_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5T_open_oid)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(loc);
@@ -876,7 +876,7 @@ done:
herr_t
H5T_update_shared(H5T_t *dt)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_update_shared)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(dt);
diff --git a/src/H5Tcompound.c b/src/H5Tcompound.c
index 48192d2..e7142e5 100644
--- a/src/H5Tcompound.c
+++ b/src/H5Tcompound.c
@@ -93,7 +93,7 @@ DESCRIPTION
static herr_t
H5T_init_compound_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_compound_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_compound_interface() */
@@ -125,7 +125,7 @@ H5Tget_member_offset(hid_t type_id, unsigned membno)
H5T_t *dt; /* Datatype to query */
size_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tget_member_offset, 0)
+ FUNC_ENTER_API(0)
H5TRACE2("z", "iIu", type_id, membno);
/* Check args */
@@ -164,7 +164,7 @@ done:
size_t
H5T_get_member_offset(const H5T_t *dt, unsigned membno)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_get_member_offset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(dt);
HDassert(membno < dt->shared->u.compnd.nmembs);
@@ -195,7 +195,7 @@ H5Tget_member_class(hid_t type_id, unsigned membno)
H5T_t *dt; /* Datatype to query */
H5T_class_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tget_member_class, H5T_NO_CLASS)
+ FUNC_ENTER_API(H5T_NO_CLASS)
H5TRACE2("Tt", "iIu", type_id, membno);
/* Check args */
@@ -239,7 +239,7 @@ H5Tget_member_type(hid_t type_id, unsigned membno)
H5T_t *memb_dt = NULL; /* Member datatype */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tget_member_type, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("i", "iIu", type_id, membno);
/* Check args */
@@ -283,7 +283,7 @@ H5T_get_member_type(const H5T_t *dt, unsigned membno, H5T_copy_t method)
{
H5T_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5T_get_member_type, NULL)
+ FUNC_ENTER_NOAPI(NULL)
HDassert(dt);
HDassert(membno < dt->shared->u.compnd.nmembs);
@@ -313,7 +313,7 @@ done:
size_t
H5T_get_member_size(const H5T_t *dt, unsigned membno)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_get_member_size)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(dt);
HDassert(membno < dt->shared->u.compnd.nmembs);
@@ -354,7 +354,7 @@ H5Tinsert(hid_t parent_id, const char *name, size_t offset, hid_t member_id)
H5T_t *member; /* The member datatype */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tinsert, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*szi", parent_id, name, offset, member_id);
/* Check args */
@@ -399,7 +399,7 @@ H5Tpack(hid_t type_id)
H5T_t *dt; /* Datatype to modify */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tpack, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "i", type_id);
/* Check args */
@@ -438,7 +438,7 @@ H5T_insert(H5T_t *parent, const char *name, size_t offset, const H5T_t *member)
unsigned i; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_insert, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* check args */
HDassert(parent && H5T_COMPOUND == parent->shared->type);
@@ -530,7 +530,7 @@ H5T_pack(const H5T_t *dt)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5T_pack)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(dt);
@@ -607,7 +607,7 @@ H5T_is_packed(const H5T_t *dt)
{
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_is_packed)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(dt);
@@ -646,7 +646,7 @@ H5T_update_packed(const H5T_t *dt)
{
unsigned i; /* Index */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_update_packed)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(dt);
HDassert(dt->shared->type == H5T_COMPOUND);
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 3209d3e..cdfaa0d 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -601,7 +601,13 @@
}
/* The main part of every integer hardware conversion macro */
-#define H5T_CONV(GUTS,STYPE,DTYPE,ST,DT,D_MIN,D_MAX) { \
+#define H5T_CONV(GUTS,STYPE,DTYPE,ST,DT,D_MIN,D_MAX) \
+{ \
+ herr_t ret_value=SUCCEED; /* Return value */ \
+ \
+ FUNC_ENTER_NOAPI(FAIL) \
+ \
+{ \
size_t elmtno; /*element number */ \
size_t sprec; /*source precision */ \
size_t dprec; /*destination precision */ \
@@ -745,6 +751,10 @@
HGOTO_ERROR(H5E_DATATYPE, H5E_UNSUPPORTED, FAIL, \
"unknown conversion command"); \
} \
+} \
+ \
+done: \
+ FUNC_LEAVE_NOAPI(ret_value) \
}
/* Macro defining action on source data which needs to be aligned (before main action) */
@@ -955,7 +965,7 @@ DESCRIPTION
static herr_t
H5T_init_conv_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_conv_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_conv_interface() */
@@ -982,7 +992,7 @@ H5T_conv_noop(hid_t UNUSED src_id, hid_t UNUSED dst_id, H5T_cdata_t *cdata,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_conv_noop, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
switch(cdata->command) {
case H5T_CONV_INIT:
@@ -1035,7 +1045,7 @@ H5T_conv_order_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t i;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_conv_order_opt, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
switch(cdata->command) {
case H5T_CONV_INIT:
@@ -1443,7 +1453,7 @@ H5T_conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
size_t j, md;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_conv_order, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
switch(cdata->command) {
case H5T_CONV_INIT:
@@ -1548,7 +1558,7 @@ H5T_conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
hbool_t reverse; /*if reverse the order of destination */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_conv_b_b, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
switch(cdata->command) {
case H5T_CONV_INIT:
@@ -1774,7 +1784,7 @@ H5T_conv_struct_free(H5T_conv_struct_t *priv)
*dst_memb_id = priv->dst_memb_id;
unsigned i;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_conv_struct_free)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
for(i = 0; i < priv->src_nmembs; i++)
if(src2dst[i] >= 0) {
@@ -1852,7 +1862,7 @@ H5T_conv_struct_init(H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata, hid_t dxpl_id)
unsigned i, j;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5T_conv_struct_init)
+ FUNC_ENTER_NOAPI_NOINIT
src_nmembs = src->shared->u.compnd.nmembs;
dst_nmembs = dst->shared->u.compnd.nmembs;
@@ -2017,7 +2027,7 @@ H5T_conv_struct_subset(const H5T_cdata_t *cdata)
{
H5T_conv_struct_t *priv;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_conv_struct_subset)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
HDassert(cdata);
HDassert(cdata->priv);
@@ -2088,7 +2098,7 @@ H5T_conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
H5T_conv_struct_t *priv = (H5T_conv_struct_t *)(cdata->priv);
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_conv_struct, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
switch(cdata->command) {
case H5T_CONV_INIT:
@@ -2338,7 +2348,7 @@ H5T_conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
int i; /*counters */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_conv_struct_opt, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
switch(cdata->command) {
case H5T_CONV_INIT:
@@ -2570,7 +2580,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_NOAPI_NOINIT(H5T_conv_enum_init)
+ FUNC_ENTER_NOAPI_NOINIT
cdata->need_bkg = H5T_BKG_NO;
if(NULL == (priv = (H5T_enum_struct_t *)(cdata->priv = H5MM_calloc(sizeof(*priv)))))
@@ -2719,7 +2729,7 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
size_t i; /*counters */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_conv_enum, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
switch(cdata->command) {
case H5T_CONV_INIT:
@@ -2949,7 +2959,7 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
size_t elmtno; /*element number counter */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_conv_vlen, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
switch(cdata->command) {
case H5T_CONV_INIT:
@@ -3257,7 +3267,7 @@ H5T_conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
void *bkg_buf = NULL; /*temporary background buffer */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_conv_array, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
switch (cdata->command) {
case H5T_CONV_INIT:
@@ -3422,7 +3432,7 @@ H5T_conv_i_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
hbool_t reverse; /*if reverse the order of destination */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_conv_i_i, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
switch(cdata->command) {
case H5T_CONV_INIT:
@@ -3844,7 +3854,7 @@ H5T_conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
hbool_t reverse; /*if reverse the order of destination */
herr_t ret_value = SUCCEED; /*return value */
- FUNC_ENTER_NOAPI(H5T_conv_f_f, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
switch(cdata->command) {
case H5T_CONV_INIT:
@@ -4389,7 +4399,7 @@ H5T_conv_s_s(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
uint8_t *dbuf=NULL; /*temp buf for overlap convers. */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_conv_s_s, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
switch(cdata->command) {
case H5T_CONV_INIT:
@@ -4607,14 +4617,7 @@ H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_schar_uchar, FAIL)
-
H5T_CONV_su(SCHAR, UCHAR, signed char, unsigned char, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -4640,14 +4643,7 @@ H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uchar_schar, FAIL)
-
H5T_CONV_us(UCHAR, SCHAR, unsigned char, signed char, -, SCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -4673,14 +4669,7 @@ H5T_conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_schar_short, FAIL)
-
H5T_CONV_sS(SCHAR, SHORT, signed char, short, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -4706,14 +4695,7 @@ H5T_conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_schar_ushort, FAIL)
-
H5T_CONV_sU(SCHAR, USHORT, signed char, unsigned short, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -4739,14 +4721,7 @@ H5T_conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uchar_short, FAIL)
-
H5T_CONV_uS(UCHAR, SHORT, unsigned char, short, -, SHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -4772,14 +4747,7 @@ H5T_conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uchar_ushort, FAIL)
-
H5T_CONV_uU(UCHAR, USHORT, unsigned char, unsigned short, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -4804,14 +4772,7 @@ H5T_conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_schar_int, FAIL)
-
H5T_CONV_sS(SCHAR, INT, signed char, int, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -4836,14 +4797,7 @@ H5T_conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_schar_uint, FAIL)
-
H5T_CONV_sU(SCHAR, UINT, signed char, unsigned, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -4868,14 +4822,7 @@ H5T_conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uchar_int, FAIL)
-
H5T_CONV_uS(UCHAR, INT, unsigned char, int, -, INT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -4900,14 +4847,7 @@ H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uchar_uint, FAIL)
-
H5T_CONV_uU(UCHAR, UINT, unsigned char, unsigned, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -4932,14 +4872,7 @@ H5T_conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_schar_long, FAIL)
-
H5T_CONV_sS(SCHAR, LONG, signed char, long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -4965,14 +4898,7 @@ H5T_conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_schar_ulong, FAIL)
-
H5T_CONV_sU(SCHAR, ULONG, signed char, unsigned long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -4997,14 +4923,7 @@ H5T_conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uchar_long, FAIL)
-
H5T_CONV_uS(UCHAR, LONG, unsigned char, long, -, LONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5030,14 +4949,7 @@ H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uchar_ulong, FAIL)
-
H5T_CONV_uU(UCHAR, ULONG, unsigned char, unsigned long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5063,14 +4975,7 @@ H5T_conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_schar_llong, FAIL)
-
H5T_CONV_sS(SCHAR, LLONG, signed char, long long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5096,14 +5001,7 @@ H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_schar_ullong, FAIL)
-
H5T_CONV_sU(SCHAR, ULLONG, signed char, unsigned long long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5129,14 +5027,7 @@ H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uchar_llong, FAIL)
-
H5T_CONV_uS(UCHAR, LLONG, unsigned char, long long, -, LLONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5162,14 +5053,7 @@ H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uchar_ullong, FAIL)
-
H5T_CONV_uU(UCHAR, ULLONG, unsigned char, unsigned long long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5195,14 +5079,7 @@ H5T_conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_short_schar, FAIL)
-
H5T_CONV_Ss(SHORT, SCHAR, short, signed char, SCHAR_MIN, SCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5228,14 +5105,7 @@ H5T_conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_short_uchar, FAIL)
-
H5T_CONV_Su(SHORT, UCHAR, short, unsigned char, -, UCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5261,14 +5131,7 @@ H5T_conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ushort_schar, FAIL)
-
H5T_CONV_Us(USHORT, SCHAR, unsigned short, signed char, -, SCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5294,14 +5157,7 @@ H5T_conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ushort_uchar, FAIL)
-
H5T_CONV_Uu(USHORT, UCHAR, unsigned short, unsigned char, -, UCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5327,14 +5183,7 @@ H5T_conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_short_ushort, FAIL)
-
H5T_CONV_su(SHORT, USHORT, short, unsigned short, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5360,14 +5209,7 @@ H5T_conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ushort_short, FAIL)
-
H5T_CONV_us(USHORT, SHORT, unsigned short, short, -, SHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5393,14 +5235,7 @@ H5T_conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_short_int, FAIL)
-
H5T_CONV_sS(SHORT, INT, short, int, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5426,14 +5261,7 @@ H5T_conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_short_uint, FAIL)
-
H5T_CONV_sU(SHORT, UINT, short, unsigned, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5459,14 +5287,7 @@ H5T_conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ushort_int, FAIL)
-
H5T_CONV_uS(USHORT, INT, unsigned short, int, -, INT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5492,14 +5313,7 @@ H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ushort_uint, FAIL)
-
H5T_CONV_uU(USHORT, UINT, unsigned short, unsigned, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5525,14 +5339,7 @@ H5T_conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_short_long, FAIL)
-
H5T_CONV_sS(SHORT, LONG, short, long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5558,14 +5365,7 @@ H5T_conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_short_ulong, FAIL)
-
H5T_CONV_sU(SHORT, ULONG, short, unsigned long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5591,14 +5391,7 @@ H5T_conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ushort_long, FAIL)
-
H5T_CONV_uS(USHORT, LONG, unsigned short, long, -, LONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5624,14 +5417,7 @@ H5T_conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ushort_ulong, FAIL)
-
H5T_CONV_uU(USHORT, ULONG, unsigned short, unsigned long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5657,14 +5443,7 @@ H5T_conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_short_llong, FAIL)
-
H5T_CONV_sS(SHORT, LLONG, short, long long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5690,14 +5469,7 @@ H5T_conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_short_ullong, FAIL)
-
H5T_CONV_sU(SHORT, ULLONG, short, unsigned long long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5723,14 +5495,7 @@ H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ushort_llong, FAIL)
-
H5T_CONV_uS(USHORT, LLONG, unsigned short, long long, -, LLONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5756,14 +5521,7 @@ H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ushort_ullong, FAIL)
-
H5T_CONV_uU(USHORT, ULLONG, unsigned short, unsigned long long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5789,14 +5547,7 @@ H5T_conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_int_schar, FAIL)
-
H5T_CONV_Ss(INT, SCHAR, int, signed char, SCHAR_MIN, SCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5822,14 +5573,7 @@ H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_int_uchar, FAIL)
-
H5T_CONV_Su(INT, UCHAR, int, unsigned char, -, UCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5855,14 +5599,7 @@ H5T_conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uint_schar, FAIL)
-
H5T_CONV_Us(UINT, SCHAR, unsigned, signed char, -, SCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5888,14 +5625,7 @@ H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uint_uchar, FAIL)
-
H5T_CONV_Uu(UINT, UCHAR, unsigned, unsigned char, -, UCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5921,14 +5651,7 @@ H5T_conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_int_short, FAIL)
-
H5T_CONV_Ss(INT, SHORT, int, short, SHRT_MIN, SHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5954,14 +5677,7 @@ H5T_conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_int_ushort, FAIL)
-
H5T_CONV_Su(INT, USHORT, int, unsigned short, -, USHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -5987,14 +5703,7 @@ H5T_conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uint_short, FAIL)
-
H5T_CONV_Us(UINT, SHORT, unsigned, short, -, SHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6020,14 +5729,7 @@ H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uint_ushort, FAIL)
-
H5T_CONV_Uu(UINT, USHORT, unsigned, unsigned short, -, USHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6052,14 +5754,7 @@ H5T_conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_int_uint, FAIL)
-
H5T_CONV_su(INT, UINT, int, unsigned, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6084,14 +5779,7 @@ H5T_conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uint_int, FAIL)
-
H5T_CONV_us(UINT, INT, unsigned, int, -, INT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6116,14 +5804,7 @@ H5T_conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_int_long, FAIL)
-
H5T_CONV_sS(INT, LONG, int, long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6148,14 +5829,7 @@ H5T_conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_int_ulong, FAIL)
-
H5T_CONV_sU(INT, LONG, int, unsigned long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6180,14 +5854,7 @@ H5T_conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uint_long, FAIL)
-
H5T_CONV_uS(UINT, LONG, unsigned, long, -, LONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6212,14 +5879,7 @@ H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uint_ulong, FAIL)
-
H5T_CONV_uU(UINT, ULONG, unsigned, unsigned long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6244,14 +5904,7 @@ H5T_conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_int_llong, FAIL)
-
H5T_CONV_sS(INT, LLONG, int, long long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6276,14 +5929,7 @@ H5T_conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_int_ullong, FAIL)
-
H5T_CONV_sU(INT, ULLONG, int, unsigned long long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6308,14 +5954,7 @@ H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uint_llong, FAIL)
-
H5T_CONV_uS(UINT, LLONG, unsigned, long long, -, LLONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6341,14 +5980,7 @@ H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uint_ullong, FAIL)
-
H5T_CONV_uU(UINT, ULLONG, unsigned, unsigned long long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6373,14 +6005,7 @@ H5T_conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_long_schar, FAIL)
-
H5T_CONV_Ss(LONG, SCHAR, long, signed char, SCHAR_MIN, SCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6405,14 +6030,7 @@ H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_long_uchar, FAIL)
-
H5T_CONV_Su(LONG, UCHAR, long, unsigned char, -, UCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6438,14 +6056,7 @@ H5T_conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ulong_schar, FAIL)
-
H5T_CONV_Us(ULONG, SCHAR, unsigned long, signed char, -, SCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6471,14 +6082,7 @@ H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ulong_uchar, FAIL)
-
H5T_CONV_Uu(ULONG, UCHAR, unsigned long, unsigned char, -, UCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6503,14 +6107,7 @@ H5T_conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_long_short, FAIL)
-
H5T_CONV_Ss(LONG, SHORT, long, short, SHRT_MIN, SHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6536,14 +6133,7 @@ H5T_conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_long_ushort, FAIL)
-
H5T_CONV_Su(LONG, USHORT, long, unsigned short, -, USHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6568,14 +6158,7 @@ H5T_conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ulong_short, FAIL)
-
H5T_CONV_Us(ULONG, SHORT, unsigned long, short, -, SHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6601,14 +6184,7 @@ H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ulong_ushort, FAIL)
-
H5T_CONV_Uu(ULONG, USHORT, unsigned long, unsigned short, -, USHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6633,14 +6209,7 @@ H5T_conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_long_int, FAIL)
-
H5T_CONV_Ss(LONG, INT, long, int, INT_MIN, INT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6665,14 +6234,7 @@ H5T_conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_long_uint, FAIL)
-
H5T_CONV_Su(LONG, UINT, long, unsigned, -, UINT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6697,14 +6259,7 @@ H5T_conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ulong_int, FAIL)
-
H5T_CONV_Us(ULONG, INT, unsigned long, int, -, INT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6729,14 +6284,7 @@ H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ulong_uint, FAIL)
-
H5T_CONV_Uu(ULONG, UINT, unsigned long, unsigned, -, UINT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6761,14 +6309,7 @@ H5T_conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_long_ulong, FAIL)
-
H5T_CONV_su(LONG, ULONG, long, unsigned long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6793,14 +6334,7 @@ H5T_conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ulong_long, FAIL)
-
H5T_CONV_us(ULONG, LONG, unsigned long, long, -, LONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6825,14 +6359,7 @@ H5T_conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_long_llong, FAIL)
-
H5T_CONV_sS(LONG, LLONG, long, long long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6858,14 +6385,7 @@ H5T_conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_long_ullong, FAIL)
-
H5T_CONV_sU(LONG, ULLONG, long, unsigned long long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6891,14 +6411,7 @@ H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ulong_llong, FAIL)
-
H5T_CONV_uS(ULONG, LLONG, unsigned long, long long, -, LLONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6924,14 +6437,7 @@ H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ulong_ullong, FAIL)
-
H5T_CONV_uU(ULONG, ULLONG, unsigned long, unsigned long long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6957,14 +6463,7 @@ H5T_conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_llong_schar, FAIL)
-
H5T_CONV_Ss(LLONG, SCHAR, long long, signed char, SCHAR_MIN, SCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -6990,14 +6489,7 @@ H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_llong_uchar, FAIL)
-
H5T_CONV_Su(LLONG, UCHAR, long long, unsigned char, -, UCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7023,14 +6515,7 @@ H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ullong_schar, FAIL)
-
H5T_CONV_Us(ULLONG, SCHAR, unsigned long long, signed char, -, SCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7056,14 +6541,7 @@ H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ullong_uchar, FAIL)
-
H5T_CONV_Uu(ULLONG, UCHAR, unsigned long long, unsigned char, -, UCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7089,14 +6567,7 @@ H5T_conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_llong_short, FAIL)
-
H5T_CONV_Ss(LLONG, SHORT, long long, short, SHRT_MIN, SHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7122,14 +6593,7 @@ H5T_conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_llong_ushort, FAIL)
-
H5T_CONV_Su(LLONG, USHORT, long long, unsigned short, -, USHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7155,14 +6619,7 @@ H5T_conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ullong_short, FAIL)
-
H5T_CONV_Us(ULLONG, SHORT, unsigned long long, short, -, SHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7188,14 +6645,7 @@ H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ullong_ushort, FAIL)
-
H5T_CONV_Uu(ULLONG, USHORT, unsigned long long, unsigned short, -, USHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7220,14 +6670,7 @@ H5T_conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_llong_int, FAIL)
-
H5T_CONV_Ss(LLONG, INT, long long, int, INT_MIN, INT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7252,14 +6695,7 @@ H5T_conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_llong_uint, FAIL)
-
H5T_CONV_Su(LLONG, UINT, long long, unsigned, -, UINT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7284,14 +6720,7 @@ H5T_conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ullong_int, FAIL)
-
H5T_CONV_Us(ULLONG, INT, unsigned long long, int, -, INT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7317,14 +6746,7 @@ H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ullong_uint, FAIL)
-
H5T_CONV_Uu(ULLONG, UINT, unsigned long long, unsigned, -, UINT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7349,14 +6771,7 @@ H5T_conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride,
void *buf, void UNUSED *bkg, hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_llong_long, FAIL)
-
H5T_CONV_Ss(LLONG, LONG, long long, long, LONG_MIN, LONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7382,14 +6797,7 @@ H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_llong_ulong, FAIL)
-
H5T_CONV_Su(LLONG, ULONG, long long, unsigned long, -, ULONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7415,14 +6823,7 @@ H5T_conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ullong_long, FAIL)
-
H5T_CONV_Us(ULLONG, LONG, unsigned long long, long, -, LONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7448,14 +6849,7 @@ H5T_conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ullong_ulong, FAIL)
-
H5T_CONV_Uu(ULLONG, ULONG, unsigned long long, unsigned long, -, ULONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7481,14 +6875,7 @@ H5T_conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_llong_ullong, FAIL)
-
H5T_CONV_su(LLONG, ULLONG, long long, unsigned long long, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7514,14 +6901,7 @@ H5T_conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ullong_llong, FAIL)
-
H5T_CONV_us(ULLONG, LLONG, unsigned long long, long long, -, LLONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7551,14 +6931,7 @@ H5T_conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_float_double, FAIL)
-
H5T_CONV_fF(FLOAT, DOUBLE, float, double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_FP_FP */
@@ -7585,14 +6958,7 @@ H5T_conv_float_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_float_ldouble, FAIL)
-
H5T_CONV_fF(FLOAT, LDOUBLE, float, long double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /*H5T_CONV_INTERNAL_FP_LDOUBLE*/
@@ -7626,14 +6992,7 @@ H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_double_float, FAIL)
-
H5T_CONV_Ff(DOUBLE, FLOAT, double, float, -FLT_MAX, FLT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /*H5T_CONV_INTERNAL_FP_FP*/
@@ -7660,15 +7019,7 @@ H5T_conv_double_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_double_ldouble, FAIL)
-
H5T_CONV_fF(DOUBLE, LDOUBLE, double, long double, -, -);
-
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /*H5T_CONV_INTERNAL_FP_LDOUBLE*/
@@ -7695,14 +7046,7 @@ H5T_conv_ldouble_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ldouble_float, FAIL)
-
H5T_CONV_Ff(LDOUBLE, FLOAT, long double, float, -FLT_MAX, FLT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_FP_LDOUBLE */
@@ -7729,14 +7073,7 @@ H5T_conv_ldouble_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ldouble_double, FAIL)
-
H5T_CONV_Ff(LDOUBLE, DOUBLE, long double, double, -DBL_MAX, DBL_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /*H5T_CONV_INTERNAL_FP_LDOUBLE*/
@@ -7762,14 +7099,7 @@ H5T_conv_schar_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_schar_float, FAIL)
-
H5T_CONV_xF(SCHAR, FLOAT, signed char, float, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7794,14 +7124,7 @@ H5T_conv_schar_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_schar_double, FAIL)
-
H5T_CONV_xF(SCHAR, DOUBLE, signed char, double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7827,14 +7150,7 @@ H5T_conv_schar_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_schar_ldouble, FAIL)
-
H5T_CONV_xF(SCHAR, LDOUBLE, signed char, long double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_INTEGER_LDOUBLE */
@@ -7860,14 +7176,7 @@ H5T_conv_uchar_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uchar_float, FAIL)
-
H5T_CONV_xF(UCHAR, FLOAT, unsigned char, float, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7892,14 +7201,7 @@ H5T_conv_uchar_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uchar_double, FAIL)
-
H5T_CONV_xF(UCHAR, DOUBLE, unsigned char, double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7925,14 +7227,7 @@ H5T_conv_uchar_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uchar_ldouble, FAIL)
-
H5T_CONV_xF(UCHAR, LDOUBLE, unsigned char, long double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_INTEGER_LDOUBLE */
@@ -7958,14 +7253,7 @@ H5T_conv_short_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_short_float, FAIL)
-
H5T_CONV_xF(SHORT, FLOAT, short, float, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -7990,14 +7278,7 @@ H5T_conv_short_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_short_double, FAIL)
-
H5T_CONV_xF(SHORT, DOUBLE, short, double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -8023,14 +7304,7 @@ H5T_conv_short_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_short_ldouble, FAIL)
-
H5T_CONV_xF(SHORT, LDOUBLE, short, long double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_INTEGER_LDOUBLE */
@@ -8056,14 +7330,7 @@ H5T_conv_ushort_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ushort_float, FAIL)
-
H5T_CONV_xF(USHORT, FLOAT, unsigned short, float, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -8088,14 +7355,7 @@ H5T_conv_ushort_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ushort_double, FAIL)
-
H5T_CONV_xF(USHORT, DOUBLE, unsigned short, double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -8121,14 +7381,7 @@ H5T_conv_ushort_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ushort_ldouble, FAIL)
-
H5T_CONV_xF(USHORT, LDOUBLE, unsigned short, long double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_INTEGER_LDOUBLE */
@@ -8154,14 +7407,7 @@ H5T_conv_int_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_int_float, FAIL)
-
H5T_CONV_xF(INT, FLOAT, int, float, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -8186,14 +7432,7 @@ H5T_conv_int_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_int_double, FAIL)
-
H5T_CONV_xF(INT, DOUBLE, int, double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -8219,14 +7458,7 @@ H5T_conv_int_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_int_ldouble, FAIL)
-
H5T_CONV_xF(INT, LDOUBLE, int, long double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_INTEGER_LDOUBLE */
@@ -8252,14 +7484,7 @@ H5T_conv_uint_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uint_float, FAIL)
-
H5T_CONV_xF(UINT, FLOAT, unsigned int, float, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -8284,14 +7509,7 @@ H5T_conv_uint_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uint_double, FAIL)
-
H5T_CONV_xF(UINT, DOUBLE, unsigned int, double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -8317,14 +7535,7 @@ H5T_conv_uint_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_uint_ldouble, FAIL)
-
H5T_CONV_xF(UINT, LDOUBLE, unsigned int, long double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_INTEGER_LDOUBLE */
@@ -8350,14 +7561,7 @@ H5T_conv_long_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_long_float, FAIL)
-
H5T_CONV_xF(LONG, FLOAT, long, float, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -8382,14 +7586,7 @@ H5T_conv_long_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_long_double, FAIL)
-
H5T_CONV_xF(LONG, DOUBLE, long, double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -8415,14 +7612,7 @@ H5T_conv_long_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_long_ldouble, FAIL)
-
H5T_CONV_xF(LONG, LDOUBLE, long, long double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_INTEGER_LDOUBLE */
@@ -8449,14 +7639,7 @@ H5T_conv_ulong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ulong_float, FAIL)
-
H5T_CONV_xF(ULONG, FLOAT, unsigned long, float, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_ULONG_FLT */
@@ -8483,14 +7666,7 @@ H5T_conv_ulong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ulong_double, FAIL)
-
H5T_CONV_xF(ULONG, DOUBLE, unsigned long, double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_ULONG_DBL */
@@ -8517,14 +7693,7 @@ H5T_conv_ulong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ulong_ldouble, FAIL)
-
H5T_CONV_xF(ULONG, LDOUBLE, unsigned long, long double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_ULONG_LDOUBLE */
@@ -8550,14 +7719,7 @@ H5T_conv_llong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_llong_float, FAIL)
-
H5T_CONV_xF(LLONG, FLOAT, long long, float, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -8582,14 +7744,7 @@ H5T_conv_llong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_llong_double, FAIL)
-
H5T_CONV_xF(LLONG, DOUBLE, long long, double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -8615,14 +7770,7 @@ H5T_conv_llong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_llong_ldouble, FAIL)
-
H5T_CONV_xF(LLONG, LDOUBLE, long long, long double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_LLONG_LDOUBLE */
@@ -8649,14 +7797,7 @@ H5T_conv_ullong_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ullong_float, FAIL)
-
H5T_CONV_xF(ULLONG, FLOAT, unsigned long long, float, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /*H5T_CONV_INTERNAL_ULLONG_FP*/
@@ -8683,14 +7824,7 @@ H5T_conv_ullong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ullong_double, FAIL)
-
H5T_CONV_xF(ULLONG, DOUBLE, unsigned long long, double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /*H5T_CONV_INTERNAL_ULLONG_FP*/
@@ -8717,14 +7851,7 @@ H5T_conv_ullong_ldouble (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ullong_ldouble, FAIL)
-
H5T_CONV_xF(ULLONG, LDOUBLE, unsigned long long, long double, -, -);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /*H5T_CONV_INTERNAL_ULLONG_LDOUBLE*/
@@ -8750,14 +7877,7 @@ H5T_conv_float_schar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_float_schar, FAIL)
-
H5T_CONV_Fx(FLOAT, SCHAR, float, signed char, SCHAR_MIN, SCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -8782,14 +7902,7 @@ H5T_conv_float_uchar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_float_uchar, FAIL)
-
H5T_CONV_Fx(FLOAT, UCHAR, float, unsigned char, 0, UCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -8814,14 +7927,7 @@ H5T_conv_double_schar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_double_schar, FAIL)
-
H5T_CONV_Fx(DOUBLE, SCHAR, double, signed char, SCHAR_MIN, SCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -8846,14 +7952,7 @@ H5T_conv_double_uchar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_double_uchar, FAIL)
-
H5T_CONV_Fx(DOUBLE, UCHAR, double, unsigned char, 0, UCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -8879,14 +7978,7 @@ H5T_conv_ldouble_schar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ldouble_schar, FAIL)
-
H5T_CONV_Fx(LDOUBLE, SCHAR, long double, signed char, SCHAR_MIN, SCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_LDOUBLE_INTEGER */
@@ -8913,14 +8005,7 @@ H5T_conv_ldouble_uchar (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ldouble_uchar, FAIL)
-
H5T_CONV_Fx(LDOUBLE, UCHAR, long double, unsigned char, 0, UCHAR_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_LDOUBLE_INTEGER */
@@ -8946,14 +8031,7 @@ H5T_conv_float_short (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_float_short, FAIL)
-
H5T_CONV_Fx(FLOAT, SHORT, float, short, SHRT_MIN, SHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -8978,14 +8056,7 @@ H5T_conv_float_ushort (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_float_ushort, FAIL)
-
H5T_CONV_Fx(FLOAT, USHORT, float, unsigned short, 0, USHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -9010,14 +8081,7 @@ H5T_conv_double_short (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_double_short, FAIL)
-
H5T_CONV_Fx(DOUBLE, SHORT, double, short, SHRT_MIN, SHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -9042,14 +8106,7 @@ H5T_conv_double_ushort (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_double_ushort, FAIL)
-
H5T_CONV_Fx(DOUBLE, USHORT, double, unsigned short, 0, USHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -9075,14 +8132,7 @@ H5T_conv_ldouble_short (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ldouble_short, FAIL)
-
H5T_CONV_Fx(LDOUBLE, SHORT, long double, short, SHRT_MIN, SHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /*H5T_CONV_INTERNAL_LDOUBLE_INTEGER*/
@@ -9109,14 +8159,7 @@ H5T_conv_ldouble_ushort (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ldouble_ushort, FAIL)
-
H5T_CONV_Fx(LDOUBLE, USHORT, long double, unsigned short, 0, USHRT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_LDOUBLE_INTEGER */
@@ -9142,14 +8185,7 @@ H5T_conv_float_int (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_float_int, FAIL)
-
H5T_CONV_Fx(FLOAT, INT, float, int, INT_MIN, INT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -9174,14 +8210,7 @@ H5T_conv_float_uint (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_float_uint, FAIL)
-
H5T_CONV_Fx(FLOAT, UINT, float, unsigned int, 0, UINT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -9206,14 +8235,7 @@ H5T_conv_double_int (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_double_int, FAIL)
-
H5T_CONV_Fx(DOUBLE, INT, double, int, INT_MIN, INT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -9238,14 +8260,7 @@ H5T_conv_double_uint (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_double_uint, FAIL)
-
H5T_CONV_Fx(DOUBLE, UINT, double, unsigned int, 0, UINT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -9271,14 +8286,7 @@ H5T_conv_ldouble_int (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ldouble_int, FAIL)
-
H5T_CONV_Fx(LDOUBLE, INT, long double, int, INT_MIN, INT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_LDOUBLE_INTEGER */
@@ -9305,14 +8313,7 @@ H5T_conv_ldouble_uint (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ldouble_uint, FAIL)
-
H5T_CONV_Fx(LDOUBLE, UINT, long double, unsigned int, 0, UINT_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_LDOUBLE_UINT */
@@ -9338,14 +8339,7 @@ H5T_conv_float_long (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_float_long, FAIL)
-
H5T_CONV_Fx(FLOAT, LONG, float, long, LONG_MIN, LONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -9370,14 +8364,7 @@ H5T_conv_float_ulong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_float_ulong, FAIL)
-
H5T_CONV_Fx(FLOAT, ULONG, float, unsigned long, 0, ULONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -9402,14 +8389,7 @@ H5T_conv_double_long (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_double_long, FAIL)
-
H5T_CONV_Fx(DOUBLE, LONG, double, long, LONG_MIN, LONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -9434,14 +8414,7 @@ H5T_conv_double_ulong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_double_ulong, FAIL)
-
H5T_CONV_Fx(DOUBLE, ULONG, double, unsigned long, 0, ULONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
@@ -9467,14 +8440,7 @@ H5T_conv_ldouble_long (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ldouble_long, FAIL)
-
H5T_CONV_Fx(LDOUBLE, LONG, long double, long, LONG_MIN, LONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /*H5T_CONV_INTERNAL_LDOUBLE_INTEGER*/
@@ -9501,14 +8467,7 @@ H5T_conv_ldouble_ulong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ldouble_ulong, FAIL)
-
H5T_CONV_Fx(LDOUBLE, ULONG, long double, unsigned long, 0, ULONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_LDOUBLE_INTEGER */
@@ -9535,14 +8494,7 @@ H5T_conv_float_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_float_llong, FAIL)
-
H5T_CONV_Fx(FLOAT, LLONG, float, long long, LLONG_MIN, LLONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /* H5T_CONV_INTERNAL_FP_LLONG */
@@ -9569,14 +8521,7 @@ H5T_conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_float_ullong, FAIL)
-
H5T_CONV_Fx(FLOAT, ULLONG, float, unsigned long long, 0, ULLONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /*H5T_CONV_INTERNAL_FP_ULLONG*/
@@ -9603,14 +8548,7 @@ H5T_conv_double_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_double_llong, FAIL)
-
H5T_CONV_Fx(DOUBLE, LLONG, double, long long, LLONG_MIN, LLONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /*H5T_CONV_INTERNAL_FP_LLONG*/
@@ -9637,14 +8575,7 @@ H5T_conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_double_ullong, FAIL)
-
H5T_CONV_Fx(DOUBLE, ULLONG, double, unsigned long long, 0, ULLONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /*H5T_CONV_INTERNAL_FP_ULLONG*/
@@ -9671,14 +8602,7 @@ H5T_conv_ldouble_llong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t UNUSED dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ldouble_llong, FAIL)
-
H5T_CONV_Fx(LDOUBLE, LLONG, long double, long long, LLONG_MIN, LLONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /*H5T_CONV_INTERNAL_LDOUBLE_LLONG*/
@@ -9705,14 +8629,7 @@ H5T_conv_ldouble_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg,
hid_t dxpl_id)
{
- herr_t ret_value=SUCCEED; /* Return value */
-
- FUNC_ENTER_NOAPI(H5T_conv_ldouble_ullong, FAIL)
-
H5T_CONV_Fx(LDOUBLE, ULLONG, long double, unsigned long long, 0, ULLONG_MAX);
-
-done:
- FUNC_LEAVE_NOAPI(ret_value)
}
#endif /*H5T_CONV_INTERNAL_LDOUBLE_ULLONG*/
@@ -9776,7 +8693,7 @@ H5T_conv_f_i(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
H5T_conv_ret_t except_ret; /*return of callback function */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_conv_f_i, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
switch(cdata->command) {
case H5T_CONV_INIT:
@@ -10365,7 +9282,7 @@ H5T_conv_i_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts,
hbool_t reverse; /*if reverse the order of destination */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_conv_i_f, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
switch(cdata->command) {
case H5T_CONV_INIT:
@@ -10760,7 +9677,7 @@ H5T_reverse_order(uint8_t *rev, uint8_t *s, size_t size, H5T_order_t order)
{
size_t i;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_reverse_order)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(s);
assert(size);
diff --git a/src/H5Tcset.c b/src/H5Tcset.c
index 4ec58ab..33fb32a 100644
--- a/src/H5Tcset.c
+++ b/src/H5Tcset.c
@@ -46,7 +46,7 @@ DESCRIPTION
static herr_t
H5T_init_cset_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_cset_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_cset_interface() */
@@ -78,7 +78,7 @@ H5Tget_cset(hid_t type_id)
H5T_t *dt;
H5T_cset_t ret_value;
- FUNC_ENTER_API(H5Tget_cset, H5T_CSET_ERROR)
+ FUNC_ENTER_API(H5T_CSET_ERROR)
H5TRACE1("Tc", "i", type_id);
/* Check args */
@@ -124,7 +124,7 @@ H5Tset_cset(hid_t type_id, H5T_cset_t cset)
H5T_t *dt;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tset_cset, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iTc", type_id, cset);
/* Check args */
diff --git a/src/H5Tdbg.c b/src/H5Tdbg.c
index 92ab674..c161f9f 100644
--- a/src/H5Tdbg.c
+++ b/src/H5Tdbg.c
@@ -109,7 +109,7 @@ H5T_print_stats(H5T_path_t UNUSED * path, int UNUSED * nprint/*in,out*/)
char bandwidth[32];
#endif
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_print_stats)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifdef H5T_DEBUG
if(H5DEBUG(T) && path->stats.ncalls > 0) {
@@ -166,7 +166,7 @@ H5T_debug(const H5T_t *dt, FILE *stream)
const char *s1 = "", *s2 = "";
unsigned i;
- FUNC_ENTER_NOAPI_NOFUNC(H5T_debug)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Check args */
HDassert(dt);
diff --git a/src/H5Tdeprec.c b/src/H5Tdeprec.c
index b3bd298..32080fe 100644
--- a/src/H5Tdeprec.c
+++ b/src/H5Tdeprec.c
@@ -101,7 +101,7 @@ DESCRIPTION
static herr_t
H5T_init_deprec_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_deprec_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_deprec_interface() */
@@ -129,7 +129,7 @@ H5Tcommit1(hid_t loc_id, const char *name, hid_t type_id)
H5T_t *type; /* Datatype for ID */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tcommit1, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*si", loc_id, name, type_id);
/* Check arguments */
@@ -141,7 +141,7 @@ H5Tcommit1(hid_t loc_id, const char *name, hid_t type_id)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype")
/* Commit the datatype to the file, using default property list values */
- if(H5T_commit_named(&loc, name, type, H5P_LINK_CREATE_DEFAULT,
+ if(H5T__commit_named(&loc, name, type, H5P_LINK_CREATE_DEFAULT,
H5P_DATATYPE_CREATE_DEFAULT, H5P_DATATYPE_ACCESS_DEFAULT, H5AC_dxpl_id) < 0)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype")
@@ -179,7 +179,7 @@ H5Topen1(hid_t loc_id, const char *name)
hid_t dxpl_id = H5AC_dxpl_id; /* dxpl to use to open datatype */
hid_t ret_value = FAIL;
- FUNC_ENTER_API(H5Topen1, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("i", "i*s", loc_id, name);
/* Check args */
diff --git a/src/H5Tenum.c b/src/H5Tenum.c
index 8ef88f5..1e3d760 100644
--- a/src/H5Tenum.c
+++ b/src/H5Tenum.c
@@ -53,7 +53,7 @@ DESCRIPTION
static herr_t
H5T_init_enum_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_enum_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_enum_interface() */
@@ -83,7 +83,7 @@ H5Tenum_create(hid_t parent_id)
H5T_t *dt = NULL; /*new enumeration data type */
hid_t ret_value; /*return value */
- FUNC_ENTER_API(H5Tenum_create, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", parent_id);
/* Check args */
@@ -125,7 +125,7 @@ H5T_enum_create(const H5T_t *parent)
{
H5T_t *ret_value; /*new enumeration data type */
- FUNC_ENTER_NOAPI(H5T_enum_create, NULL)
+ FUNC_ENTER_NOAPI(NULL)
assert(parent);
@@ -169,7 +169,7 @@ H5Tenum_insert(hid_t type, const char *name, const void *value)
H5T_t *dt=NULL;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tenum_insert, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*s*x", type, name, value);
/* Check args */
@@ -218,7 +218,7 @@ H5T_enum_insert(const H5T_t *dt, const char *name, const void *value)
uint8_t *values=NULL;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_enum_insert, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
assert(dt);
assert(name && *name);
@@ -280,7 +280,7 @@ H5Tget_member_value(hid_t type, unsigned membno, void *value/*out*/)
H5T_t *dt=NULL;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tget_member_value, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "iIux", type, membno, value);
if(NULL == (dt = (H5T_t *)H5I_object_verify(type, H5I_DATATYPE)))
@@ -322,7 +322,7 @@ H5T_get_member_value(const H5T_t *dt, unsigned membno, void *value/*out*/)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_get_member_value, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
assert(dt);
assert(value);
@@ -363,7 +363,7 @@ H5Tenum_nameof(hid_t type, const void *value, char *name/*out*/, size_t size)
H5T_t *dt = NULL;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tenum_nameof, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE4("e", "i*xxz", type, value, name, size);
/* Check args */
@@ -421,7 +421,7 @@ H5T_enum_nameof(const H5T_t *dt, const void *value, char *name/*out*/, size_t si
hbool_t alloc_name = FALSE; /* Whether name has been allocated */
char *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5T_enum_nameof)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(dt && H5T_ENUM == dt->shared->type);
@@ -512,7 +512,7 @@ H5Tenum_valueof(hid_t type, const char *name, void *value/*out*/)
H5T_t *dt;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tenum_valueof, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "i*sx", type, name, value);
/* Check args */
@@ -563,7 +563,7 @@ H5T_enum_valueof(const H5T_t *dt, const char *name, void *value/*out*/)
H5T_t *copied_dt = NULL; /*do sorting in copied datatype */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5T_enum_valueof)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
assert(dt && H5T_ENUM==dt->shared->type);
diff --git a/src/H5Tfields.c b/src/H5Tfields.c
index 43f1369..a208f75 100644
--- a/src/H5Tfields.c
+++ b/src/H5Tfields.c
@@ -47,7 +47,7 @@ DESCRIPTION
static herr_t
H5T_init_fields_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_fields_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_fields_interface() */
@@ -79,7 +79,7 @@ H5Tget_nmembers(hid_t type_id)
H5T_t *dt; /* Datatype to query */
int ret_value; /* Return value */
- FUNC_ENTER_API(H5Tget_nmembers, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("Is", "i", type_id);
/* Check args */
@@ -119,7 +119,7 @@ H5T_get_nmembers(const H5T_t *dt)
{
int ret_value;
- FUNC_ENTER_NOAPI(H5T_get_nmembers, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(dt);
@@ -162,7 +162,7 @@ H5Tget_member_name(hid_t type_id, unsigned membno)
H5T_t *dt = NULL;
char *ret_value;
- FUNC_ENTER_API(H5Tget_member_name, NULL)
+ FUNC_ENTER_API(NULL)
/* Check args */
if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)))
@@ -200,7 +200,7 @@ H5T_get_member_name(H5T_t const *dt, unsigned membno)
{
char *ret_value;
- FUNC_ENTER_NOAPI(H5T_get_member_name, NULL)
+ FUNC_ENTER_NOAPI(NULL)
assert(dt);
@@ -251,7 +251,7 @@ H5Tget_member_index(hid_t type_id, const char *name)
int ret_value=FAIL;
unsigned i;
- FUNC_ENTER_API(H5Tget_member_index, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("Is", "i*s", type_id, name);
/* Check arguments */
@@ -308,7 +308,7 @@ H5T_sort_value(const H5T_t *dt, int *map)
unsigned i, j; /* Local index variables */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_sort_value, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(dt);
@@ -413,7 +413,7 @@ H5T_sort_name(const H5T_t *dt, int *map)
uint8_t tbuf[32];
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_sort_name, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
assert(dt);
diff --git a/src/H5Tfixed.c b/src/H5Tfixed.c
index 770293a..51737eb 100644
--- a/src/H5Tfixed.c
+++ b/src/H5Tfixed.c
@@ -46,7 +46,7 @@ DESCRIPTION
static herr_t
H5T_init_fixed_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_fixed_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_fixed_interface() */
@@ -75,7 +75,7 @@ H5Tget_sign(hid_t type_id)
H5T_t *dt = NULL;
H5T_sign_t ret_value;
- FUNC_ENTER_API(H5Tget_sign, H5T_SGN_ERROR)
+ FUNC_ENTER_API(H5T_SGN_ERROR)
H5TRACE1("Ts", "i", type_id);
/* Check args */
@@ -111,7 +111,7 @@ H5T_get_sign(H5T_t const *dt)
{
H5T_sign_t ret_value;
- FUNC_ENTER_NOAPI(H5T_get_sign, H5T_SGN_ERROR)
+ FUNC_ENTER_NOAPI(H5T_SGN_ERROR)
assert(dt);
@@ -154,7 +154,7 @@ H5Tset_sign(hid_t type_id, H5T_sign_t sign)
H5T_t *dt = NULL;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tset_sign, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iTs", type_id, sign);
/* Check args */
diff --git a/src/H5Tfloat.c b/src/H5Tfloat.c
index 88d13fd..7d08d62 100644
--- a/src/H5Tfloat.c
+++ b/src/H5Tfloat.c
@@ -46,7 +46,7 @@ DESCRIPTION
static herr_t
H5T_init_float_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_float_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_float_interface() */
@@ -79,7 +79,7 @@ size_t *esize/*out*/, size_t *mpos/*out*/, size_t *msize/*out*/)
H5T_t *dt; /* Datatype */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tget_fields, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "ixxxxx", type_id, spos, epos, esize, mpos, msize);
/* Check args */
@@ -132,7 +132,7 @@ H5Tset_fields(hid_t type_id, size_t spos, size_t epos, size_t esize,
H5T_t *dt; /* Datatype */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tset_fields, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE6("e", "izzzzz", type_id, spos, epos, esize, mpos, msize);
/* Check args */
@@ -191,7 +191,7 @@ H5Tget_ebias(hid_t type_id)
H5T_t *dt; /* Datatype */
size_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tget_ebias, 0)
+ FUNC_ENTER_API(0)
H5TRACE1("z", "i", type_id);
/* Check args */
@@ -232,7 +232,7 @@ H5Tset_ebias(hid_t type_id, size_t ebias)
H5T_t *dt; /* Datatype */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tset_ebias, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iz", type_id, ebias);
/* Check args */
@@ -274,7 +274,7 @@ H5Tget_norm(hid_t type_id)
H5T_t *dt; /* Datatype */
H5T_norm_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tget_norm, H5T_NORM_ERROR)
+ FUNC_ENTER_API(H5T_NORM_ERROR)
H5TRACE1("Tn", "i", type_id);
/* Check args */
@@ -312,7 +312,7 @@ H5Tset_norm(hid_t type_id, H5T_norm_t norm)
H5T_t *dt; /* Datatype */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tset_norm, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iTn", type_id, norm);
/* Check args */
@@ -358,7 +358,7 @@ H5Tget_inpad(hid_t type_id)
H5T_t *dt; /* Datatype */
H5T_pad_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tget_inpad, H5T_PAD_ERROR)
+ FUNC_ENTER_API(H5T_PAD_ERROR)
H5TRACE1("Tp", "i", type_id);
/* Check args */
@@ -398,7 +398,7 @@ H5Tset_inpad(hid_t type_id, H5T_pad_t pad)
H5T_t *dt; /* Datatype */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tset_inpad, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iTp", type_id, pad);
/* Check args */
diff --git a/src/H5Tnative.c b/src/H5Tnative.c
index 3699757..50bb96e 100644
--- a/src/H5Tnative.c
+++ b/src/H5Tnative.c
@@ -60,7 +60,7 @@ DESCRIPTION
static herr_t
H5T_init_native_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_native_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_native_interface() */
@@ -104,7 +104,7 @@ H5Tget_native_type(hid_t type_id, H5T_direction_t direction)
size_t comp_size=0; /* Compound datatype's size */
hid_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tget_native_type, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("i", "iTd", type_id, direction);
/* check argument */
@@ -170,7 +170,7 @@ H5T_get_native_type(H5T_t *dtype, H5T_direction_t direction, size_t *struct_alig
unsigned u; /* Local index variable */
H5T_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5T_get_native_type, NULL)
+ FUNC_ENTER_NOAPI(NULL)
assert(dtype);
@@ -568,7 +568,7 @@ H5T_get_native_integer(size_t prec, H5T_sign_t sign, H5T_direction_t direction,
} match = H5T_NATIVE_INT_MATCH_UNKNOWN;
H5T_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5T_get_native_integer, NULL)
+ FUNC_ENTER_NOAPI(NULL)
if(direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) {
if(prec <= H5Tget_precision(H5T_NATIVE_SCHAR)) {
@@ -708,7 +708,7 @@ H5T_get_native_float(size_t size, H5T_direction_t direction, size_t *struct_alig
} match=H5T_NATIVE_FLOAT_MATCH_UNKNOWN;
H5T_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5T_get_native_float, NULL)
+ FUNC_ENTER_NOAPI(NULL)
assert(size>0);
@@ -826,7 +826,7 @@ H5T_get_native_bitfield(size_t prec, H5T_direction_t direction, size_t *struct_a
size_t native_size=0; /* Datatype size of the native type */
H5T_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5T_get_native_bitfield, NULL)
+ FUNC_ENTER_NOAPI(NULL)
if(direction == H5T_DIR_DEFAULT || direction == H5T_DIR_ASCEND) {
if(prec<=H5Tget_precision(H5T_NATIVE_B8)) {
@@ -909,7 +909,7 @@ H5T_cmp_offset(size_t *comp_size, size_t *offset, size_t elem_size,
{
herr_t ret_value = SUCCEED;
- FUNC_ENTER_NOAPI(H5T_cmp_offset, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if(offset && comp_size) {
if(align>1 && *comp_size%align) {
diff --git a/src/H5Toffset.c b/src/H5Toffset.c
index 17351f4..bea8d2b 100644
--- a/src/H5Toffset.c
+++ b/src/H5Toffset.c
@@ -49,7 +49,7 @@ DESCRIPTION
static herr_t
H5T_init_offset_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_offset_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_offset_interface() */
@@ -90,7 +90,7 @@ H5Tget_offset(hid_t type_id)
H5T_t *dt;
int ret_value;
- FUNC_ENTER_API(H5Tget_offset, -1)
+ FUNC_ENTER_API(-1)
H5TRACE1("Is", "i", type_id);
/* Check args */
@@ -140,7 +140,7 @@ H5T_get_offset(const H5T_t *dt)
{
int ret_value;
- FUNC_ENTER_NOAPI(H5T_get_offset, -1)
+ FUNC_ENTER_NOAPI(-1)
/* Defer to parent*/
while(dt->shared->parent)
@@ -201,7 +201,7 @@ H5Tset_offset(hid_t type_id, size_t offset)
H5T_t *dt;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tset_offset, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iz", type_id, offset);
/* Check args */
@@ -269,7 +269,7 @@ H5T_set_offset(const H5T_t *dt, size_t offset)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_set_offset, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
assert(dt);
diff --git a/src/H5Toh.c b/src/H5Toh.c
index 886acc1..5878075 100644
--- a/src/H5Toh.c
+++ b/src/H5Toh.c
@@ -98,12 +98,12 @@ const H5O_obj_class_t H5O_OBJ_DATATYPE[1] = {{
*
*-------------------------------------------------------------------------
*/
-htri_t
+static htri_t
H5O_dtype_isa(struct H5O_t *oh)
{
htri_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5O_dtype_isa, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(oh);
@@ -134,7 +134,7 @@ H5O_dtype_open(const H5G_loc_t *obj_loc, hid_t UNUSED lapl_id, hid_t dxpl_id, hb
H5T_t *type = NULL; /* Datatype opened */
hid_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_open)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(obj_loc);
@@ -174,7 +174,7 @@ H5O_dtype_create(H5F_t *f, void *_crt_info, H5G_loc_t *obj_loc, hid_t dxpl_id)
H5T_obj_create_t *crt_info = (H5T_obj_create_t *)_crt_info; /* Named datatype creation parameters */
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_create)
+ FUNC_ENTER_NOAPI_NOINIT
/* Sanity checks */
HDassert(f);
@@ -218,7 +218,7 @@ H5O_dtype_get_oloc(hid_t obj_id)
H5T_t *type; /* Datatype opened */
H5O_loc_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5O_dtype_get_oloc)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get the datatype */
if(NULL == (type = (H5T_t *)H5I_object(obj_id)))
diff --git a/src/H5Topaque.c b/src/H5Topaque.c
index 0e137ac..d68e659 100644
--- a/src/H5Topaque.c
+++ b/src/H5Topaque.c
@@ -47,7 +47,7 @@ DESCRIPTION
static herr_t
H5T_init_opaque_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_opaque_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_opaque_interface() */
@@ -73,7 +73,7 @@ H5Tset_tag(hid_t type_id, const char *tag)
H5T_t *dt=NULL;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tset_tag, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "i*s", type_id, tag);
/* Check args */
@@ -120,7 +120,7 @@ H5Tget_tag(hid_t type_id)
H5T_t *dt=NULL;
char *ret_value;
- FUNC_ENTER_API(H5Tget_tag, NULL)
+ FUNC_ENTER_API(NULL)
/* Check args */
if (NULL == (dt = H5I_object_verify(type_id,H5I_DATATYPE)))
diff --git a/src/H5Torder.c b/src/H5Torder.c
index 590a6c7..35be454 100644
--- a/src/H5Torder.c
+++ b/src/H5Torder.c
@@ -94,7 +94,7 @@ DESCRIPTION
static herr_t
H5T_init_order_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_order_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_order_interface() */
@@ -121,7 +121,7 @@ H5Tget_order(hid_t type_id)
H5T_t *dt; /* Datatype to query */
H5T_order_t ret_value; /* Return value */
- FUNC_ENTER_API(H5Tget_order, H5T_ORDER_ERROR)
+ FUNC_ENTER_API(H5T_ORDER_ERROR)
H5TRACE1("To", "i", type_id);
/* Check args */
@@ -155,7 +155,7 @@ H5T_get_order(const H5T_t *dtype)
{
H5T_order_t ret_value = H5T_ORDER_NONE; /* Return value */
- FUNC_ENTER_NOAPI(H5T_get_order, H5T_ORDER_ERROR)
+ FUNC_ENTER_NOAPI(H5T_ORDER_ERROR)
/* Defer to parent */
while(dtype->shared->parent)
@@ -228,7 +228,7 @@ H5Tset_order(hid_t type_id, H5T_order_t order)
H5T_t *dt; /* Datatype to modify */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tset_order, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iTo", type_id, order);
/* Check args */
@@ -265,7 +265,7 @@ H5T_set_order(H5T_t *dtype, H5T_order_t order)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_set_order, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if(H5T_ENUM == dtype->shared->type && dtype->shared->u.enumer.nmembs > 0)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "operation not allowed after enum members are defined")
diff --git a/src/H5Tpad.c b/src/H5Tpad.c
index eee2ab3..88a5e13 100644
--- a/src/H5Tpad.c
+++ b/src/H5Tpad.c
@@ -46,7 +46,7 @@ DESCRIPTION
static herr_t
H5T_init_pad_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_pad_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_pad_interface() */
@@ -76,7 +76,7 @@ H5Tget_pad(hid_t type_id, H5T_pad_t *lsb/*out*/, H5T_pad_t *msb/*out*/)
H5T_t *dt = NULL;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tget_pad, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "ixx", type_id, lsb, msb);
/* Check args */
@@ -120,7 +120,7 @@ H5Tset_pad(hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb)
H5T_t *dt = NULL;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tset_pad, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE3("e", "iTpTp", type_id, lsb, msb);
/* Check args */
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index 0ec9632..f25fb1e 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -513,7 +513,7 @@ H5FL_EXTERN(H5T_shared_t);
/* Common functions */
H5_DLL H5T_t *H5T_create(H5T_class_t type, size_t size);
H5_DLL herr_t H5T_commit(H5F_t *file, H5T_t *type, hid_t tcpl_id, hid_t dxpl_id);
-H5_DLL herr_t H5T_commit_named(const H5G_loc_t *loc, const char *name,
+H5_DLL herr_t H5T__commit_named(const H5G_loc_t *loc, const char *name,
H5T_t *dt, hid_t lcpl_id, hid_t tcpl_id, hid_t tapl_id, hid_t dxpl_id);
H5_DLL H5T_t *H5T_alloc(void);
H5_DLL herr_t H5T_free(H5T_t *dt);
diff --git a/src/H5Tprecis.c b/src/H5Tprecis.c
index 62493e9..c5ac186 100644
--- a/src/H5Tprecis.c
+++ b/src/H5Tprecis.c
@@ -49,7 +49,7 @@ DESCRIPTION
static herr_t
H5T_init_precis_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_precis_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_precis_interface() */
@@ -83,7 +83,7 @@ H5Tget_precision(hid_t type_id)
H5T_t *dt;
size_t ret_value;
- FUNC_ENTER_API(H5Tget_precision, 0)
+ FUNC_ENTER_API(0)
H5TRACE1("z", "i", type_id);
/* Check args */
@@ -121,7 +121,7 @@ H5T_get_precision(const H5T_t *dt)
{
size_t ret_value;
- FUNC_ENTER_NOAPI(H5T_get_precision, 0)
+ FUNC_ENTER_NOAPI(0)
/* Defer to parent*/
while(dt->shared->parent)
@@ -172,7 +172,7 @@ H5Tset_precision(hid_t type_id, size_t prec)
H5T_t *dt = NULL;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tset_precision, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iz", type_id, prec);
/* Check args */
@@ -233,7 +233,7 @@ H5T_set_precision(const H5T_t *dt, size_t prec)
size_t offset, size;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_set_precision, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
assert(dt);
diff --git a/src/H5Tstrpad.c b/src/H5Tstrpad.c
index 6dc79a1..e8ac4f5 100644
--- a/src/H5Tstrpad.c
+++ b/src/H5Tstrpad.c
@@ -46,7 +46,7 @@ DESCRIPTION
static herr_t
H5T_init_strpad_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_strpad_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_strpad_interface() */
@@ -79,7 +79,7 @@ H5Tget_strpad(hid_t type_id)
H5T_t *dt = NULL;
H5T_str_t ret_value;
- FUNC_ENTER_API(H5Tget_strpad, H5T_STR_ERROR)
+ FUNC_ENTER_API(H5T_STR_ERROR)
H5TRACE1("Tz", "i", type_id);
/* Check args */
@@ -136,7 +136,7 @@ H5Tset_strpad(hid_t type_id, H5T_str_t strpad)
H5T_t *dt = NULL;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Tset_strpad, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "iTz", type_id, strpad);
/* Check args */
diff --git a/src/H5Tvisit.c b/src/H5Tvisit.c
index 44e06fe..a1843ef 100644
--- a/src/H5Tvisit.c
+++ b/src/H5Tvisit.c
@@ -101,7 +101,7 @@ H5T_visit(H5T_t *dt, unsigned visit_flags, H5T_operator_t op, void *op_value)
hbool_t is_complex; /* Flag indicating current datatype is "complex" */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_visit, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(dt);
diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c
index f1b1f00..267692c 100644
--- a/src/H5Tvlen.c
+++ b/src/H5Tvlen.c
@@ -81,7 +81,7 @@ DESCRIPTION
static herr_t
H5T_init_vlen_interface(void)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_vlen_interface)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
FUNC_LEAVE_NOAPI(H5T_init())
} /* H5T_init_vlen_interface() */
@@ -109,7 +109,7 @@ H5Tvlen_create(hid_t base_id)
H5T_t *dt = NULL; /*new datatype */
hid_t ret_value; /*return value */
- FUNC_ENTER_API(H5Tvlen_create, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("i", "i", base_id);
/* Check args */
@@ -150,7 +150,7 @@ H5T_vlen_create(const H5T_t *base)
H5T_t *dt = NULL; /*new VL datatype */
H5T_t *ret_value; /*return value */
- FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_create)
+ FUNC_ENTER_NOAPI_NOINIT
/* Check args */
HDassert(base);
@@ -211,7 +211,7 @@ H5T_vlen_set_loc(const H5T_t *dt, H5F_t *f, H5T_loc_t loc)
{
htri_t ret_value = FALSE; /* Indicate success, but no location change */
- FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_set_loc)
+ FUNC_ENTER_NOAPI_NOINIT
/* check parameters */
HDassert(dt);
@@ -322,7 +322,7 @@ H5T_vlen_seq_mem_getlen(const void *_vl)
hvl_t vl; /* User's hvl_t information */
#endif
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_seq_mem_getlen)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check parameters, return result */
#ifdef H5_NO_ALIGNMENT_RESTRICTIONS
@@ -359,7 +359,7 @@ H5T_vlen_seq_mem_getptr(void *_vl)
hvl_t vl; /* User's hvl_t information */
#endif
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_seq_mem_getptr)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check parameters, return result */
#ifdef H5_NO_ALIGNMENT_RESTRICTIONS
@@ -397,7 +397,7 @@ H5T_vlen_seq_mem_isnull(const H5F_t UNUSED *f, void *_vl)
hvl_t vl; /* User's hvl_t information */
#endif
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_seq_mem_isnull)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check parameters, return result */
#ifdef H5_NO_ALIGNMENT_RESTRICTIONS
@@ -435,7 +435,7 @@ H5T_vlen_seq_mem_read(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_vl, void *bu
hvl_t vl; /* User's hvl_t information */
#endif
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_seq_mem_read)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check parameters, copy data */
HDassert(buf);
@@ -475,7 +475,7 @@ H5T_vlen_seq_mem_write(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const H5T_vlen_all
size_t len;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_seq_mem_write)
+ FUNC_ENTER_NOAPI_NOINIT
/* check parameters */
HDassert(_vl);
@@ -530,7 +530,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_NOAPI_NOINIT_NOFUNC(H5T_vlen_seq_mem_setnull)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check parameters */
HDassert(_vl);
@@ -567,7 +567,7 @@ H5T_vlen_str_mem_getlen(const void *_vl)
const char *s; /* Pointer to the user's string information */
#endif
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_str_mem_getlen)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check parameters */
#ifdef H5_NO_ALIGNMENT_RESTRICTIONS
@@ -602,7 +602,7 @@ H5T_vlen_str_mem_getptr(void *_vl)
char *s; /* Pointer to the user's string information */
#endif
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_str_mem_getptr)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check parameters */
#ifdef H5_NO_ALIGNMENT_RESTRICTIONS
@@ -638,7 +638,7 @@ H5T_vlen_str_mem_isnull(const H5F_t UNUSED *f, void *_vl)
char *s; /* Pointer to the user's string information */
#endif
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_str_mem_isnull)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
#ifndef H5_NO_ALIGNMENT_RESTRICTIONS
HDmemcpy(&s, _vl, sizeof(char *));
@@ -670,7 +670,7 @@ H5T_vlen_str_mem_read(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, void *_vl, void *bu
char *s; /* Pointer to the user's string information */
#endif
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_str_mem_read)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(len>0) {
/* check parameters */
@@ -709,7 +709,7 @@ H5T_vlen_str_mem_write(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, const H5T_vlen_all
size_t len; /* Maximum length of the string to copy */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_str_mem_write)
+ FUNC_ENTER_NOAPI_NOINIT
/* check parameters */
HDassert(buf);
@@ -754,7 +754,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_NOAPI_NOINIT_NOFUNC(H5T_vlen_str_mem_setnull)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Set pointer in user's buffer with memcpy, to avoid alignment issues */
HDmemcpy(_vl,&t,sizeof(char *));
@@ -781,7 +781,7 @@ H5T_vlen_disk_getlen(const void *_vl)
const uint8_t *vl=(const uint8_t *)_vl; /* Pointer to the disk VL information */
size_t seq_len; /* Sequence length */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_disk_getlen)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check parameters */
HDassert(vl);
@@ -808,7 +808,7 @@ H5T_vlen_disk_getlen(const void *_vl)
static void *
H5T_vlen_disk_getptr(void UNUSED *vl)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_vlen_disk_getptr)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check parameters */
HDassert(vl);
@@ -835,7 +835,7 @@ H5T_vlen_disk_isnull(const 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_NOAPI_NOINIT_NOFUNC(H5T_vlen_disk_isnull)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check parameters */
HDassert(vl);
@@ -870,7 +870,7 @@ H5T_vlen_disk_read(H5F_t *f, hid_t dxpl_id, void *_vl, void *buf, size_t UNUSED
H5HG_t hobjid;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_disk_read)
+ FUNC_ENTER_NOAPI_NOINIT
/* check parameters */
HDassert(vl);
@@ -919,7 +919,7 @@ H5T_vlen_disk_write(H5F_t *f, hid_t dxpl_id, const H5T_vlen_alloc_info_t UNUSED
size_t len; /* Size of new sequence on disk (in bytes) */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_disk_write)
+ FUNC_ENTER_NOAPI_NOINIT
/* check parameters */
HDassert(vl);
@@ -982,7 +982,7 @@ H5T_vlen_disk_setnull(H5F_t *f, hid_t dxpl_id, void *_vl, void *_bg)
uint32_t seq_len = 0; /* Sequence length */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_disk_setnull)
+ FUNC_ENTER_NOAPI_NOINIT
/* check parameters */
HDassert(f);
@@ -1046,7 +1046,7 @@ H5T_vlen_reclaim_recurse(void *elem, const H5T_t *dt, H5MM_free_t free_func, voi
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5T_vlen_reclaim_recurse)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(elem);
HDassert(dt);
@@ -1160,7 +1160,7 @@ H5T_vlen_reclaim(void *elem, hid_t type_id, unsigned UNUSED ndim, const hsize_t
H5T_t *dt;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5T_vlen_reclaim, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(elem);
HDassert(vl_alloc_info);
@@ -1208,7 +1208,7 @@ H5T_vlen_get_alloc_info(hid_t dxpl_id, H5T_vlen_alloc_info_t **vl_alloc_info)
H5P_genplist_t *plist; /* DX property list */
herr_t ret_value=SUCCEED;
- FUNC_ENTER_NOAPI(H5T_vlen_get_alloc_info, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(H5I_GENPROP_LST == H5I_get_type(dxpl_id));
HDassert(vl_alloc_info);
@@ -1263,7 +1263,7 @@ H5T_vlen_reclaim_elmt(void *elem, H5T_t *dt, hid_t dxpl_id)
HDassert(dt);
HDassert(elem);
- FUNC_ENTER_NOAPI(H5T_vlen_reclaim_elmt, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Get VL allocation info */
if(H5T_vlen_get_alloc_info(dxpl_id, &vl_alloc_info) < 0)
diff --git a/src/H5V.c b/src/H5V.c
index 37d558f..2697822 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, hsize_t *stride1)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_stride_optimize1);
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* This has to be true because if we optimize the dimensionality down to
@@ -121,7 +121,7 @@ static void
H5V_stride_optimize2(unsigned *np/*in,out*/, hsize_t *elmt_size/*in,out*/,
const hsize_t *size, hsize_t *stride1, hsize_t *stride2)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_stride_optimize2)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* This has to be true because if we optimize the dimensionality down to
@@ -265,7 +265,7 @@ H5V_hyper_stride(unsigned n, const hsize_t *size,
int i; /*counter */
hsize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5V_hyper_stride)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(n <= H5V_HYPER_NDIMS);
assert(size);
@@ -364,8 +364,8 @@ H5V_hyper_eq(unsigned n,
unsigned i;
htri_t ret_value=TRUE; /* Return value */
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_hyper_eq)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if (n == 0) HGOTO_DONE(TRUE)
@@ -411,8 +411,8 @@ H5V_hyper_disjointp(unsigned n,
unsigned u;
htri_t ret_value = FALSE; /* Return value */
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_hyper_disjointp)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(!n || !size1 || !size2)
HGOTO_DONE(TRUE)
@@ -471,7 +471,7 @@ H5V_hyper_fill(unsigned n, const hsize_t *_size,
unsigned u;
#endif
- FUNC_ENTER_NOAPI_NOFUNC(H5V_hyper_fill)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
assert(n > 0 && n <= H5V_HYPER_NDIMS);
@@ -557,7 +557,7 @@ H5V_hyper_copy(unsigned n, const hsize_t *_size,
unsigned u;
#endif
- FUNC_ENTER_NOAPI_NOFUNC(H5V_hyper_copy)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* check args */
assert(n > 0 && n <= H5V_HYPER_NDIMS);
@@ -711,7 +711,8 @@ H5V_stride_fill(unsigned n, hsize_t elmt_size, const hsize_t *size,
int j; /*counter */
hbool_t carry; /*subtraction carray value */
- FUNC_ENTER_NOAPI_NOFUNC(H5V_stride_fill)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
+
assert (elmt_size < SIZET_MAX);
H5V_vector_cpy(n, idx, size);
@@ -772,7 +773,8 @@ H5V_stride_copy(unsigned n, hsize_t elmt_size, const hsize_t *size,
int j; /*counters */
hbool_t carry; /*carray for subtraction*/
- FUNC_ENTER_NOAPI_NOFUNC(H5V_stride_copy)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
+
assert (elmt_size<SIZET_MAX);
if (n) {
@@ -840,7 +842,8 @@ H5V_stride_copy_s(unsigned n, hsize_t elmt_size, const hsize_t *size,
int j; /*counters */
hbool_t carry; /*carray for subtraction*/
- FUNC_ENTER_NOAPI_NOFUNC(H5V_stride_copy_s)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
+
assert (elmt_size<SIZET_MAX);
if (n) {
@@ -913,7 +916,7 @@ H5V_stride_copy2(hsize_t nelmts, hsize_t elmt_size,
int j; /* Local index variable */
hbool_t carry;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_stride_copy2)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert (elmt_size < SIZET_MAX);
assert(dst_n>0);
@@ -978,7 +981,7 @@ H5V_array_fill(void *_dst, const void *src, size_t size, size_t count)
size_t items_left; /* number of items left to copy */
uint8_t *dst=(uint8_t*)_dst;/* alias for pointer arithmetic */
- FUNC_ENTER_NOAPI_NOFUNC(H5V_array_fill)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert (dst);
assert (src);
@@ -1033,7 +1036,7 @@ H5V_array_down(unsigned n, const hsize_t *total_size, hsize_t *down)
hsize_t acc; /*accumulator */
int i; /*counter */
- FUNC_ENTER_NOAPI_NOFUNC(H5V_array_down)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(n <= H5V_HYPER_NDIMS);
assert(total_size);
@@ -1079,7 +1082,7 @@ H5V_array_offset_pre(unsigned n, const hsize_t *acc, const hsize_t *offset)
int i; /*counter */
hsize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOFUNC(H5V_array_offset_pre)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
assert(n <= H5V_HYPER_NDIMS);
assert(acc);
@@ -1119,7 +1122,7 @@ H5V_array_offset(unsigned n, const hsize_t *total_size, const hsize_t *offset)
hsize_t acc_arr[H5V_HYPER_NDIMS]; /* Accumulated size of down dimensions */
hsize_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5V_array_offset, (HDabort(), 0)) /*lint !e527 Don't worry about unreachable statement */
+ FUNC_ENTER_NOAPI((HDabort(), 0)) /*lint !e527 Don't worry about unreachable statement */
assert(n <= H5V_HYPER_NDIMS);
assert(total_size);
@@ -1161,7 +1164,7 @@ H5V_array_calc_pre(hsize_t offset, unsigned n, const hsize_t *down,
{
unsigned u; /* Local index variable */
- FUNC_ENTER_NOAPI_NOFUNC(H5V_array_calc_pre)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(n <= H5V_HYPER_NDIMS);
@@ -1203,7 +1206,7 @@ H5V_array_calc(hsize_t offset, unsigned n, const hsize_t *total_size, hsize_t *c
hsize_t idx[H5V_HYPER_NDIMS]; /* Size of each dimension in bytes */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5V_array_calc, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(n <= H5V_HYPER_NDIMS);
@@ -1272,7 +1275,7 @@ H5V_chunk_index(unsigned ndims, const hsize_t *coord, const uint32_t *chunk,
hsize_t scaled_coord[H5V_HYPER_NDIMS]; /* Scaled, coordinates, in terms of chunks */
unsigned u; /* Local index variable */
- FUNC_ENTER_NOAPI_NOFUNC(H5V_chunk_index)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
assert(ndims <= H5V_HYPER_NDIMS);
@@ -1328,7 +1331,7 @@ H5V_opvv(size_t dst_max_nseq, size_t *dst_curr_seq, size_t dst_len_arr[],
size_t acc_len; /* Accumulated length of sequences */
ssize_t ret_value = 0; /* Return value (Total size of sequence in bytes) */
- FUNC_ENTER_NOAPI(H5V_opvv, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Sanity check */
HDassert(dst_curr_seq);
@@ -1536,7 +1539,7 @@ H5V_memcpyvv(void *_dst,
size_t acc_len; /* Accumulated length of sequences */
ssize_t ret_value = 0; /* Return value (Total size of sequence in bytes) */
- FUNC_ENTER_NOAPI_NOFUNC(H5V_memcpyvv)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(_dst);
diff --git a/src/H5Vprivate.h b/src/H5Vprivate.h
index 894ec5c..29d75cf 100644
--- a/src/H5Vprivate.h
+++ b/src/H5Vprivate.h
@@ -126,8 +126,8 @@ H5V_vector_reduce_product(unsigned n, const hsize_t *v)
{
hsize_t ret_value = 1;
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_vector_reduce_product)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if (n && !v) HGOTO_DONE(0)
while (n--) ret_value *= *v++;
@@ -158,8 +158,8 @@ H5V_vector_zerop_u(int n, const hsize_t *v)
{
htri_t ret_value=TRUE; /* Return value */
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_vector_zerop_u)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if (!v)
HGOTO_DONE(TRUE)
@@ -193,8 +193,8 @@ H5V_vector_zerop_s(int n, const hssize_t *v)
{
htri_t ret_value=TRUE; /* Return value */
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_vector_zerop_s)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if (!v)
HGOTO_DONE(TRUE)
@@ -230,8 +230,8 @@ H5V_vector_cmp_u (unsigned n, const hsize_t *v1, const hsize_t *v2)
{
int ret_value=0; /* Return value */
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_vector_cmp_u)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if (v1 == v2) HGOTO_DONE(0)
if (v1 == NULL) HGOTO_DONE(-1)
@@ -272,8 +272,8 @@ H5V_vector_cmp_s (unsigned n, const hssize_t *v1, const hssize_t *v2)
{
int ret_value=0; /* Return value */
- /* Use FUNC_ENTER_NOAPI_NOINIT_NOFUNC here to avoid performance issues */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5V_vector_cmp_s)
+ /* Use FUNC_ENTER_NOAPI_NOINIT_NOERR here to avoid performance issues */
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if (v1 == v2) HGOTO_DONE(0)
if (v1 == NULL) HGOTO_DONE(-1)
diff --git a/src/H5WB.c b/src/H5WB.c
index f624abc..978ded4 100644
--- a/src/H5WB.c
+++ b/src/H5WB.c
@@ -110,7 +110,7 @@ H5WB_wrap(void *buf, size_t buf_size)
H5WB_t *wb = NULL; /* Wrapped buffer info */
H5WB_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5WB_wrap, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/*
* Check arguments.
@@ -163,7 +163,7 @@ H5WB_actual(H5WB_t *wb, size_t need)
{
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5WB_actual, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/*
* Check arguments.
@@ -231,7 +231,7 @@ H5WB_actual_clear(H5WB_t *wb, size_t need)
{
void *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5WB_actual_clear, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/*
* Check arguments.
@@ -267,7 +267,7 @@ done:
herr_t
H5WB_unwrap(H5WB_t *wb)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5WB_unwrap)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/*
* Check arguments.
diff --git a/src/H5Z.c b/src/H5Z.c
index e04124e..3bb3a44 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_NOAPI_NOINIT(H5Z_init_interface)
+ FUNC_ENTER_NOAPI_NOINIT
#ifdef H5_HAVE_FILTER_DEFLATE
if (H5Z_register (H5Z_DEFLATE)<0)
@@ -224,7 +224,7 @@ H5Zregister(const void *cls)
H5Z_class2_t cls_new; /* Translated class struct */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Zregister, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "*x", cls);
/* Check args */
@@ -302,7 +302,7 @@ H5Z_register (const H5Z_class2_t *cls)
size_t i;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_register, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(cls);
HDassert(cls->id >= 0 && cls->id <= H5Z_FILTER_MAX);
@@ -368,7 +368,7 @@ H5Zunregister(H5Z_filter_t id)
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_API(H5Zunregister, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("e", "Zf", id);
/* Check args */
@@ -407,7 +407,7 @@ H5Z_unregister (H5Z_filter_t id)
size_t i; /* Local index variable */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_unregister,FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
assert (id>=0 && id<=H5Z_FILTER_MAX);
@@ -453,7 +453,7 @@ H5Zfilter_avail(H5Z_filter_t id)
size_t i; /* Local index variable */
htri_t ret_value=FALSE; /* Return value */
- FUNC_ENTER_API(H5Zfilter_avail, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE1("t", "Zf", id);
/* Check args */
@@ -498,7 +498,7 @@ H5Z_prelude_callback(const H5O_pline_t *pline, hid_t dcpl_id, hid_t type_id,
size_t u; /* Local index variable */
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5Z_prelude_callback)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(pline->nused > 0);
@@ -583,7 +583,7 @@ H5Z_prepare_prelude_callback_dcpl(hid_t dcpl_id, hid_t type_id, H5Z_prelude_type
hid_t space_id = -1; /* ID for dataspace describing chunk */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5Z_prepare_prelude_callback_dcpl)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(H5I_GENPROP_LST == H5I_get_type(dcpl_id));
HDassert(H5I_DATATYPE == H5I_get_type(type_id));
@@ -666,7 +666,7 @@ H5Z_can_apply(hid_t dcpl_id, hid_t type_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_can_apply, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Make "can apply" callbacks for filters in pipeline */
if(H5Z_prepare_prelude_callback_dcpl(dcpl_id, type_id, H5Z_PRELUDE_CAN_APPLY) < 0)
@@ -701,7 +701,7 @@ H5Z_set_local(hid_t dcpl_id, hid_t type_id)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_set_local, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Make "set local" callbacks for filters in pipeline */
if(H5Z_prepare_prelude_callback_dcpl(dcpl_id, type_id, H5Z_PRELUDE_SET_LOCAL) < 0)
@@ -731,7 +731,7 @@ H5Z_can_apply_direct(const H5O_pline_t *pline)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_can_apply_direct, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(pline->nused > 0);
@@ -768,7 +768,7 @@ H5Z_set_local_direct(const H5O_pline_t *pline)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_set_local_direct, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(pline->nused > 0);
@@ -802,7 +802,7 @@ H5Z_modify(const H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags,
size_t idx; /* Index of filter in pipeline */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_modify, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(pline);
HDassert(filter >= 0 && filter <= H5Z_FILTER_MAX);
@@ -872,7 +872,7 @@ H5Z_append(H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags,
size_t idx;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_append, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(pline);
HDassert(filter >= 0 && filter <= H5Z_FILTER_MAX);
@@ -977,7 +977,7 @@ H5Z_find_idx(H5Z_filter_t id)
size_t i; /* Local index variable */
int ret_value=FAIL; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5Z_find_idx)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
for (i=0; i<H5Z_table_used_g; i++)
if (H5Z_table_g[i].id == id)
@@ -1012,7 +1012,7 @@ H5Z_find(H5Z_filter_t id)
int idx; /* Filter index in global table */
H5Z_class2_t *ret_value=NULL; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_find, NULL)
+ FUNC_ENTER_NOAPI(NULL)
/* Get the index in the global table */
if((idx=H5Z_find_idx(id))<0)
@@ -1071,7 +1071,7 @@ H5Z_pipeline(const H5O_pline_t *pline, unsigned flags,
unsigned tmp_flags;
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_pipeline, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
assert(0==(flags & ~((unsigned)H5Z_FLAG_INVMASK)));
assert(filter_mask);
@@ -1197,7 +1197,7 @@ H5Z_filter_info(const H5O_pline_t *pline, H5Z_filter_t filter)
size_t idx; /* Index of filter in pipeline */
H5Z_filter_info_t *ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_filter_info, NULL)
+ FUNC_ENTER_NOAPI(NULL)
assert(pline);
assert(filter>=0 && filter<=H5Z_FILTER_MAX);
@@ -1240,7 +1240,7 @@ H5Z_all_filters_avail(const H5O_pline_t *pline)
size_t i,j; /* Local index variable */
htri_t ret_value=TRUE; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_all_filters_avail, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
assert(pline);
@@ -1284,7 +1284,7 @@ H5Z_delete(H5O_pline_t *pline, H5Z_filter_t filter)
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_delete, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Check args */
HDassert(pline);
@@ -1368,7 +1368,7 @@ H5Zget_filter_info(H5Z_filter_t filter, unsigned int *filter_config_flags)
H5Z_class2_t *fclass;
herr_t ret_value = SUCCEED;
- FUNC_ENTER_API(H5Zget_filter_info, FAIL)
+ FUNC_ENTER_API(FAIL)
H5TRACE2("e", "Zf*Iu", filter, filter_config_flags);
/* Look up the filter class info */
diff --git a/src/H5Zdeflate.c b/src/H5Zdeflate.c
index 598aa97..f318c2f 100644
--- a/src/H5Zdeflate.c
+++ b/src/H5Zdeflate.c
@@ -79,7 +79,7 @@ H5Z_filter_deflate (unsigned flags, size_t cd_nelmts,
int status; /* Status from zlib operation */
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_filter_deflate, 0)
+ FUNC_ENTER_NOAPI(0)
/* Sanity check */
HDassert(*buf_size > 0);
diff --git a/src/H5Zfletcher32.c b/src/H5Zfletcher32.c
index e3a77bd..d2ad965 100644
--- a/src/H5Zfletcher32.c
+++ b/src/H5Zfletcher32.c
@@ -85,7 +85,7 @@ H5Z_filter_fletcher32 (unsigned flags, size_t UNUSED cd_nelmts, const unsigned U
uint8_t tmp;
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_filter_fletcher32, 0)
+ FUNC_ENTER_NOAPI(0)
assert(sizeof(uint32_t)>=4);
diff --git a/src/H5Znbit.c b/src/H5Znbit.c
index 263b2cd..134ef3a 100644
--- a/src/H5Znbit.c
+++ b/src/H5Znbit.c
@@ -135,7 +135,7 @@ H5Z_can_apply_nbit(hid_t UNUSED dcpl_id, hid_t type_id, hid_t UNUSED space_id)
const H5T_t *type; /* Datatype */
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_can_apply_nbit, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get datatype */
if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
@@ -235,7 +235,7 @@ H5Z_calc_parms_array(const H5T_t *type)
H5T_class_t dtype_base_class; /* Array datatype's base datatype's class */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_calc_parms_array, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Store datatype class code */
++cd_values_actual_nparms;
@@ -308,7 +308,7 @@ H5Z_calc_parms_compound(const H5T_t *type)
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_calc_parms_compound, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Store compound datatype class code */
++cd_values_actual_nparms;
@@ -397,7 +397,7 @@ H5Z_set_parms_nooptype(const H5T_t *type, unsigned cd_values[])
size_t dtype_size; /* No-op datatype's size (in bytes) */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_set_parms_nooptype, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Set datatype class code */
cd_values[cd_values_index++] = H5Z_NBIT_NOOPTYPE;
@@ -439,7 +439,7 @@ H5Z_set_parms_atomic(const H5T_t *type, unsigned cd_values[])
int dtype_offset; /* Atomic datatype's offset (in bits) */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5Z_set_parms_atomic)
+ FUNC_ENTER_NOAPI_NOINIT
/* Set datatype class code */
cd_values[cd_values_index++] = H5Z_NBIT_ATOMIC;
@@ -525,7 +525,7 @@ H5Z_set_parms_array(const H5T_t *type, unsigned cd_values[])
htri_t is_vlstring; /* flag indicating if datatype is varible-length string */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_set_parms_array, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Set datatype class code */
cd_values[cd_values_index++] = H5Z_NBIT_ARRAY;
@@ -615,7 +615,7 @@ H5Z_set_parms_compound(const H5T_t *type, unsigned cd_values[])
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_set_parms_compound, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Set "local" parameter for compound datatype class code */
cd_values[cd_values_index++] = H5Z_NBIT_COMPOUND;
@@ -739,7 +739,7 @@ H5Z_set_local_nbit(hid_t dcpl_id, hid_t type_id, hid_t space_id)
H5T_class_t dtype_class; /* Datatype's class */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_set_local_nbit, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get datatype */
if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
@@ -873,7 +873,7 @@ H5Z_filter_nbit(unsigned flags, size_t cd_nelmts, const unsigned cd_values[],
unsigned d_nelmts = 0; /* number of elements in the chunk */
size_t ret_value = 0; /* return value */
- FUNC_ENTER_NOAPI(H5Z_filter_nbit, 0)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments
* cd_values[0] stores actual number of parameters in cd_values[]
diff --git a/src/H5Zscaleoffset.c b/src/H5Zscaleoffset.c
index c524141..e6ae53e 100644
--- a/src/H5Zscaleoffset.c
+++ b/src/H5Zscaleoffset.c
@@ -698,7 +698,7 @@ H5Z_can_apply_scaleoffset(hid_t UNUSED dcpl_id, hid_t type_id, hid_t UNUSED spac
H5T_order_t dtype_order; /* Datatype's endianness order */
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_can_apply_scaleoffset, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get datatype */
if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE)))
@@ -750,7 +750,7 @@ H5Z_scaleoffset_get_type(unsigned dtype_class, unsigned dtype_size, unsigned dty
enum H5Z_scaleoffset_t type = t_bad; /* integer type */
enum H5Z_scaleoffset_t ret_value; /* return value */
- FUNC_ENTER_NOAPI_NOINIT(H5Z_scaleoffset_get_type)
+ FUNC_ENTER_NOAPI_NOINIT
if(dtype_class==H5Z_SCALEOFFSET_CLS_INTEGER) {
if(dtype_sign==H5Z_SCALEOFFSET_SGN_NONE) { /* unsigned integer */
@@ -809,7 +809,7 @@ H5Z_scaleoffset_set_parms_fillval(H5P_genplist_t *dcpl_plist,
{
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_scaleoffset_set_parms_fillval, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
if(scale_type == t_uchar)
H5Z_scaleoffset_set_filval_3(unsigned char, dcpl_plist, type, cd_values, need_convert, dxpl_id)
@@ -875,7 +875,7 @@ H5Z_set_local_scaleoffset(hid_t dcpl_id, hid_t type_id, hid_t space_id)
H5D_fill_value_t status; /* Status of fill value in property list */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_set_local_scaleoffset, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/* Get the plist structure */
if(NULL == (dcpl_plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE)))
@@ -1057,7 +1057,7 @@ H5Z_filter_scaleoffset(unsigned flags, size_t cd_nelmts, const unsigned cd_value
unsigned i; /* index */
parms_atomic p; /* paramters needed for compress/decompress functions */
- FUNC_ENTER_NOAPI(H5Z_filter_scaleoffset, 0)
+ FUNC_ENTER_NOAPI_NOINIT
/* check arguments */
if(cd_nelmts != H5Z_SCALEOFFSET_TOTAL_NPARMS)
@@ -1513,7 +1513,7 @@ H5Z_scaleoffset_precompress_fd(void *data, unsigned d_nelmts, enum H5Z_scaleoffs
{
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_scaleoffset_precompress_fd, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
if(type == t_float)
H5Z_scaleoffset_precompress_3(float, data, d_nelmts,
@@ -1536,7 +1536,7 @@ H5Z_scaleoffset_postdecompress_fd(void *data, unsigned d_nelmts, enum H5Z_scaleo
long long sminval = (long long)minval; /* for signed integer types */
herr_t ret_value=SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_scaleoffset_postdecompress_fd, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
if(type == t_float)
H5Z_scaleoffset_postdecompress_3(float, data, d_nelmts, filavail,
diff --git a/src/H5Zshuffle.c b/src/H5Zshuffle.c
index 2e4f1fa..7aa0202 100644
--- a/src/H5Zshuffle.c
+++ b/src/H5Zshuffle.c
@@ -74,7 +74,7 @@ H5Z_set_local_shuffle(hid_t dcpl_id, hid_t type_id, hid_t UNUSED space_id)
unsigned cd_values[H5Z_SHUFFLE_TOTAL_NPARMS]; /* Filter parameters */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_set_local_shuffle, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Get the plist structure */
if(NULL == (dcpl_plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE)))
@@ -139,7 +139,7 @@ H5Z_filter_shuffle(unsigned flags, size_t cd_nelmts, const unsigned cd_values[],
size_t leftover; /* Extra bytes at end of buffer */
size_t ret_value; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_filter_shuffle, 0)
+ FUNC_ENTER_NOAPI(0)
/* Check arguments */
if (cd_nelmts!=H5Z_SHUFFLE_TOTAL_NPARMS || cd_values[H5Z_SHUFFLE_PARM_SIZE]==0)
diff --git a/src/H5Zszip.c b/src/H5Zszip.c
index e74692c..c06605b 100644
--- a/src/H5Zszip.c
+++ b/src/H5Zszip.c
@@ -84,7 +84,7 @@ H5Z_can_apply_szip(hid_t UNUSED dcpl_id, hid_t type_id, hid_t UNUSED space_id)
H5T_order_t dtype_order; /* Datatype's endianness order */
htri_t ret_value = TRUE; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_can_apply_szip, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Get datatype */
if(NULL == (type = H5I_object_verify(type_id, H5I_DATATYPE)))
@@ -151,7 +151,7 @@ H5Z_set_local_szip(hid_t dcpl_id, hid_t type_id, hid_t space_id)
hsize_t scanline; /* Size of dataspace's fastest changing dimension */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_set_local_szip, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
/* Get the plist structure */
if(NULL == (dcpl_plist = H5P_object_verify(dcpl_id, H5P_DATASET_CREATE)))
@@ -284,7 +284,7 @@ H5Z_filter_szip (unsigned flags, size_t cd_nelmts, const unsigned cd_values[],
unsigned char *newbuf = NULL; /* Pointer to input buffer */
SZ_com_t sz_param; /* szip parameter block */
- FUNC_ENTER_NOAPI(H5Z_filter_szip, 0)
+ FUNC_ENTER_NOAPI(0)
/* Sanity check to make certain that we haven't drifted out of date with
* the mask options from the szlib.h header */
diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c
index e0f87ac..5a707b5 100644
--- a/src/H5Ztrans.c
+++ b/src/H5Ztrans.c
@@ -317,19 +317,16 @@ static void H5Z_print(H5Z_node *tree, FILE *stream);
static void
H5Z_unget_token(H5Z_token *current)
{
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
+
/* check args */
assert(current);
-
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5Z_unget_token)
-
current->tok_type = current->tok_last_type;
current->tok_begin = current->tok_last_begin;
current->tok_end = current->tok_last_end;
FUNC_LEAVE_NOAPI_VOID
-
-
}
@@ -356,7 +353,7 @@ H5Z_get_token(H5Z_token *current)
{
H5Z_token *ret_value = current;
- FUNC_ENTER_NOAPI(H5Z_get_token, NULL)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
assert(current);
@@ -485,7 +482,7 @@ done:
void
H5Z_xform_destroy_parse_tree(H5Z_node *tree)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5Z_xform_destroy_parse_tree)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if (tree)
{
@@ -518,7 +515,7 @@ H5Z_xform_parse(const char *expression, H5Z_datval_ptrs* dat_val_pointers)
H5Z_token tok;
void* ret_value;
- FUNC_ENTER_NOAPI(H5Z_xform_parse, NULL)
+ FUNC_ENTER_NOAPI(NULL)
if(!expression)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, NULL, "No expression provided?")
@@ -557,7 +554,7 @@ H5Z_parse_expression(H5Z_token *current, H5Z_datval_ptrs* dat_val_pointers)
H5Z_node *expr;
H5Z_node *ret_value; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5Z_parse_expression)
+ FUNC_ENTER_NOAPI_NOINIT
expr = H5Z_parse_term(current, dat_val_pointers);
@@ -651,7 +648,8 @@ H5Z_parse_term(H5Z_token *current, H5Z_datval_ptrs* dat_val_pointers)
H5Z_node *term = NULL;
H5Z_node *ret_value;
- FUNC_ENTER_NOAPI(H5Z_parse_term, NULL);
+ FUNC_ENTER_NOAPI_NOINIT
+
term = H5Z_parse_factor(current, dat_val_pointers);
for (;;) {
@@ -741,7 +739,7 @@ H5Z_parse_factor(H5Z_token *current, H5Z_datval_ptrs* dat_val_pointers)
H5Z_node *new_node;
H5Z_node *ret_value;
- FUNC_ENTER_NOAPI(H5Z_parse_factor, NULL);
+ FUNC_ENTER_NOAPI_NOINIT
current = H5Z_get_token(current);
@@ -880,7 +878,7 @@ H5Z_new_node(H5Z_token_type type)
{
H5Z_node *ret_value;
- FUNC_ENTER_NOAPI(H5Z_new_node, NULL)
+ FUNC_ENTER_NOAPI_NOINIT
if(NULL == (ret_value = (H5Z_node *)H5MM_calloc(sizeof(H5Z_node))))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "Ran out of memory trying to allocate space for nodes in the parse tree")
@@ -913,7 +911,7 @@ H5Z_xform_eval(H5Z_data_xform_t *data_xform_prop, void* array, size_t array_size
size_t i;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_xform_eval, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
HDassert(data_xform_prop);
@@ -1024,7 +1022,7 @@ H5Z_xform_eval_full(H5Z_node *tree, const size_t array_size, const hid_t array_
H5Z_result resl, resr;
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI(H5Z_xform_eval_full, FAIL)
+ FUNC_ENTER_NOAPI_NOINIT
/* check args */
HDassert(tree);
@@ -1111,7 +1109,7 @@ H5Z_xform_find_type(const H5T_t* type)
H5T_t *tmp; /* Temporary datatype */
hid_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5Z_xform_find_type)
+ FUNC_ENTER_NOAPI_NOINIT
HDassert(type);
@@ -1197,7 +1195,7 @@ H5Z_xform_copy_tree(H5Z_node* tree, H5Z_datval_ptrs* dat_val_pointers, H5Z_datva
{
H5Z_node* ret_value=NULL;
- FUNC_ENTER_NOAPI(H5Z_xform_copy_tree, NULL)
+ FUNC_ENTER_NOAPI(NULL)
assert(tree);
@@ -1273,7 +1271,7 @@ H5Z_xform_copy_tree(H5Z_node* tree, H5Z_datval_ptrs* dat_val_pointers, H5Z_datva
void
H5Z_xform_reduce_tree(H5Z_node* tree)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5Z_xform_reduce_tree)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(tree) {
if((tree->type == H5Z_XFORM_PLUS) || (tree->type == H5Z_XFORM_DIVIDE) ||(tree->type == H5Z_XFORM_MULT) ||(tree->type == H5Z_XFORM_MINUS))
@@ -1315,8 +1313,7 @@ H5Z_xform_reduce_tree(H5Z_node* tree)
static void
H5Z_do_op(H5Z_node* tree)
{
-
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5Z_do_op)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(tree->type == H5Z_XFORM_DIVIDE)
H5Z_XFORM_DO_OP3(/)
@@ -1328,7 +1325,6 @@ H5Z_do_op(H5Z_node* tree)
H5Z_XFORM_DO_OP3(-)
FUNC_LEAVE_NOAPI_VOID;
-
}
@@ -1359,7 +1355,7 @@ H5Z_xform_create(const char *expr)
unsigned int i;
unsigned int count = 0;
- FUNC_ENTER_NOAPI(H5Z_xform_create, NULL)
+ FUNC_ENTER_NOAPI(NULL)
assert(expr);
@@ -1445,7 +1441,7 @@ done:
herr_t
H5Z_xform_destroy(H5Z_data_xform_t *data_xform_prop)
{
- FUNC_ENTER_NOAPI_NOFUNC(H5Z_xform_destroy)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
if(data_xform_prop) {
/* Destroy the parse tree */
@@ -1498,7 +1494,7 @@ H5Z_xform_copy(H5Z_data_xform_t **data_xform_prop)
H5Z_data_xform_t *new_data_xform_prop=NULL;
herr_t ret_value=SUCCEED;
- FUNC_ENTER_NOAPI(H5Z_xform_copy, FAIL)
+ FUNC_ENTER_NOAPI(FAIL)
if(*data_xform_prop) {
/* Allocate new node */
@@ -1575,7 +1571,7 @@ H5Z_xform_noop(const H5Z_data_xform_t *data_xform_prop)
{
hbool_t ret_value;
- FUNC_ENTER_NOAPI_NOFUNC(H5Z_xform_noop)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
ret_value=(data_xform_prop ? FALSE : TRUE);
@@ -1604,7 +1600,7 @@ H5Z_xform_extract_xform_str(const H5Z_data_xform_t *data_xform_prop)
{
char* ret_value;
- FUNC_ENTER_NOAPI_NOFUNC(H5Z_xform_extract_xform_str)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* There should be no way that this can be NULL since the function
* that calls this one checks to make sure it isn't before
diff --git a/src/H5checksum.c b/src/H5checksum.c
index 6c01508..ec8b2b0 100644
--- a/src/H5checksum.c
+++ b/src/H5checksum.c
@@ -115,7 +115,7 @@ H5_checksum_fletcher32(const void *_data, size_t _len)
size_t len = _len / 2; /* Length in 16-bit words */
uint32_t sum1 = 0, sum2 = 0;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5_checksum_fletcher32)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(_data);
@@ -171,7 +171,7 @@ H5_checksum_crc_make_table(void)
uint32_t c; /* Checksum for each byte value */
unsigned n, k; /* Local index variables */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5_checksum_crc_make_table)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Compute the checksum for each possible byte value */
for(n = 0; n < 256; n++) {
@@ -209,7 +209,7 @@ H5_checksum_crc_update(uint32_t crc, const uint8_t *buf, size_t len)
{
size_t n; /* Local index variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5_checksum_crc_update)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Initialize the CRC table if necessary */
if(!H5_crc_table_computed)
@@ -243,7 +243,7 @@ H5_checksum_crc_update(uint32_t crc, const uint8_t *buf, size_t len)
uint32_t
H5_checksum_crc(const void *_data, size_t len)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5_checksum_crc)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(_data);
@@ -376,7 +376,7 @@ H5_checksum_lookup3(const void *key, size_t length, uint32_t initval)
const uint8_t *k = (const uint8_t *)key;
uint32_t a, b, c; /* internal state */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5_checksum_lookup3)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(key);
@@ -448,7 +448,7 @@ done:
uint32_t
H5_checksum_metadata(const void *data, size_t len, uint32_t initval)
{
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5_checksum_metadata)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(data);
@@ -481,7 +481,7 @@ H5_hash_string(const char *str)
uint32_t hash = 5381;
int c;
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5_hash_string)
+ FUNC_ENTER_NOAPI_NOINIT_NOERR
/* Sanity check */
HDassert(str);
diff --git a/src/H5dbg.c b/src/H5dbg.c
index 632ac08..5441895 100644
--- a/src/H5dbg.c
+++ b/src/H5dbg.c
@@ -83,7 +83,7 @@ H5_buffer_dump(FILE *stream, int indent, const uint8_t *buf,
{
size_t u, v; /* Local index variable */
- FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5_buffer_dump)
+ FUNC_ENTER_NOAPI_NOINIT
/*
* Check arguments.
diff --git a/src/H5detect.c b/src/H5detect.c
index 0461cfd..98fd6ae 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -621,7 +621,7 @@ H5TN_init_interface(void)\n\
H5T_t *dt = NULL;\n\
herr_t ret_value = SUCCEED;\n\
\n\
- FUNC_ENTER_NOAPI(H5TN_init_interface, FAIL)\n");
+ FUNC_ENTER_NOAPI(FAIL)\n");
for(i = 0; i < nd; i++) {
/* The native endianess of this machine */
diff --git a/src/H5private.h b/src/H5private.h
index 7129f72..24a8394 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -193,11 +193,10 @@
*/
#define eventa(func_name) h5_mpe_eventa
#define eventb(func_name) h5_mpe_eventb
-#define MPE_LOG_VARS(func_name) \
- static int eventa(func_name) = -1; \
- static int eventb(func_name) = -1; \
- const char* p_end_funcname = #func_name; \
- const char* p_event_start = "start" #func_name;
+#define MPE_LOG_VARS \
+ static int eventa(FUNC) = -1; \
+ static int eventb(FUNC) = -1; \
+ const char* p_event_start = "start" FUNC;
/* Hardwire the color to "red", since that's what all the routines are using
* now. In the future, if we want to change that color for a given routine,
@@ -206,15 +205,15 @@
* color information down to the BEGIN_MPE_LOG macro (which should have a new
* BEGIN_MPE_LOG_COLOR variant). -QAK
*/
-#define BEGIN_MPE_LOG(func_name) \
+#define BEGIN_MPE_LOG \
if (H5_MPEinit_g){ \
- if (eventa(func_name) == -1 && eventb(func_name) == -1) { \
+ if (eventa(FUNC) == -1 && eventb(FUNC) == -1) { \
const char* p_color = "red"; \
- eventa(func_name)=MPE_Log_get_event_number(); \
- eventb(func_name)=MPE_Log_get_event_number(); \
- MPE_Describe_state(eventa(func_name), eventb(func_name), (char *)p_end_funcname, (char *)p_color); \
+ eventa(FUNC)=MPE_Log_get_event_number(); \
+ eventb(FUNC)=MPE_Log_get_event_number(); \
+ MPE_Describe_state(eventa(FUNC), eventb(FUNC), (char *)FUNC, (char *)p_color); \
} \
- MPE_Log_event(eventa(func_name), 0, (char *)p_event_start); \
+ MPE_Log_event(eventa(FUNC), 0, (char *)p_event_start); \
}
@@ -226,12 +225,12 @@
*/
#define FINISH_MPE_LOG \
if (H5_MPEinit_g) { \
- MPE_Log_event(eventb(func_name), 0, (char *)p_end_funcname); \
+ MPE_Log_event(eventb(FUNC), 0, (char *)FUNC); \
}
#else /* H5_HAVE_MPE */
-#define MPE_LOG_VARS(func_name) /* void */
-#define BEGIN_MPE_LOG(func_name) /* void */
+#define MPE_LOG_VARS /* void */
+#define BEGIN_MPE_LOG /* void */
#define FINISH_MPE_LOG /* void */
#endif /* H5_HAVE_MPE */
@@ -271,15 +270,6 @@
#endif /* __cplusplus */
/*
- * Does the compiler expand __FUNCTION__ to be the name of the function
- * currently being defined? If not then define it to be some constant
- * string.
- */
-#ifndef H5_HAVE_FUNCTION
-# define __FUNCTION__ "NoFunctionName"
-#endif
-
-/*
* Status return values for the `herr_t' type.
* Since some unix/c routines use 0 and -1 (or more precisely, non-negative
* vs. negative) as their return code, and some assumption had been made in
@@ -1498,6 +1488,15 @@ extern char *strdup(const char *s);
#define COLON_SEPC ':'
+/* Use FUNC to safely handle variations of C99 __func__ keyword handling */
+#ifdef H5_HAVE_C99_FUNC
+#define FUNC __func__
+#elif defined(H5_HAVE_FUNCTION)
+#define FUNC __FUNCTION__
+#else
+#error "We need __func__ or __FUNCTION__ to test function names!"
+#endif
+
/*
* These macros check whether debugging has been requested for a certain
* package at run-time. Code for debugging is conditionally compiled by
@@ -1643,8 +1642,6 @@ H5_DLL double H5_trace(const double *calltime, const char *func, const char *typ
*
* Programmer: Quincey Koziol
*
- * Modifications:
- *
*-------------------------------------------------------------------------
*/
@@ -1652,6 +1649,24 @@ H5_DLL double H5_trace(const double *calltime, const char *func, const char *typ
/* an API function */
#define H5_IS_API(S) ('_'!=((const char *)S)[2] && '_'!=((const char *)S)[3] && (!((const char *)S)[4] || '_'!=((const char *)S)[4]))
+/* `S' is the name of a function which is being tested to check if it's */
+/* a public API function */
+#define H5_IS_PUB(S) (((HDisdigit(S[1]) || HDisupper(S[1])) && HDislower(S[2])) || \
+ ((HDisdigit(S[2]) || HDisupper(S[2])) && HDislower(S[3])) || \
+ (!S[4] || ((HDisdigit(S[3]) || HDisupper(S[3])) && HDislower(S[4]))))
+
+/* `S' is the name of a function which is being tested to check if it's */
+/* a private library function */
+#define H5_IS_PRIV(S) (((HDisdigit(S[1]) || HDisupper(S[1])) && '_' == S[2] && HDislower(S[3])) || \
+ ((HDisdigit(S[2]) || HDisupper(S[2])) && '_' == S[3] && HDislower(S[4])) || \
+ ((HDisdigit(S[3]) || HDisupper(S[3])) && '_' == S[4] && HDislower(S[5])))
+
+/* `S' is the name of a function which is being tested to check if it's */
+/* a package private function */
+#define H5_IS_PKG(S) (((HDisdigit(S[1]) || HDisupper(S[1])) && '_' == S[2] && '_' == S[3] && HDislower(S[4])) || \
+ ((HDisdigit(S[2]) || HDisupper(S[2])) && '_' == S[3] && '_' == S[4] && HDislower(S[5])) || \
+ ((HDisdigit(S[3]) || HDisupper(S[3])) && '_' == S[4] && '_' == S[5] && HDislower(S[6])))
+
/* global library version information string */
extern char H5_lib_vers_info_g[];
@@ -1718,10 +1733,10 @@ extern hbool_t H5_libinit_g; /* Has the library been initialized? */
/* Include required function stack header */
#include "H5CSprivate.h"
-#define H5_PUSH_FUNC(func_name) H5CS_push(#func_name);
+#define H5_PUSH_FUNC H5CS_push(FUNC);
#define H5_POP_FUNC H5CS_pop();
#else /* H5_HAVE_CODESTACK */
-#define H5_PUSH_FUNC(func_name) /* void */
+#define H5_PUSH_FUNC /* void */
#define H5_POP_FUNC /* void */
#endif /* H5_HAVE_CODESTACK */
@@ -1729,15 +1744,6 @@ extern hbool_t H5_libinit_g; /* Has the library been initialized? */
extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */
#endif
-/* Check if the function name is correct (if the compiler supports __FUNCTION__) */
-#ifdef H5_HAVE_FUNCTION
-#define H5_CHECK_FUNCNAME(func_name) \
- assert(!HDstrcmp(#func_name, __FUNCTION__))
-#else /* H5_HAVE_FUNCTION */
-#define H5_CHECK_FUNCNAME(func_name) \
- assert(func_name)
-#endif /* H5_HAVE_FUNCTION */
-
/* Macros for defining interface initialization routines */
#ifdef H5_INTERFACE_INIT_FUNC
static int H5_interface_initialize_g = 0;
@@ -1758,31 +1764,29 @@ static herr_t H5_INTERFACE_INIT_FUNC(void);
#ifndef NDEBUG
-#define FUNC_ENTER_COMMON_NOFUNC(func_name,asrt) \
- static hbool_t func_check = FALSE; \
- \
- if(!func_check) { \
- /* Check API status */ \
- HDassert(asrt); \
- \
- /* Check function name */ \
- H5_CHECK_FUNCNAME(func_name); \
- \
- /* Don't check again */ \
- func_check = TRUE; \
- } /* end if */
+#define FUNC_ENTER_CHECK_NAME(asrt) \
+ { \
+ static hbool_t func_check = FALSE; \
+ \
+ if(!func_check) { \
+ /* Check function naming status */ \
+ HDassert(asrt); \
+ \
+ /* Don't check again */ \
+ func_check = TRUE; \
+ } /* end if */ \
+ } /* end scope */
#else /* NDEBUG */
-#define FUNC_ENTER_COMMON_NOFUNC(func_name,asrt)
+#define FUNC_ENTER_CHECK_NAME(asrt)
#endif /* NDEBUG */
-#define FUNC_ENTER_COMMON(func_name, asrt) \
- static const char FUNC[] = #func_name; \
+
+#define FUNC_ENTER_COMMON(asrt) \
hbool_t err_occurred = FALSE; \
- FUNC_ENTER_COMMON_NOFUNC(func_name, asrt);
+ FUNC_ENTER_CHECK_NAME(asrt);
-#define FUNC_ENTER_COMMON_NOERR(func_name, asrt) \
- static const char FUNC[] = #func_name; \
- FUNC_ENTER_COMMON_NOFUNC(func_name, asrt);
+#define FUNC_ENTER_COMMON_NOERR(asrt) \
+ FUNC_ENTER_CHECK_NAME(asrt);
/* Threadsafety initialization code for API routines */
#define FUNC_ENTER_API_THREADSAFE \
@@ -1794,16 +1798,16 @@ static herr_t H5_INTERFACE_INIT_FUNC(void);
H5_API_LOCK
/* Local variables for API routines */
-#define FUNC_ENTER_API_VARS(func_name) \
- MPE_LOG_VARS(func_name) \
+#define FUNC_ENTER_API_VARS \
+ MPE_LOG_VARS \
H5TRACE_DECL
-#define FUNC_ENTER_API_COMMON(func_name) \
- FUNC_ENTER_API_VARS(func_name) \
- FUNC_ENTER_COMMON(func_name, H5_IS_API(#func_name)); \
+#define FUNC_ENTER_API_COMMON \
+ FUNC_ENTER_API_VARS \
+ FUNC_ENTER_COMMON(H5_IS_API(FUNC)); \
FUNC_ENTER_API_THREADSAFE;
-#define FUNC_ENTER_API_INIT(func_name,err) \
+#define FUNC_ENTER_API_INIT(err) \
/* Initialize the library */ \
if(!(H5_INIT_GLOBAL)) { \
H5_INIT_GLOBAL = TRUE; \
@@ -1816,14 +1820,14 @@ static herr_t H5_INTERFACE_INIT_FUNC(void);
H5_INTERFACE_INIT(err) \
\
/* Push the name of this function on the function stack */ \
- H5_PUSH_FUNC(#func_name) \
+ H5_PUSH_FUNC \
\
- BEGIN_MPE_LOG(func_name)
+ BEGIN_MPE_LOG
/* Use this macro for all "normal" API functions */
-#define FUNC_ENTER_API(func_name,err) {{ \
- FUNC_ENTER_API_COMMON(func_name) \
- FUNC_ENTER_API_INIT(func_name,err); \
+#define FUNC_ENTER_API(err) {{ \
+ FUNC_ENTER_API_COMMON \
+ FUNC_ENTER_API_INIT(err); \
/* Clear thread error stack entering public functions */ \
H5E_clear_stack(NULL); \
{
@@ -1832,9 +1836,9 @@ static herr_t H5_INTERFACE_INIT_FUNC(void);
* Use this macro for API functions that shouldn't clear the error stack
* like H5Eprint and H5Ewalk.
*/
-#define FUNC_ENTER_API_NOCLEAR(func_name,err) {{ \
- FUNC_ENTER_API_COMMON(func_name) \
- FUNC_ENTER_API_INIT(func_name,err); \
+#define FUNC_ENTER_API_NOCLEAR(err) {{ \
+ FUNC_ENTER_API_COMMON \
+ FUNC_ENTER_API_INIT(err); \
{
/*
@@ -1843,10 +1847,10 @@ static herr_t H5_INTERFACE_INIT_FUNC(void);
* are: H5check_version, etc.
*
*/
-#define FUNC_ENTER_API_NOINIT(func_name) {{ \
- FUNC_ENTER_API_COMMON(func_name) \
- H5_PUSH_FUNC(func_name) \
- BEGIN_MPE_LOG(func_name); \
+#define FUNC_ENTER_API_NOINIT {{ \
+ FUNC_ENTER_API_COMMON \
+ H5_PUSH_FUNC \
+ BEGIN_MPE_LOG \
{
/*
@@ -1856,50 +1860,55 @@ static herr_t H5_INTERFACE_INIT_FUNC(void);
* are: H5close, H5check_version, etc.
*
*/
-#define FUNC_ENTER_API_NOINIT_NOERR_NOFS(func_name) {{ \
- FUNC_ENTER_API_VARS(func_name) \
- FUNC_ENTER_COMMON_NOERR(func_name, H5_IS_API(#func_name)); \
+#define FUNC_ENTER_API_NOINIT_NOERR_NOFS {{ \
+ FUNC_ENTER_API_VARS \
+ FUNC_ENTER_COMMON_NOERR(H5_IS_API(FUNC)); \
FUNC_ENTER_API_THREADSAFE; \
- BEGIN_MPE_LOG(func_name); \
+ BEGIN_MPE_LOG \
{
/* Note: this macro only works when there's _no_ interface initialization routine for the module */
-#define FUNC_ENTER_NOAPI_INIT(func_name,err) \
+#define FUNC_ENTER_NOAPI_INIT(err) \
/* Initialize the interface, if appropriate */ \
H5_INTERFACE_INIT(err) \
\
/* Push the name of this function on the function stack */ \
- H5_PUSH_FUNC(#func_name)
+ H5_PUSH_FUNC
/* 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_name)); \
- FUNC_ENTER_NOAPI_INIT(func_name,err) \
+#define FUNC_ENTER_NOAPI(err) { \
+ FUNC_ENTER_COMMON(!H5_IS_API(FUNC)); \
+ FUNC_ENTER_NOAPI_INIT(err) \
{
-/* Use this macro for all non-API functions, which propagate errors, but don't issue them */
-#define FUNC_ENTER_NOAPI_NOERR(func_name,err) { \
- FUNC_ENTER_COMMON_NOERR(func_name, !H5_IS_API(#func_name)); \
- FUNC_ENTER_NOAPI_INIT(func_name,err) \
+/* Use this macro for all "normal" package-level functions */
+#define FUNC_ENTER_PACKAGE { \
+ FUNC_ENTER_COMMON(H5_IS_PKG(FUNC)); \
+ H5_PUSH_FUNC \
{
-/* Use this macro for all non-API functions which don't issue errors */
-#define FUNC_ENTER_NOAPI_NOFUNC(func_name) { \
- FUNC_ENTER_COMMON_NOFUNC(func_name,!H5_IS_API(#func_name)); \
- FUNC_ENTER_NOAPI_INIT(func_name,err) \
+/* Use this macro for package-level functions which propgate errors, but don't issue them */
+#define FUNC_ENTER_PACKAGE_NOERR { \
+ FUNC_ENTER_COMMON_NOERR(H5_IS_PKG(FUNC)); \
+ H5_PUSH_FUNC \
{
-/*
- * 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.
- */
-#define FUNC_ENTER_NOAPI_NOINIT(func_name) { \
- FUNC_ENTER_COMMON(func_name, !H5_IS_API(#func_name)); \
- H5_PUSH_FUNC(func_name) \
+/* Use the following macro as replacement for the FUNC_ENTER_PACKAGE
+ * macro when the function needs to set up a metadata tag. */
+#define FUNC_ENTER_PACKAGE_TAG(dxpl_id, tag, err) { \
+ haddr_t prev_tag = HADDR_UNDEF; \
+ hid_t tag_dxpl_id = dxpl_id; \
+ \
+ FUNC_ENTER_COMMON(H5_IS_PKG(FUNC)); \
+ if(H5AC_tag(tag_dxpl_id, tag, &prev_tag) < 0) \
+ HGOTO_ERROR(H5E_CACHE, H5E_CANTTAG, err, "unable to apply metadata tag") \
+ H5_PUSH_FUNC \
+ {
+
+/* Use this macro for all non-API functions, which propagate errors, but don't issue them */
+#define FUNC_ENTER_NOAPI_NOERR { \
+ FUNC_ENTER_COMMON_NOERR(!H5_IS_API(FUNC)); \
+ FUNC_ENTER_NOAPI_INIT(-) \
{
/*
@@ -1909,11 +1918,10 @@ static herr_t H5_INTERFACE_INIT_FUNC(void);
* initialized.
* - functions which are called during library shutdown, since we don't
* want to re-initialize the library.
- * - functions that propagate, but don't issue errors
*/
-#define FUNC_ENTER_NOAPI_NOINIT_NOERR(func_name) { \
- FUNC_ENTER_COMMON_NOERR(func_name, !H5_IS_API(#func_name)); \
- H5_PUSH_FUNC(#func_name) \
+#define FUNC_ENTER_NOAPI_NOINIT { \
+ FUNC_ENTER_COMMON(!H5_IS_API(FUNC)); \
+ H5_PUSH_FUNC \
{
/*
@@ -1923,14 +1931,11 @@ static herr_t H5_INTERFACE_INIT_FUNC(void);
* 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)
- *
+ * - functions that propagate, but don't issue errors
*/
-#define FUNC_ENTER_NOAPI_NOINIT_NOFUNC(func_name) { \
- FUNC_ENTER_COMMON_NOFUNC(func_name,!H5_IS_API(#func_name)); \
- H5_PUSH_FUNC(func_name) \
+#define FUNC_ENTER_NOAPI_NOINIT_NOERR { \
+ FUNC_ENTER_COMMON_NOERR(!H5_IS_API(FUNC)); \
+ H5_PUSH_FUNC \
{
/*
@@ -1942,8 +1947,8 @@ static herr_t H5_INTERFACE_INIT_FUNC(void);
* also don't use the 'FUNC' variable (i.e. don't push errors on the error stack)
*
*/
-#define FUNC_ENTER_NOAPI_NOFUNC_NOFS(func_name) { \
- FUNC_ENTER_COMMON_NOFUNC(func_name,!H5_IS_API(#func_name)); \
+#define FUNC_ENTER_NOAPI_NOERR_NOFS { \
+ FUNC_ENTER_COMMON_NOERR(!H5_IS_API(FUNC)); \
{
/*-------------------------------------------------------------------------
@@ -1960,7 +1965,7 @@ static herr_t H5_INTERFACE_INIT_FUNC(void);
H5_API_SET_CANCEL
#define FUNC_LEAVE_API(ret_value) \
- FINISH_MPE_LOG; \
+ FINISH_MPE_LOG \
H5TRACE_RETURN(ret_value); \
H5_POP_FUNC \
if(err_occurred) \
@@ -1972,7 +1977,7 @@ static herr_t H5_INTERFACE_INIT_FUNC(void);
/* Use this macro to match the FUNC_ENTER_API_NOFS macro */
#define FUNC_LEAVE_API_NOFS(ret_value) \
- FINISH_MPE_LOG; \
+ FINISH_MPE_LOG \
H5TRACE_RETURN(ret_value); \
FUNC_LEAVE_API_THREADSAFE \
return(ret_value); \
diff --git a/src/H5system.c b/src/H5system.c
index 1f0ad29..bb1d2f1 100644
--- a/src/H5system.c
+++ b/src/H5system.c
@@ -689,7 +689,7 @@ H5_build_extpath(const char *name, char **extpath/*out*/)
char *new_name = NULL; /* Pointer to the name of the file */
herr_t ret_value = SUCCEED; /* Return value */
- FUNC_ENTER_NOAPI_NOINIT(H5_build_extpath)
+ FUNC_ENTER_NOAPI_NOINIT
/* Clear external path pointer to begin with */
*extpath = NULL;