diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2002-05-29 15:07:55 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2002-05-29 15:07:55 (GMT) |
| commit | e69e970a1c71621c39a5f5fa656a185948ed1df8 (patch) | |
| tree | 6d62761aa80d47e1713786bdeadabed02cc3c8f0 | |
| parent | 0ba943194ec2c8b74bbfd6531ee7a9b110803974 (diff) | |
| download | hdf5-e69e970a1c71621c39a5f5fa656a185948ed1df8.zip hdf5-e69e970a1c71621c39a5f5fa656a185948ed1df8.tar.gz hdf5-e69e970a1c71621c39a5f5fa656a185948ed1df8.tar.bz2 | |
[svn-r5471] Purpose:
Code cleanup
Description:
Broke the FUNC_ENTER macro into several macros, with more specialized
uses (which followup mail will describe). This was designed to move
most/all of the checks which could be done at compile time to that point,
instead of needlessly performing them (over & over :-) at run-time.
This reduces the library's size (and thus staticly linked binaries) and
has a minor speedup effect also.
Platforms tested:
IRIX64 6.5 (modi4) with parallel & FORTRAN enabled, and additional testing
on FreeBSD and Solaris immediately after the checkin.
| -rw-r--r-- | src/H5.c | 14 | ||||
| -rw-r--r-- | src/H5A.c | 30 | ||||
| -rw-r--r-- | src/H5AC.c | 20 | ||||
| -rw-r--r-- | src/H5B.c | 29 | ||||
| -rw-r--r-- | src/H5D.c | 93 | ||||
| -rw-r--r-- | src/H5Dcontig.c | 8 | ||||
| -rw-r--r-- | src/H5Distore.c | 52 | ||||
| -rw-r--r-- | src/H5Dseq.c | 8 | ||||
| -rw-r--r-- | src/H5E.c | 50 | ||||
| -rw-r--r-- | src/H5Epublic.h | 1 | ||||
| -rw-r--r-- | src/H5F.c | 62 | ||||
| -rw-r--r-- | src/H5FD.c | 85 | ||||
| -rw-r--r-- | src/H5FDcore.c | 26 | ||||
| -rw-r--r-- | src/H5FDfamily.c | 36 | ||||
| -rw-r--r-- | src/H5FDgass.c | 34 | ||||
| -rw-r--r-- | src/H5FDlog.c | 34 | ||||
| -rw-r--r-- | src/H5FDmpio.c | 85 | ||||
| -rw-r--r-- | src/H5FDsec2.c | 24 | ||||
| -rw-r--r-- | src/H5FDsrb.c | 33 | ||||
| -rw-r--r-- | src/H5FDstream.c | 26 | ||||
| -rw-r--r-- | src/H5FL.c | 20 | ||||
| -rw-r--r-- | src/H5Farray.c | 6 | ||||
| -rw-r--r-- | src/H5Fcontig.c | 8 | ||||
| -rw-r--r-- | src/H5Fistore.c | 52 | ||||
| -rw-r--r-- | src/H5Fseq.c | 8 | ||||
| -rw-r--r-- | src/H5G.c | 68 | ||||
| -rw-r--r-- | src/H5Gent.c | 18 | ||||
| -rw-r--r-- | src/H5Gnode.c | 26 | ||||
| -rw-r--r-- | src/H5Gstab.c | 9 | ||||
| -rw-r--r-- | src/H5HG.c | 18 | ||||
| -rw-r--r-- | src/H5HL.c | 18 | ||||
| -rw-r--r-- | src/H5I.c | 26 | ||||
| -rw-r--r-- | src/H5MF.c | 6 | ||||
| -rw-r--r-- | src/H5MM.c | 2 | ||||
| -rw-r--r-- | src/H5O.c | 36 | ||||
| -rw-r--r-- | src/H5Oattr.c | 12 | ||||
| -rw-r--r-- | src/H5Ocomp.c | 14 | ||||
| -rw-r--r-- | src/H5Ocont.c | 6 | ||||
| -rw-r--r-- | src/H5Odtype.c | 21 | ||||
| -rw-r--r-- | src/H5Oefl.c | 19 | ||||
| -rw-r--r-- | src/H5Ofill.c | 39 | ||||
| -rw-r--r-- | src/H5Olayout.c | 12 | ||||
| -rw-r--r-- | src/H5Omtime.c | 13 | ||||
| -rw-r--r-- | src/H5Oname.c | 12 | ||||
| -rw-r--r-- | src/H5Osdspace.c | 14 | ||||
| -rw-r--r-- | src/H5Oshared.c | 8 | ||||
| -rw-r--r-- | src/H5Ostab.c | 14 | ||||
| -rw-r--r-- | src/H5P.c | 208 | ||||
| -rw-r--r-- | src/H5R.c | 10 | ||||
| -rw-r--r-- | src/H5S.c | 68 | ||||
| -rw-r--r-- | src/H5Sall.c | 36 | ||||
| -rw-r--r-- | src/H5Shyper.c | 58 | ||||
| -rw-r--r-- | src/H5Smpio.c | 6 | ||||
| -rw-r--r-- | src/H5Snone.c | 10 | ||||
| -rw-r--r-- | src/H5Spoint.c | 45 | ||||
| -rw-r--r-- | src/H5Sselect.c | 44 | ||||
| -rw-r--r-- | src/H5T.c | 195 | ||||
| -rw-r--r-- | src/H5TB.c | 34 | ||||
| -rw-r--r-- | src/H5Tbit.c | 3 | ||||
| -rw-r--r-- | src/H5Tconv.c | 391 | ||||
| -rw-r--r-- | src/H5Tvlen.c | 22 | ||||
| -rw-r--r-- | src/H5V.c | 22 | ||||
| -rw-r--r-- | src/H5Z.c | 11 | ||||
| -rw-r--r-- | src/H5Zdeflate.c | 2 | ||||
| -rw-r--r-- | src/H5detect.c | 2 | ||||
| -rw-r--r-- | src/H5private.h | 69 |
66 files changed, 1395 insertions, 1096 deletions
@@ -71,7 +71,7 @@ static int interface_initialize_g = 0; herr_t H5_init_library(void) { - FUNC_ENTER(H5_init_library, FAIL); + FUNC_ENTER_NOAPI(H5_init_library, FAIL); /* * Make sure the package information is updated. @@ -291,7 +291,7 @@ H5garbage_collect(void) { herr_t ret_value = SUCCEED; - FUNC_ENTER(H5garbage_collect, FAIL); + FUNC_ENTER_API(H5garbage_collect, FAIL); /* Call the garbage collection routines in the library */ H5FL_garbage_coll(); @@ -335,7 +335,7 @@ H5set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_lim, { herr_t ret_value = SUCCEED; - FUNC_ENTER(H5set_free_list_limits, FAIL); + FUNC_ENTER_API(H5set_free_list_limits, FAIL); /* Call the free list function to actually set the limits */ H5FL_set_free_list_limits(reg_global_lim, reg_list_lim, arr_global_lim, arr_list_lim, blk_global_lim, blk_list_lim); @@ -455,7 +455,7 @@ H5get_libversion(unsigned *majnum, unsigned *minnum, unsigned *relnum) { herr_t ret_value = SUCCEED; - FUNC_ENTER(H5get_libversion, FAIL); + FUNC_ENTER_API(H5get_libversion, FAIL); /* Set the version information */ if (majnum) *majnum = H5_VERS_MAJOR; @@ -495,7 +495,7 @@ H5check_version (unsigned majnum, unsigned minnum, unsigned relnum) char substr[] = H5_VERS_SUBRELEASE; static int checked = 0; - FUNC_ENTER_NOINIT(H5check_version); + FUNC_ENTER_API_NOINIT(H5check_version); if (H5_VERS_MAJOR!=majnum || H5_VERS_MINOR!=minnum || H5_VERS_RELEASE!=relnum) { @@ -562,7 +562,7 @@ H5check_version (unsigned majnum, unsigned minnum, unsigned relnum) herr_t H5open(void) { - FUNC_ENTER(H5open, FAIL); + FUNC_ENTER_API(H5open, FAIL); /* all work is done by FUNC_ENTER() */ FUNC_LEAVE(SUCCEED); } @@ -590,7 +590,7 @@ H5close (void) * thing just to release it all right away. It is safe to call this * function for an uninitialized library. */ - FUNC_ENTER_NOINIT(H5close); + FUNC_ENTER_API_NOINIT(H5close); H5_term_library(); @@ -159,7 +159,7 @@ H5Acreate(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, H5S_t *space = NULL; hid_t ret_value = FAIL; - FUNC_ENTER(H5Acreate, FAIL); + FUNC_ENTER_API(H5Acreate, FAIL); H5TRACE5("i","isiii",loc_id,name,type_id,space_id,plist_id); /* check arguments */ @@ -386,7 +386,7 @@ H5Aopen_name(hid_t loc_id, const char *name) int idx=0; hid_t ret_value = FAIL; - FUNC_ENTER(H5Aopen_name, FAIL); + FUNC_ENTER_API(H5Aopen_name, FAIL); H5TRACE2("i","is",loc_id,name); /* check arguments */ @@ -449,7 +449,7 @@ H5Aopen_idx(hid_t loc_id, unsigned idx) H5G_entry_t *ent = NULL; /*Symtab entry of object to attribute */ hid_t ret_value = FAIL; - FUNC_ENTER(H5Aopen_idx, FAIL); + FUNC_ENTER_API(H5Aopen_idx, FAIL); H5TRACE2("i","iIu",loc_id,idx); /* check arguments */ @@ -557,7 +557,7 @@ H5Awrite(hid_t attr_id, hid_t type_id, const void *buf) const H5T_t *mem_type = NULL; herr_t ret_value = FAIL; - FUNC_ENTER(H5Awrite, FAIL); + FUNC_ENTER_API(H5Awrite, FAIL); H5TRACE3("e","iix",attr_id,type_id,buf); /* check arguments */ @@ -711,7 +711,7 @@ H5Aread(hid_t attr_id, hid_t type_id, void *buf) const H5T_t *mem_type = NULL; herr_t ret_value = FAIL; - FUNC_ENTER(H5Aread, FAIL); + FUNC_ENTER_API(H5Aread, FAIL); H5TRACE3("e","iix",attr_id,type_id,buf); /* check arguments */ @@ -856,7 +856,7 @@ H5Aget_space(hid_t attr_id) H5S_t *dst = NULL; hid_t ret_value = FAIL; - FUNC_ENTER(H5Aget_space, FAIL); + FUNC_ENTER_API(H5Aget_space, FAIL); H5TRACE1("i","i",attr_id); /* check arguments */ @@ -913,7 +913,7 @@ H5Aget_type(hid_t attr_id) H5T_t *dst = NULL; hid_t ret_value = FAIL; - FUNC_ENTER(H5Aget_type, FAIL); + FUNC_ENTER_API(H5Aget_type, FAIL); H5TRACE1("i","i",attr_id); /* check arguments */ @@ -983,7 +983,7 @@ H5Aget_name(hid_t attr_id, size_t buf_size, char *buf) size_t copy_len, nbytes; ssize_t ret_value = FAIL; - FUNC_ENTER(H5Aget_name, FAIL); + FUNC_ENTER_API(H5Aget_name, FAIL); H5TRACE3("Zs","izs",attr_id,buf_size,buf); /* check arguments */ @@ -1041,7 +1041,7 @@ H5Aget_num_attrs(hid_t loc_id) void *obj = NULL; int ret_value = 0; - FUNC_ENTER(H5Aget_num_attrs, FAIL); + FUNC_ENTER_API(H5Aget_num_attrs, FAIL); H5TRACE1("Is","i",loc_id); /* check arguments */ @@ -1132,7 +1132,7 @@ H5Aiterate(hid_t loc_id, unsigned *attr_num, H5A_operator_t op, void *op_data) herr_t ret_value = 0; int idx; - FUNC_ENTER(H5Aiterate, FAIL); + FUNC_ENTER_API(H5Aiterate, FAIL); H5TRACE4("e","i*Iuxx",loc_id,attr_num,op,op_data); /* check arguments */ @@ -1203,7 +1203,7 @@ H5Adelete(hid_t loc_id, const char *name) int idx=0, found=-1; herr_t ret_value = FAIL; - FUNC_ENTER(H5Aopen_name, FAIL); + FUNC_ENTER_API(H5Aopen_name, FAIL); H5TRACE2("e","is",loc_id,name); /* check arguments */ @@ -1269,7 +1269,7 @@ H5Adelete(hid_t loc_id, const char *name) herr_t H5Aclose(hid_t attr_id) { - FUNC_ENTER(H5Aclose, FAIL); + FUNC_ENTER_API(H5Aclose, FAIL); H5TRACE1("e","i",attr_id); /* check arguments */ @@ -1304,7 +1304,7 @@ H5A_copy(const H5A_t *old_attr) { H5A_t *new_attr=NULL; - FUNC_ENTER(H5A_copy, NULL); + FUNC_ENTER_NOAPI(H5A_copy, NULL); /* check args */ assert(old_attr); @@ -1358,7 +1358,7 @@ H5A_copy(const H5A_t *old_attr) herr_t H5A_close(H5A_t *attr) { - FUNC_ENTER(H5A_close, FAIL); + FUNC_ENTER_NOAPI(H5A_close, FAIL); assert(attr); @@ -1421,7 +1421,7 @@ H5A_close(H5A_t *attr) H5G_entry_t * H5A_entof(H5A_t *attr) { - FUNC_ENTER(H5A_entof, NULL); + FUNC_ENTER_NOAPI(H5A_entof, NULL); assert(attr); FUNC_LEAVE(&(attr->ent)); } @@ -89,7 +89,8 @@ int H5AC_create(H5F_t *f, int size_hint) { H5AC_t *cache = NULL; - FUNC_ENTER(H5AC_create, FAIL); + + FUNC_ENTER_NOAPI(H5AC_create, FAIL); assert(f); assert(NULL == f->shared->cache); @@ -137,7 +138,8 @@ herr_t H5AC_dest(H5F_t *f) { H5AC_t *cache = NULL; - FUNC_ENTER(H5AC_dest, FAIL); + + FUNC_ENTER_NOAPI(H5AC_dest, FAIL); assert(f); assert(f->shared->cache); @@ -221,7 +223,7 @@ H5AC_find_f(H5F_t *f, const H5AC_class_t *type, haddr_t addr, H5AC_info_t **info = NULL; H5AC_t *cache = NULL; - FUNC_ENTER(H5AC_find, NULL); + FUNC_ENTER_NOAPI(H5AC_find, NULL); assert(f); assert(f->shared->cache); @@ -404,7 +406,7 @@ H5AC_flush(H5F_t *f, const H5AC_class_t *type, haddr_t addr, hbool_t destroy) unsigned nslots; H5AC_t *cache = NULL; - FUNC_ENTER(H5AC_flush, FAIL); + FUNC_ENTER_NOAPI(H5AC_flush, FAIL); assert(f); assert(f->shared->cache); @@ -536,7 +538,7 @@ H5AC_set(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *thing) H5AC_info_t **info = NULL; H5AC_t *cache = NULL; - FUNC_ENTER(H5AC_set, FAIL); + FUNC_ENTER_NOAPI(H5AC_set, FAIL); assert(f); assert(f->shared->cache); @@ -610,7 +612,7 @@ H5AC_rename(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, herr_t status; H5AC_t *cache = NULL; - FUNC_ENTER(H5AC_rename, FAIL); + FUNC_ENTER_NOAPI(H5AC_rename, FAIL); assert(f); assert(f->shared->cache); @@ -720,7 +722,7 @@ H5AC_protect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, } #endif - FUNC_ENTER(H5AC_protect, NULL); + FUNC_ENTER_NOAPI(H5AC_protect, NULL); /* check args */ assert(f); @@ -836,7 +838,7 @@ H5AC_unprotect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *thing) H5AC_t *cache = NULL; H5AC_info_t **info = NULL; - FUNC_ENTER(H5AC_unprotect, FAIL); + FUNC_ENTER_NOAPI(H5AC_unprotect, FAIL); /* check args */ assert(f); @@ -923,7 +925,7 @@ H5AC_debug(H5F_t UNUSED *f) double miss_rate; #endif - FUNC_ENTER(H5AC_debug, FAIL); + FUNC_ENTER_NOAPI(H5AC_debug, FAIL); #ifdef H5AC_DEBUG if (H5DEBUG(AC)) { @@ -196,7 +196,7 @@ H5B_create(H5F_t *f, const H5B_class_t *type, void *udata, int i; herr_t ret_value = FAIL; - FUNC_ENTER(H5B_create, FAIL); + FUNC_ENTER_NOAPI(H5B_create, FAIL); /* * Check arguments. @@ -311,7 +311,7 @@ H5B_Kvalue(H5F_t *f, const H5B_class_t *type) int btree_k[H5B_NUM_BTREE_ID]; H5P_genplist_t *plist; - FUNC_ENTER(H5B_Kvalue, FAIL); + FUNC_ENTER_NOAPI(H5B_Kvalue, FAIL); assert(f); assert(type); @@ -356,7 +356,7 @@ H5B_load(H5F_t *f, haddr_t addr, const void *_type, void *udata) uint8_t *p; H5B_t *ret_value = NULL; - FUNC_ENTER(H5B_load, NULL); + FUNC_ENTER_NOAPI(H5B_load, NULL); /* Check arguments */ assert(f); @@ -465,7 +465,7 @@ H5B_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5B_t *bt) size_t size = 0; uint8_t *p = bt->page; - FUNC_ENTER(H5B_flush, FAIL); + FUNC_ENTER_NOAPI(H5B_flush, FAIL); /* * Check arguments. @@ -576,7 +576,7 @@ H5B_find(H5F_t *f, const H5B_class_t *type, haddr_t addr, void *udata) int idx = -1, lt = 0, rt, cmp = 1; int ret_value = FAIL; - FUNC_ENTER(H5B_find, FAIL); + FUNC_ENTER_NOAPI(H5B_find, FAIL); /* * Check arguments. @@ -926,7 +926,7 @@ H5B_insert(H5F_t *f, const H5B_class_t *type, haddr_t addr, H5B_ins_t my_ins = H5B_INS_ERROR; herr_t ret_value = FAIL; - FUNC_ENTER(H5B_insert, FAIL); + FUNC_ENTER_NOAPI(H5B_insert, FAIL); /* * Check arguments. @@ -1579,7 +1579,7 @@ H5B_iterate (H5F_t *f, const H5B_class_t *type, H5B_operator_t op, haddr_t addr, int i, nchildren; herr_t ret_value = FAIL; - FUNC_ENTER(H5B_iterate, FAIL); + FUNC_ENTER_NOAPI(H5B_iterate, FAIL); /* * Check arguments. @@ -1698,7 +1698,8 @@ H5B_remove_helper(H5F_t *f, haddr_t addr, const H5B_class_t *type, size_t sizeof_rkey, sizeof_rec; hsize_t sizeof_node; - FUNC_ENTER(H5B_remove_helper, H5B_INS_ERROR); + FUNC_ENTER_NOAPI(H5B_remove_helper, H5B_INS_ERROR); + assert(f); assert(H5F_addr_defined(addr)); assert(type); @@ -1980,8 +1981,7 @@ H5B_remove(H5F_t *f, const H5B_class_t *type, haddr_t addr, void *udata) hbool_t rt_key_changed = FALSE; /*right key changed?*/ H5B_t *bt = NULL; /*btree node */ - - FUNC_ENTER(H5B_remove, FAIL); + FUNC_ENTER_NOAPI(H5B_remove, FAIL); /* Check args */ assert(f); @@ -2046,7 +2046,7 @@ H5B_nodesize(H5F_t *f, const H5B_class_t *type, { size_t size; - FUNC_ENTER(H5B_nodesize, (size_t) 0); + FUNC_ENTER_NOAPI(H5B_nodesize, (size_t) 0); /* * Check arguments. @@ -2099,7 +2099,7 @@ H5B_copy(H5F_t *f, const H5B_t *old_bt) size_t nkeys; size_t u; - FUNC_ENTER(H5B_copy, NULL); + FUNC_ENTER_NOAPI(H5B_copy, NULL); /* * Check arguments. @@ -2173,7 +2173,7 @@ H5B_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth, H5B_t *bt = NULL; int i; - FUNC_ENTER(H5B_debug, FAIL); + FUNC_ENTER_NOAPI(H5B_debug, FAIL); /* * Check arguments. @@ -2280,7 +2280,8 @@ H5B_assert(H5F_t *f, haddr_t addr, const H5B_class_t *type, void *udata) struct child_t *next; } *head = NULL, *tail = NULL, *prev = NULL, *cur = NULL, *tmp = NULL; - FUNC_ENTER(H5B_assert, FAIL); + FUNC_ENTER_NOAPI(H5B_assert, FAIL); + if (0==ncalls++) { if (H5DEBUG(B)) { fprintf(H5DEBUG(B), "H5B: debugging B-trees (expensive)\n"); @@ -100,7 +100,7 @@ H5FL_BLK_DEFINE_STATIC(vlen_fl_buf); herr_t H5D_init(void) { - FUNC_ENTER(H5D_init, FAIL); + FUNC_ENTER_NOAPI(H5D_init, FAIL); /* FUNC_ENTER() does all the work */ FUNC_LEAVE(SUCCEED); } @@ -400,7 +400,7 @@ H5D_crt_copy(hid_t new_plist_id, hid_t old_plist_id, void UNUSED *copy_data) H5P_genplist_t *new_plist; herr_t ret_value=SUCCEED; - FUNC_ENTER(H5D_crt_copy, FAIL); + FUNC_ENTER_NOAPI(H5D_crt_copy, FAIL); /* Verify property list ID */ if (TRUE!=H5P_isa_class(new_plist_id,H5P_DATASET_CREATE) || NULL == (new_plist = H5I_object(new_plist_id))) @@ -477,7 +477,7 @@ H5D_crt_close(hid_t dcpl_id, void UNUSED *close_data) H5P_genplist_t *plist; /* Property list */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER(H5D_crt_close, FAIL); + FUNC_ENTER_NOAPI(H5D_crt_close, FAIL); /* Check arguments */ if (TRUE!=H5P_isa_class(dcpl_id,H5P_DATASET_CREATE) || NULL == (plist = H5I_object(dcpl_id))) @@ -536,7 +536,7 @@ H5D_xfer_create(hid_t dxpl_id, void UNUSED *create_data) H5P_genplist_t *plist; /* Property list */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER(H5D_xfer_create, FAIL); + FUNC_ENTER_NOAPI(H5D_xfer_create, FAIL); /* Check arguments */ if (TRUE!=H5P_isa_class(dxpl_id,H5P_DATASET_XFER) || NULL == (plist = H5I_object(dxpl_id))) @@ -592,7 +592,7 @@ H5D_xfer_copy(hid_t new_plist_id, hid_t UNUSED old_plist_id, { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER(H5D_xfer_copy, FAIL); + FUNC_ENTER_NOAPI(H5D_xfer_copy, FAIL); if(H5D_xfer_create(new_plist_id, copy_data) < 0) HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't copy property list"); @@ -630,7 +630,7 @@ H5D_xfer_close(hid_t dxpl_id, void UNUSED *close_data) H5P_genplist_t *plist; /* Property list */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER(H5D_xfer_close, FAIL); + FUNC_ENTER_NOAPI(H5D_xfer_close, FAIL); /* Check arguments */ if (TRUE!=H5P_isa_class(dxpl_id,H5P_DATASET_XFER) || NULL == (plist = H5I_object(dxpl_id))) @@ -702,7 +702,7 @@ H5Dcreate(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, H5D_t *new_dset = NULL; hid_t ret_value = FAIL; - FUNC_ENTER(H5Dcreate, FAIL); + FUNC_ENTER_API(H5Dcreate, FAIL); H5TRACE5("i","isiii",loc_id,name,type_id,space_id,plist_id); /* Check arguments */ @@ -769,7 +769,7 @@ H5Dopen(hid_t loc_id, const char *name) H5D_t *dataset = NULL; /*the dataset */ hid_t ret_value = FAIL; - FUNC_ENTER(H5Dopen, FAIL); + FUNC_ENTER_API(H5Dopen, FAIL); H5TRACE2("i","is",loc_id,name); /* Check args */ @@ -819,7 +819,7 @@ H5Dclose(hid_t dset_id) { H5D_t *dset = NULL; /* dataset object to release */ - FUNC_ENTER(H5Dclose, FAIL); + FUNC_ENTER_API(H5Dclose, FAIL); H5TRACE1("e","i",dset_id); /* Check args */ @@ -865,7 +865,7 @@ H5Dget_space(hid_t dset_id) H5S_t *space = NULL; hid_t ret_value = FAIL; - FUNC_ENTER (H5Dget_space, FAIL); + FUNC_ENTER_API(H5Dget_space, FAIL); H5TRACE1("i","i",dset_id); /* Check args */ @@ -912,7 +912,7 @@ H5D_get_space(H5D_t *dset) { H5S_t *space = NULL; - FUNC_ENTER(H5D_get_space, NULL); + FUNC_ENTER_NOAPI(H5D_get_space, NULL); assert(dset); if (NULL==(space=H5S_read(&(dset->ent)))) { @@ -945,7 +945,7 @@ herr_t H5Dget_space_status(hid_t dset_id, H5D_space_status_t *allocation) H5D_t *dset = NULL; herr_t ret_value = SUCCEED; - FUNC_ENTER(H5Dget_space_status, FAIL); + FUNC_ENTER_API(H5Dget_space_status, FAIL); /* Check arguments */ if(H5I_DATASET != H5I_get_type(dset_id) || NULL==(dset=H5I_object(dset_id))) @@ -1056,7 +1056,7 @@ H5Dget_type(hid_t dset_id) H5T_t *copied_type = NULL; hid_t ret_value = FAIL; - FUNC_ENTER (H5Dget_type, FAIL); + FUNC_ENTER_API(H5Dget_type, FAIL); H5TRACE1("i","i",dset_id); /* Check args */ @@ -1123,7 +1123,7 @@ H5Dget_create_plist(hid_t dset_id) H5P_genplist_t *new_plist; hid_t ret_value = FAIL; - FUNC_ENTER (H5Dget_create_plist, FAIL); + FUNC_ENTER_API(H5Dget_create_plist, FAIL); H5TRACE1("i","i",dset_id); /* Check args */ @@ -1204,7 +1204,7 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, const H5S_t *mem_space = NULL; const H5S_t *file_space = NULL; - FUNC_ENTER(H5Dread, FAIL); + FUNC_ENTER_API(H5Dread, FAIL); H5TRACE6("e","iiiiix",dset_id,mem_type_id,mem_space_id,file_space_id, plist_id,buf); @@ -1302,7 +1302,7 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, const H5S_t *mem_space = NULL; const H5S_t *file_space = NULL; - FUNC_ENTER(H5Dwrite, FAIL); + FUNC_ENTER_API(H5Dwrite, FAIL); H5TRACE6("e","iiiiix",dset_id,mem_type_id,mem_space_id,file_space_id, plist_id,buf); @@ -1377,7 +1377,7 @@ H5Dextend(hid_t dset_id, const hsize_t *size) { H5D_t *dset = NULL; - FUNC_ENTER (H5Dextend, FAIL); + FUNC_ENTER_API(H5Dextend, FAIL); H5TRACE2("e","i*h",dset_id,size); /* Check args */ @@ -1398,11 +1398,6 @@ H5Dextend(hid_t dset_id, const hsize_t *size) FUNC_LEAVE (SUCCEED); } - - - - - /*------------------------------------------------------------------------- * Function: H5D_new @@ -1433,7 +1428,7 @@ H5D_new(hid_t dcpl_id) H5P_genplist_t *plist; /* Property list created */ H5D_t *ret_value = NULL; /*return value */ - FUNC_ENTER(H5D_new, NULL); + FUNC_ENTER_NOAPI(H5D_new, NULL); /* check args */ /* Nothing to check */ @@ -1530,7 +1525,7 @@ H5D_create(H5G_entry_t *loc, const char *name, const H5T_t *type, H5P_genplist_t *plist; /* Property list */ H5P_genplist_t *new_plist; /* New Property list */ - FUNC_ENTER(H5D_create, NULL); + FUNC_ENTER_NOAPI(H5D_create, NULL); /* check args */ assert (loc); @@ -1836,7 +1831,8 @@ H5D_isa(H5G_entry_t *ent) { htri_t exists; - FUNC_ENTER(H5D_isa, FAIL); + FUNC_ENTER_NOAPI(H5D_isa, FAIL); + assert(ent); /* Data type */ @@ -1892,7 +1888,7 @@ H5D_open(H5G_entry_t *loc, const char *name) H5D_t *ret_value = NULL; /*return value */ H5G_entry_t ent; /*dataset symbol table entry */ - FUNC_ENTER(H5D_open, NULL); + FUNC_ENTER_NOAPI(H5D_open, NULL); /* check args */ assert (loc); @@ -1952,7 +1948,7 @@ H5D_open_oid(H5G_entry_t *ent) int chunk_ndims; H5P_genplist_t *plist; /* Property list */ - FUNC_ENTER(H5D_open_oid, NULL); + FUNC_ENTER_NOAPI(H5D_open_oid, NULL); /* check args */ assert (ent); @@ -2125,7 +2121,7 @@ H5D_close(H5D_t *dataset) { unsigned free_failed; - FUNC_ENTER(H5D_close, FAIL); + FUNC_ENTER_NOAPI(H5D_close, FAIL); /* check args */ assert(dataset && dataset->ent.file); @@ -2243,7 +2239,7 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, H5P_genplist_t *dc_plist; /* Dataset creation roperty list */ unsigned sconv_flags=0; /* Flags for the space conversion */ - FUNC_ENTER(H5D_read, FAIL); + FUNC_ENTER_NOAPI(H5D_read, FAIL); /* check args */ assert(dataset && dataset->ent.file); @@ -2657,7 +2653,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space, H5P_genplist_t *dc_plist; /* Dataset creation roperty list */ unsigned sconv_flags=0; /* Flags for the space conversion */ - FUNC_ENTER(H5D_write, FAIL); + FUNC_ENTER_NOAPI(H5D_write, FAIL); /* check args */ assert(dataset && dataset->ent.file); @@ -3036,7 +3032,7 @@ H5D_extend (H5D_t *dataset, const hsize_t *size) H5O_fill_t fill; H5P_genplist_t *plist; /* Property list */ - FUNC_ENTER (H5D_extend, FAIL); + FUNC_ENTER_NOAPI(H5D_extend, FAIL); /* Check args */ assert (dataset); @@ -3135,9 +3131,12 @@ H5D_entof (H5D_t *dataset) H5T_t * H5D_typeof (H5D_t *dset) { - FUNC_ENTER (H5D_typeof, NULL); + /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ + FUNC_ENTER_NOINIT(H5D_typeof); + assert (dset); assert (dset->type); + FUNC_LEAVE (dset->type); } @@ -3161,9 +3160,12 @@ H5D_typeof (H5D_t *dset) H5F_t * H5D_get_file (const H5D_t *dset) { - FUNC_ENTER (H5D_get_file, NULL); + /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ + FUNC_ENTER_NOINIT(H5D_get_file); + assert (dset); assert (dset->ent.file); + FUNC_LEAVE (dset->ent.file); } @@ -3312,7 +3314,7 @@ H5Dget_storage_size(hid_t dset_id) H5D_t *dset=NULL; hsize_t size; - FUNC_ENTER(H5Dget_storage_size, 0); + FUNC_ENTER_API(H5Dget_storage_size, 0); H5TRACE1("h","i",dset_id); /* Check args */ @@ -3348,7 +3350,7 @@ H5D_get_storage_size(H5D_t *dset) unsigned u; /* Index variable */ hsize_t ret_value=0; - FUNC_ENTER(H5D_get_storage_size, 0); + FUNC_ENTER_NOAPI(H5D_get_storage_size, 0); if (H5D_CHUNKED==dset->layout.type) { ret_value = H5F_istore_allocated(dset->ent.file, dset->layout.ndims, @@ -3438,7 +3440,7 @@ H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t op, H5S_t *space = NULL; herr_t ret_value=FAIL; - FUNC_ENTER(H5Diterate, FAIL); + FUNC_ENTER_API(H5Diterate, FAIL); H5TRACE5("e","xiixx",buf,type_id,space_id,op,operator_data); /* Check args */ @@ -3480,7 +3482,7 @@ H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf) { herr_t ret_value=FAIL; - FUNC_ENTER(H5Dvlen_reclaim, FAIL); + FUNC_ENTER_API(H5Dvlen_reclaim, FAIL); H5TRACE4("e","iiix",type_id,space_id,plist_id,buf); /* Check args */ @@ -3519,11 +3521,12 @@ H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf) * *------------------------------------------------------------------------- */ -void *H5D_vlen_get_buf_size_alloc(size_t size, void *info) +void * +H5D_vlen_get_buf_size_alloc(size_t size, void *info) { H5T_vlen_bufsize_t *vlen_bufsize=(H5T_vlen_bufsize_t *)info; - FUNC_ENTER(H5D_vlen_get_buf_size_alloc, NULL); + FUNC_ENTER_NOAPI(H5D_vlen_get_buf_size_alloc, NULL); /* 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) @@ -3567,7 +3570,7 @@ H5D_vlen_get_buf_size(void UNUSED *elem, hid_t type_id, hsize_t UNUSED ndim, hss H5T_t *dt = NULL; herr_t ret_value=FAIL; - FUNC_ENTER(H5D_vlen_get_buf_size, FAIL); + FUNC_ENTER_NOAPI(H5D_vlen_get_buf_size, FAIL); assert(op_data); assert(H5I_DATATYPE == H5I_get_type(type_id)); @@ -3633,7 +3636,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=FAIL; - FUNC_ENTER(H5Dvlen_get_buf_size, FAIL); + FUNC_ENTER_API(H5Dvlen_get_buf_size, FAIL); H5TRACE4("e","iii*h",dataset_id,type_id,space_id,size); /* Check args */ @@ -3821,7 +3824,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 (H5Dfill, FAIL); + FUNC_ENTER_API(H5Dfill, FAIL); H5TRACE5("e","xixii",fill,fill_type_id,buf,buf_type_id,space_id); /* Check args */ @@ -3867,7 +3870,7 @@ H5Dset_extent(hid_t dset_id, const hsize_t *size) { H5D_t *dset = NULL; - FUNC_ENTER(H5Dset_extent, FAIL); + FUNC_ENTER_API(H5Dset_extent, FAIL); H5TRACE2("e","i*h",dset_id,size); /* Check args */ @@ -3915,7 +3918,7 @@ H5D_set_extent(H5D_t *dset, const hsize_t *size) int u; int shrink = 0; - FUNC_ENTER(H5D_set_extent, FAIL); + FUNC_ENTER_NOAPI(H5D_set_extent, FAIL); /* Check args */ assert(dset); @@ -4022,7 +4025,7 @@ H5Ddebug(hid_t dset_id, unsigned UNUSED flags) { H5D_t *dset=NULL; - FUNC_ENTER(H5Ddebug, FAIL); + FUNC_ENTER_API(H5Ddebug, FAIL); H5TRACE2("e","iIu",dset_id,flags); /* Check args */ diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c index e80a67f..a009de1 100644 --- a/src/H5Dcontig.c +++ b/src/H5Dcontig.c @@ -49,7 +49,7 @@ H5F_contig_read(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr, { hsize_t offset=0; /* Offset for vector call */ - FUNC_ENTER(H5F_contig_read, FAIL); + FUNC_ENTER_NOAPI(H5F_contig_read, FAIL); /* Check args */ assert(f); @@ -85,7 +85,7 @@ H5F_contig_write(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr, size { hsize_t offset=0; /* Offset for vector call */ - FUNC_ENTER(H5F_contig_write, FAIL); + FUNC_ENTER_NOAPI(H5F_contig_write, FAIL); assert (f); assert (buf); @@ -139,7 +139,7 @@ H5F_contig_readv(H5F_t *f, hsize_t _max_data, H5FD_mem_t type, haddr_t _addr, hsize_t *offset_arr_p; /* Pointer into the offset array */ #endif /* SLOW_WAY */ - FUNC_ENTER(H5F_contig_readv, FAIL); + FUNC_ENTER_NOAPI(H5F_contig_readv, FAIL); /* Check args */ assert(f); @@ -579,7 +579,7 @@ H5F_contig_writev(H5F_t *f, hsize_t _max_data, H5FD_mem_t type, haddr_t _addr, hsize_t *offset_arr_p; /* Pointer into the offset array */ #endif /* SLOW_WAY */ - FUNC_ENTER(H5F_contig_writev, FAIL); + FUNC_ENTER_NOAPI(H5F_contig_writev, FAIL); /* Check args */ assert(f); diff --git a/src/H5Distore.c b/src/H5Distore.c index 3b8b7a5..38d7a1f 100644 --- a/src/H5Distore.c +++ b/src/H5Distore.c @@ -224,7 +224,7 @@ H5F_istore_chunk_alloc(size_t chunk_size) { void *ret_value; /* Pointer to the chunk to return to the user */ - FUNC_ENTER(H5F_istore_chunk_alloc, NULL); + FUNC_ENTER_NOAPI(H5F_istore_chunk_alloc, NULL); ret_value=H5FL_BLK_ALLOC(istore_chunk,chunk_size,0); @@ -253,7 +253,7 @@ H5F_istore_chunk_alloc(size_t chunk_size) void * H5F_istore_chunk_free(void *chunk) { - FUNC_ENTER(H5F_istore_chunk_free, NULL); + FUNC_ENTER_NOAPI(H5F_istore_chunk_free, NULL); H5FL_BLK_FREE(istore_chunk,chunk); @@ -284,7 +284,7 @@ H5F_istore_chunk_realloc(void *chunk, size_t new_size) { void *ret_value=NULL; /* Return value */ - FUNC_ENTER(H5F_istore_chunk_realloc, NULL); + FUNC_ENTER_NOAPI(H5F_istore_chunk_realloc, NULL); ret_value=H5FL_BLK_REALLOC(istore_chunk,chunk,new_size); @@ -352,7 +352,7 @@ H5F_istore_decode_key(H5F_t UNUSED *f, H5B_t *bt, uint8_t *raw, void *_key) int i; int ndims = H5F_ISTORE_NDIMS(bt); - FUNC_ENTER(H5F_istore_decode_key, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_decode_key, FAIL); /* check args */ assert(f); @@ -393,7 +393,7 @@ H5F_istore_encode_key(H5F_t UNUSED *f, H5B_t *bt, uint8_t *raw, void *_key) int ndims = H5F_ISTORE_NDIMS(bt); int i; - FUNC_ENTER(H5F_istore_encode_key, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_encode_key, FAIL); /* check args */ assert(f); @@ -435,7 +435,8 @@ H5F_istore_debug_key (FILE *stream, int indent, int fwidth, const H5F_istore_ud1_t *udata = (const H5F_istore_ud1_t *)_udata; unsigned u; - FUNC_ENTER (H5F_istore_debug_key, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_debug_key, FAIL); + assert (key); HDfprintf(stream, "%*s%-*s %Zd bytes\n", indent, "", fwidth, @@ -483,7 +484,7 @@ H5F_istore_cmp2(H5F_t UNUSED *f, void *_lt_key, void *_udata, H5F_istore_ud1_t *udata = (H5F_istore_ud1_t *) _udata; int cmp; - FUNC_ENTER(H5F_istore_cmp2, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_cmp2, FAIL); assert(lt_key); assert(rt_key); @@ -535,7 +536,7 @@ H5F_istore_cmp3(H5F_t UNUSED *f, void *_lt_key, void *_udata, H5F_istore_ud1_t *udata = (H5F_istore_ud1_t *) _udata; int cmp = 0; - FUNC_ENTER(H5F_istore_cmp3, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_cmp3, FAIL); assert(lt_key); assert(rt_key); @@ -583,7 +584,7 @@ H5F_istore_new_node(H5F_t *f, H5B_ins_t op, H5F_istore_ud1_t *udata = (H5F_istore_ud1_t *) _udata; unsigned u; - FUNC_ENTER(H5F_istore_new_node, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_new_node, FAIL); #ifdef AKC printf("%s: Called\n", FUNC); #endif @@ -671,7 +672,7 @@ H5F_istore_found(H5F_t UNUSED *f, haddr_t addr, const void *_lt_key, const H5F_istore_key_t *lt_key = (const H5F_istore_key_t *) _lt_key; unsigned u; - FUNC_ENTER(H5F_istore_found, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_found, FAIL); /* Check arguments */ assert(f); @@ -746,7 +747,7 @@ H5F_istore_insert(H5F_t *f, haddr_t addr, void *_lt_key, unsigned u; H5B_ins_t ret_value = H5B_INS_ERROR; - FUNC_ENTER(H5F_istore_insert, H5B_INS_ERROR); + FUNC_ENTER_NOAPI(H5F_istore_insert, H5B_INS_ERROR); #ifdef AKC printf("%s: Called\n", FUNC); #endif @@ -946,7 +947,7 @@ H5F_istore_init (H5F_t *f) { H5F_rdcc_t *rdcc = &(f->shared->rdcc); - FUNC_ENTER (H5F_istore_init, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_init, FAIL); HDmemset (rdcc, 0, sizeof(H5F_rdcc_t)); if (f->shared->rdcc_nbytes>0 && f->shared->rdcc_nelmts>0) { @@ -1186,7 +1187,7 @@ H5F_istore_flush (H5F_t *f, hbool_t preempt) int nerrors=0; H5F_rdcc_ent_t *ent=NULL, *next=NULL; - FUNC_ENTER (H5F_istore_flush, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_flush, FAIL); for (ent=rdcc->head; ent; ent=next) { next = ent->next; @@ -1233,7 +1234,7 @@ H5F_istore_dest (H5F_t *f) int nerrors=0; H5F_rdcc_ent_t *ent=NULL, *next=NULL; - FUNC_ENTER (H5F_istore_dest, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_dest, FAIL); for (ent=rdcc->head; ent; ent=next) { #ifdef H5F_ISTORE_DEBUG @@ -1795,7 +1796,7 @@ H5F_istore_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, H5O_fill_t fill; /* Fill value information */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER(H5F_istore_read, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_read, FAIL); /* Check args */ assert(f); @@ -1977,7 +1978,7 @@ H5F_istore_write(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, H5O_fill_t fill; /* Fill value information */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER(H5F_istore_write, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_write, FAIL); /* Check args */ assert(f); @@ -2144,7 +2145,7 @@ H5F_istore_create(H5F_t *f, H5O_layout_t *layout /*out */ ) unsigned u; #endif - FUNC_ENTER(H5F_istore_create, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_create, FAIL); /* Check args */ assert(f); @@ -2189,7 +2190,7 @@ H5F_istore_allocated(H5F_t *f, unsigned ndims, haddr_t addr) { H5F_istore_ud1_t udata; - FUNC_ENTER(H5F_istore_nchunks, 0); + FUNC_ENTER_NOAPI(H5F_istore_nchunks, 0); HDmemset(&udata, 0, sizeof udata); udata.mesg.ndims = ndims; @@ -2224,7 +2225,7 @@ H5F_istore_dump_btree(H5F_t *f, FILE *stream, unsigned ndims, haddr_t addr) { H5F_istore_ud1_t udata; - FUNC_ENTER(H5F_istore_dump_btree, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_dump_btree, FAIL); HDmemset(&udata, 0, sizeof udata); udata.mesg.ndims = ndims; @@ -2260,7 +2261,8 @@ H5F_istore_stats (H5F_t *f, hbool_t headers) double miss_rate; char ascii[32]; - FUNC_ENTER (H5F_istore_stats, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_stats, FAIL); + if (!H5DEBUG(AC)) HRETURN(SUCCEED); if (headers) { @@ -2319,7 +2321,7 @@ H5F_istore_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent, { H5F_istore_ud1_t udata; - FUNC_ENTER (H5F_istore_debug, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_debug, FAIL); HDmemset (&udata, 0, sizeof udata); udata.mesg.ndims = ndims; @@ -2445,7 +2447,7 @@ H5F_istore_allocate(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, unsigned u; /* Local index variable */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER(H5F_istore_allocate, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_allocate, FAIL); /* Check args */ assert(f); @@ -2683,7 +2685,7 @@ H5F_istore_prune_by_extent(H5F_t *f, const H5O_layout_t *layout, const H5S_t * s H5F_istore_ud1_t udata; /*B-tree pass-through */ hsize_t curr_dims[H5O_LAYOUT_NDIMS]; /*current dataspace dimensions */ - FUNC_ENTER(H5F_istore_prune_by_extent, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_prune_by_extent, FAIL); /* Check args */ assert(f); @@ -2837,7 +2839,7 @@ H5F_istore_remove(H5F_t *f, haddr_t addr, void *_lt_key /*in,out */ , { H5F_istore_key_t *lt_key = (H5F_istore_key_t *)_lt_key; - FUNC_ENTER(H5F_istore_remove,H5B_INS_ERROR); + FUNC_ENTER_NOAPI(H5F_istore_remove,H5B_INS_ERROR); H5FD_free(f->shared->lf, H5FD_MEM_DRAW, addr, (hsize_t)lt_key->nbytes); *lt_key_changed = FALSE; @@ -2898,7 +2900,7 @@ H5F_istore_initialize_by_extent(H5F_t *f, const H5O_layout_t *layout, H5O_fill_t fill; /* Fill value information */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER(H5F_istore_initialize_by_extent, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_initialize_by_extent, FAIL); /* Check args */ assert(f); diff --git a/src/H5Dseq.c b/src/H5Dseq.c index 2714174..191748f 100644 --- a/src/H5Dseq.c +++ b/src/H5Dseq.c @@ -62,7 +62,7 @@ H5F_seq_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, const H5S_t *file_space, size_t elmt_size, size_t seq_len, hsize_t file_offset, void *buf/*out*/) { - FUNC_ENTER(H5F_seq_read, FAIL); + FUNC_ENTER_NOAPI(H5F_seq_read, FAIL); /* Check args */ assert(f); @@ -103,7 +103,7 @@ H5F_seq_write(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, const H5S_t *file_space, size_t elmt_size, size_t seq_len, hsize_t file_offset, const void *buf) { - FUNC_ENTER(H5F_seq_write, FAIL); + FUNC_ENTER_NOAPI(H5F_seq_write, FAIL); /* Check args */ assert(f); @@ -170,7 +170,7 @@ H5F_seq_readv(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, #endif herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER(H5F_seq_readv, FAIL); + FUNC_ENTER_NOAPI(H5F_seq_readv, FAIL); /* Check args */ assert(f); @@ -552,7 +552,7 @@ H5F_seq_writev(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, #endif herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER(H5F_seq_writev, FAIL); + FUNC_ENTER_NOAPI(H5F_seq_writev, FAIL); /* Check args */ assert(f); @@ -154,7 +154,6 @@ static const H5E_minor_mesg_t H5E_minor_mesg_g[] = { static int interface_initialize_g = 0; #define INTERFACE_INIT H5E_init_interface static herr_t H5E_init_interface (void); -const hbool_t H5E_clearable_g = TRUE; /* DO NOT CHANGE */ #ifdef H5_HAVE_THREADSAFE /* @@ -193,6 +192,10 @@ int H5E_mpi_error_str_len; herr_t (*H5E_auto_g)(void*) = (herr_t(*)(void*))H5Eprint; void *H5E_auto_data_g = NULL; + +/* Static function declarations */ +static herr_t H5E_walk_cb (int n, H5E_error_t *err_desc, void *client_data); + #ifdef H5_HAVE_THREADSAFE /*------------------------------------------------------------------------- @@ -217,7 +220,7 @@ H5E_get_stack(void) { H5E_t *estack; - FUNC_ENTER(H5E_get_stack,NULL); + FUNC_ENTER_NOAPI(H5E_get_stack,NULL); estack = pthread_getspecific(H5TS_errstk_key_g); if (!estack) { @@ -289,7 +292,7 @@ H5E_init_interface (void) herr_t H5Eset_auto(H5E_auto_t func, void *client_data) { - FUNC_ENTER (H5Eset_auto, FAIL); + FUNC_ENTER_API(H5Eset_auto, FAIL); H5TRACE2("e","xx",func,client_data); H5E_auto_g = func; @@ -318,7 +321,7 @@ H5Eset_auto(H5E_auto_t func, void *client_data) herr_t H5Eget_auto(H5E_auto_t *func, void **client_data) { - FUNC_ENTER (H5Eget_auto, FAIL); + FUNC_ENTER_API(H5Eget_auto, FAIL); H5TRACE2("e","*x*x",func,client_data); if (func) *func = H5E_auto_g; @@ -346,7 +349,7 @@ H5Eget_auto(H5E_auto_t *func, void **client_data) herr_t H5Eclear(void) { - FUNC_ENTER (H5Eclear, FAIL); + FUNC_ENTER_API(H5Eclear, FAIL); H5TRACE0("e",""); /* FUNC_ENTER() does all the work */ FUNC_LEAVE (SUCCEED); @@ -378,10 +381,10 @@ herr_t H5Eprint(FILE *stream) { H5E_t *estack = H5E_get_my_stack (); - hbool_t H5E_clearable_g = FALSE; /*override global*/ herr_t status = FAIL; - FUNC_ENTER (H5Eprint, FAIL); + /* Don't clear the error stack! :-) */ + FUNC_ENTER_API_NOCLEAR(H5Eprint, FAIL); /*NO TRACE*/ if (!stream) stream = stderr; @@ -403,7 +406,7 @@ H5Eprint(FILE *stream) #endif if (estack && estack->nused>0) fprintf (stream, " Back trace follows."); HDfputc ('\n', stream); - status = H5E_walk (H5E_WALK_DOWNWARD, H5Ewalk_cb, (void*)stream); + status = H5E_walk (H5E_WALK_DOWNWARD, H5E_walk_cb, (void*)stream); FUNC_LEAVE (status); } @@ -427,18 +430,20 @@ H5Eprint(FILE *stream) herr_t H5Ewalk(H5E_direction_t direction, H5E_walk_t func, void *client_data) { - hbool_t H5E_clearable_g = FALSE; /*override global*/ herr_t status = FAIL; - FUNC_ENTER (H5Ewalk, FAIL); + /* Don't clear the error stack! :-) */ + FUNC_ENTER_API_NOCLEAR(H5Ewalk, FAIL); H5TRACE3("e","Edxx",direction,func,client_data); + status = H5E_walk (direction, func, client_data); + FUNC_LEAVE (status); } /*------------------------------------------------------------------------- - * Function: H5Ewalk_cb + * Function: H5E_walk_cb * * Purpose: This is a default error stack traversal callback function * that prints error messages to the specified output stream. @@ -470,15 +475,15 @@ H5Ewalk(H5E_direction_t direction, H5E_walk_t func, void *client_data) * *------------------------------------------------------------------------- */ -herr_t -H5Ewalk_cb(int n, H5E_error_t *err_desc, void *client_data) +static herr_t +H5E_walk_cb(int n, H5E_error_t *err_desc, void *client_data) { FILE *stream = (FILE *)client_data; const char *maj_str = NULL; const char *min_str = NULL; const int indent = 2; - FUNC_ENTER_NOINIT(H5Ewalk_cb); + FUNC_ENTER_NOINIT(H5E_walk_cb); /*NO TRACE*/ /* Check arguments */ @@ -531,7 +536,7 @@ H5Eget_major (H5E_major_t n) * traversal and adding/removing entries as the result of an * error would most likely mess things up. */ - FUNC_ENTER_NOINIT(H5Eget_major); + FUNC_ENTER_API_NOINIT(H5Eget_major); for (i=0; i<NELMTS (H5E_major_mesg_g); i++) { if (H5E_major_mesg_g[i].error_code==n) @@ -571,7 +576,7 @@ H5Eget_minor (H5E_minor_t n) * traversal and adding/removing entries as the result of an * error would most likely mess things up. */ - FUNC_ENTER_NOINIT(H5Eget_minor); + FUNC_ENTER_API_NOINIT(H5Eget_minor); for (i=0; i<NELMTS (H5E_minor_mesg_g); i++) { if (H5E_minor_mesg_g[i].error_code==n) @@ -617,6 +622,7 @@ H5E_push(H5E_major_t maj_num, H5E_minor_t min_num, const char *function_name, * HERROR(). HERROR() is called by HRETURN_ERROR() which could * be called by FUNC_ENTER(). */ + FUNC_ENTER_NOINIT(H5E_push); /* * Don't fail if arguments are bad. Instead, substitute some default @@ -640,7 +646,7 @@ H5E_push(H5E_major_t maj_num, H5E_minor_t min_num, const char *function_name, estack->nused++; } - return SUCCEED; /*don't use FUNC_LEAVE() here */ + FUNC_LEAVE(SUCCEED); } @@ -672,9 +678,11 @@ H5Epush(const char *file, const char *func, unsigned line, H5E_major_t maj, { herr_t ret_value; - FUNC_ENTER(H5Epush, FAIL); + FUNC_ENTER_API(H5Epush, FAIL); H5TRACE6("e","ssIuEjEns",file,func,line,maj,min,str); + ret_value = H5E_push(maj, min, func, file, line, str); + FUNC_LEAVE(ret_value); } @@ -698,8 +706,10 @@ H5E_clear(void) { H5E_t *estack = H5E_get_my_stack (); - FUNC_ENTER(H5E_clear, FAIL); + FUNC_ENTER_NOAPI(H5E_clear, FAIL); + if (estack) estack->nused = 0; + FUNC_LEAVE(SUCCEED); } @@ -737,7 +747,7 @@ H5E_walk (H5E_direction_t direction, H5E_walk_t func, void *client_data) int i; herr_t status; - FUNC_ENTER(H5E_walk, FAIL); + FUNC_ENTER_NOAPI(H5E_walk, FAIL); /* check args, but rather than failing use some default value */ if (direction!=H5E_WALK_UPWARD && direction!=H5E_WALK_DOWNWARD) { diff --git a/src/H5Epublic.h b/src/H5Epublic.h index 254fa91..bb62c1a 100644 --- a/src/H5Epublic.h +++ b/src/H5Epublic.h @@ -220,7 +220,6 @@ __DLL__ herr_t H5Eclear (void); __DLL__ herr_t H5Eprint (FILE *stream); __DLL__ herr_t H5Ewalk (H5E_direction_t direction, H5E_walk_t func, void *client_data); -__DLL__ herr_t H5Ewalk_cb (int n, H5E_error_t *err_desc, void *client_data); __DLL__ const char *H5Eget_major (H5E_major_t major_number); __DLL__ const char *H5Eget_minor (H5E_minor_t minor_number); __DLL__ herr_t H5Epush(const char *file, const char *func, @@ -104,7 +104,7 @@ H5FL_EXTERN(H5G_t); herr_t H5F_init(void) { - FUNC_ENTER(H5F_init, FAIL); + FUNC_ENTER_NOAPI(H5F_init, FAIL); /* FUNC_ENTER() does all the work */ FUNC_LEAVE(SUCCEED); } @@ -480,7 +480,7 @@ H5F_acs_create(hid_t fapl_id, void UNUSED *copy_data) H5P_genplist_t *plist; /* Property list */ herr_t ret_value = SUCCEED; - FUNC_ENTER(H5F_acs_create, FAIL); + FUNC_ENTER_NOAPI(H5F_acs_create, FAIL); /* Check argument */ if(TRUE != H5P_isa_class(fapl_id, H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id))) @@ -535,7 +535,7 @@ H5F_acs_close(hid_t fapl_id, void UNUSED *close_data) H5P_genplist_t *plist; /* Property list */ herr_t ret_value = SUCCEED; - FUNC_ENTER(H5F_acs_close, FAIL); + FUNC_ENTER_NOAPI(H5F_acs_close, FAIL); /* Check argument */ if(TRUE != H5P_isa_class(fapl_id, H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id))) @@ -588,7 +588,7 @@ H5F_acs_copy(hid_t new_fapl_id, hid_t old_fapl_id, void UNUSED *copy_data) H5P_genplist_t *old_plist; /* Old property list */ herr_t ret_value = SUCCEED; - FUNC_ENTER(H5F_acs_copy, FAIL); + FUNC_ENTER_NOAPI(H5F_acs_copy, FAIL); if(H5I_GENPROP_LST != H5I_get_type(new_fapl_id) || H5I_GENPROP_LST != H5I_get_type(old_fapl_id)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property list"); @@ -662,7 +662,7 @@ H5F_flush_all_cb(H5F_t *f, hid_t UNUSED fid, const void *_invalidate) herr_t H5F_flush_all(hbool_t invalidate) { - FUNC_ENTER(H5F_flush_all, FAIL); + FUNC_ENTER_NOAPI(H5F_flush_all, FAIL); H5I_search(H5I_FILE,(H5I_search_func_t)H5F_flush_all_cb,(void*)&invalidate); @@ -691,7 +691,7 @@ H5F_flush_all(hbool_t invalidate) herr_t H5F_close_all(void) { - FUNC_ENTER(H5F_close_all, FAIL); + FUNC_ENTER_NOAPI(H5F_close_all, FAIL); if (H5I_clear_group(H5I_FILE, FALSE)<0) HRETURN_ERROR(H5E_FILE, H5E_CLOSEERROR, FAIL, "unable to close one or more files"); @@ -766,7 +766,7 @@ H5Fget_create_plist(hid_t file_id) H5P_genplist_t *plist; /* Property list */ hid_t ret_value = SUCCEED; - FUNC_ENTER(H5Fget_create_plist, FAIL); + FUNC_ENTER_API(H5Fget_create_plist, FAIL); H5TRACE1("i","i",file_id); /* check args */ @@ -814,7 +814,7 @@ H5Fget_access_plist(hid_t file_id) hid_t ret_value = SUCCEED; void *driver_info=NULL; - FUNC_ENTER(H5Fget_access_plist, FAIL); + FUNC_ENTER_API(H5Fget_access_plist, FAIL); H5TRACE1("i","i",file_id); /* Check args */ @@ -890,7 +890,7 @@ H5Fget_obj_count(hid_t file_id, unsigned types, unsigned *obj_id_count) H5F_t *f=NULL; herr_t ret_value = SUCCEED; - FUNC_ENTER(H5Fget_obj_counts, FAIL); + FUNC_ENTER_API(H5Fget_obj_counts, FAIL); H5TRACE3("e","iIu*Iu",file_id,types,obj_id_count); if( file_id != H5F_OBJ_ALL && (H5I_FILE != H5I_get_type(file_id) || @@ -959,7 +959,7 @@ H5Fget_obj_ids(hid_t file_id, unsigned types, hid_t *oid_list) herr_t ret_value = SUCCEED; H5F_t *f=NULL; - FUNC_ENTER(H5Fget_obj_ids, FAIL); + FUNC_ENTER_API(H5Fget_obj_ids, FAIL); H5TRACE3("e","iIu*i",file_id,types,oid_list); if( file_id != H5F_OBJ_ALL && (H5I_FILE != H5I_get_type(file_id) || NULL==(f=H5I_object(file_id))) ) @@ -1273,7 +1273,7 @@ H5Fis_hdf5(const char *name) H5FD_t *file = NULL; htri_t ret_value = FAIL; - FUNC_ENTER(H5Fis_hdf5, FAIL); + FUNC_ENTER_API(H5Fis_hdf5, FAIL); H5TRACE1("b","s",name); /* Check args and all the boring stuff. */ @@ -1635,7 +1635,7 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id) H5P_genplist_t *a_plist; /* Property list */ H5F_close_degree_t fc_degree; - FUNC_ENTER(H5F_open, NULL); + FUNC_ENTER_NOAPI(H5F_open, NULL); /* * If the driver has a `cmp' method then the driver is capable of @@ -2017,7 +2017,7 @@ H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, H5F_t *new_file = NULL; /*file struct for new file */ hid_t ret_value = FAIL; /*return value */ - FUNC_ENTER(H5Fcreate, FAIL); + FUNC_ENTER_API(H5Fcreate, FAIL); H5TRACE4("i","sIuii",filename,flags,fcpl_id,fapl_id); /* Check/fix arguments */ @@ -2113,7 +2113,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 = FAIL; /*return value */ - FUNC_ENTER(H5Fopen, FAIL); + FUNC_ENTER_API(H5Fopen, FAIL); H5TRACE3("i","sIui",filename,flags,fapl_id); /* Check/fix arguments. */ @@ -2171,7 +2171,7 @@ H5Fflush(hid_t object_id, H5F_scope_t scope) H5A_t *attr = NULL; H5G_entry_t *ent = NULL; - FUNC_ENTER(H5Fflush, FAIL); + FUNC_ENTER_API(H5Fflush, FAIL); H5TRACE2("e","iFs",object_id,scope); switch (H5I_get_type(object_id)) { @@ -2497,7 +2497,8 @@ H5F_close(H5F_t *f) unsigned closing=0; /* Indicate that the file will be closed */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER(H5F_close, FAIL); + FUNC_ENTER_NOAPI(H5F_close, FAIL); + assert(f->nrefs>0); /* @@ -2679,7 +2680,7 @@ H5Fclose(hid_t file_id) { herr_t ret_value = SUCCEED; - FUNC_ENTER(H5Fclose, FAIL); + FUNC_ENTER_API(H5Fclose, FAIL); H5TRACE1("e","i",file_id); /* Check/fix arguments. */ @@ -2947,7 +2948,8 @@ H5F_mountpoint(H5G_entry_t *find/*in,out*/) int lt, rt, md=(-1), cmp; H5G_entry_t *ent = NULL; - FUNC_ENTER(H5F_mountpoint, FAIL); + FUNC_ENTER_NOAPI(H5F_mountpoint, FAIL); + assert(find); /* @@ -3006,7 +3008,7 @@ H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id) H5G_entry_t *loc = NULL; H5F_t *child = NULL; - FUNC_ENTER(H5Fmount, FAIL); + FUNC_ENTER_API(H5Fmount, FAIL); H5TRACE4("e","isii",loc_id,name,child_id,plist_id); /* Check arguments */ @@ -3055,7 +3057,7 @@ H5Funmount(hid_t loc_id, const char *name) { H5G_entry_t *loc = NULL; - FUNC_ENTER(H5Funmount, FAIL); + FUNC_ENTER_API(H5Funmount, FAIL); H5TRACE2("e","is",loc_id,name); /* Check args */ @@ -3105,7 +3107,7 @@ H5Freopen(hid_t file_id) H5F_t *new_file=NULL; hid_t ret_value = -1; - FUNC_ENTER(H5Freopen, FAIL); + FUNC_ENTER_API(H5Freopen, FAIL); H5TRACE1("i","i",file_id); if (H5I_FILE!=H5I_get_type(file_id) || NULL==(old_file=H5I_object(file_id))) @@ -3147,7 +3149,8 @@ done: unsigned H5F_get_intent(const H5F_t *f) { - FUNC_ENTER(H5F_get_intent, 0); + /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ + FUNC_ENTER_NOINIT(H5F_get_intent); assert(f); @@ -3180,7 +3183,7 @@ H5F_sizeof_addr(const H5F_t *f) size_t sizeof_addr = 0; H5P_genplist_t *plist; /* Property list */ - FUNC_ENTER(H5F_sizeof_addr, 0); + FUNC_ENTER_NOAPI(H5F_sizeof_addr, 0); assert(f); assert(f->shared); @@ -3221,7 +3224,7 @@ H5F_sizeof_size(const H5F_t *f) size_t sizeof_size = 0; H5P_genplist_t *plist; /* Property list */ - FUNC_ENTER(H5F_sizeof_size, 0); + FUNC_ENTER_NOAPI(H5F_sizeof_size, 0); assert(f); assert(f->shared); @@ -3256,7 +3259,8 @@ H5F_sizeof_size(const H5F_t *f) hid_t H5F_get_driver_id(const H5F_t *f) { - FUNC_ENTER(H5F_get_driver_id, 0); + /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ + FUNC_ENTER_NOINIT(H5F_get_driver_id); assert(f); assert(f->shared); @@ -3287,7 +3291,7 @@ H5F_get_fileno(const H5F_t *f, unsigned long *filenum) { herr_t ret_value = SUCCEED; - FUNC_ENTER(H5F_get_fileno, FAIL); + FUNC_ENTER_NOAPI(H5F_get_fileno, FAIL); assert(f); assert(f->shared); @@ -3338,7 +3342,7 @@ H5F_block_read(H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, hid_t dxpl_ { haddr_t abs_addr; - FUNC_ENTER(H5F_block_read, FAIL); + FUNC_ENTER_NOAPI(H5F_block_read, FAIL); assert (f); assert (f->shared); @@ -3392,7 +3396,7 @@ H5F_block_write(H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, { haddr_t abs_addr; - FUNC_ENTER(H5F_block_write, FAIL); + FUNC_ENTER_NOAPI(H5F_block_write, FAIL); assert (f); assert (f->shared); @@ -3578,7 +3582,7 @@ H5F_debug(H5F_t *f, haddr_t UNUSED addr, FILE * stream, int indent, int boot_vers, freespace_vers, obj_dir_vers, share_head_vers; H5P_genplist_t *plist; /* Property list */ - FUNC_ENTER(H5F_debug, FAIL); + FUNC_ENTER_NOAPI(H5F_debug, FAIL); /* check args */ assert(f); @@ -184,7 +184,7 @@ H5FDregister(const H5FD_class_t *cls) H5FD_class_t *saved; H5FD_mem_t type; - FUNC_ENTER(H5FDregister, FAIL); + FUNC_ENTER_API(H5FDregister, FAIL); H5TRACE1("i","x",cls); /* Check arguments */ @@ -259,7 +259,7 @@ H5FDregister(const H5FD_class_t *cls) herr_t H5FDunregister(hid_t driver_id) { - FUNC_ENTER(H5FDunregister, FAIL); + FUNC_ENTER_API(H5FDunregister, FAIL); H5TRACE1("e","i",driver_id); /* Check arguments */ @@ -313,7 +313,7 @@ H5FD_get_class(hid_t id) H5FD_class_t *ret_value=NULL; hid_t driver_id = -1; - FUNC_ENTER(H5FD_get_class, NULL); + FUNC_ENTER_NOAPI(H5FD_get_class, NULL); if (H5I_VFL==H5I_get_type(id)) { ret_value = H5I_object(id); @@ -362,7 +362,7 @@ H5FD_sb_size(H5FD_t *file) { hsize_t ret_value=0; - FUNC_ENTER(H5FD_sb_size, 0); + FUNC_ENTER_NOAPI(H5FD_sb_size, 0); assert(file && file->cls); if (file->cls->sb_size) { @@ -397,7 +397,7 @@ H5FD_sb_size(H5FD_t *file) herr_t H5FD_sb_encode(H5FD_t *file, char *name/*out*/, uint8_t *buf) { - FUNC_ENTER(H5FD_sb_encode, FAIL); + FUNC_ENTER_NOAPI(H5FD_sb_encode, FAIL); assert(file && file->cls); if (file->cls->sb_encode && @@ -429,7 +429,7 @@ H5FD_sb_encode(H5FD_t *file, char *name/*out*/, uint8_t *buf) herr_t H5FD_sb_decode(H5FD_t *file, const char *name, const uint8_t *buf) { - FUNC_ENTER(H5FD_sb_decode, FAIL); + FUNC_ENTER_NOAPI(H5FD_sb_decode, FAIL); assert(file && file->cls); if (file->cls->sb_decode && @@ -473,7 +473,8 @@ H5FD_fapl_get(H5FD_t *file) { void *ret_value=NULL; - FUNC_ENTER(H5FD_fapl_get, NULL); + FUNC_ENTER_NOAPI(H5FD_fapl_get, NULL); + assert(file); if (file->cls->fapl_get) { @@ -510,7 +511,7 @@ H5FD_fapl_copy(hid_t driver_id, const void *old_fapl) void *new_fapl = NULL; H5FD_class_t *driver=NULL; - FUNC_ENTER(H5FD_fapl_copy, NULL); + FUNC_ENTER_NOAPI(H5FD_fapl_copy, NULL); /* Check args */ if (H5I_VFL!=H5I_get_type(driver_id) || @@ -555,8 +556,7 @@ H5FD_fapl_free(hid_t driver_id, void *fapl) { H5FD_class_t *driver=NULL; - FUNC_ENTER(H5FD_fapl_free, FAIL); - H5TRACE2("e","ix",driver_id,fapl); + FUNC_ENTER_NOAPI(H5FD_fapl_free, FAIL); /* Check args */ if (H5I_VFL!=H5I_get_type(driver_id) || @@ -604,7 +604,7 @@ H5FD_dxpl_copy(hid_t driver_id, const void *old_dxpl) void *new_dxpl = NULL; H5FD_class_t *driver=NULL; - FUNC_ENTER(H5FD_dxpl_copy, NULL); + FUNC_ENTER_NOAPI(H5FD_dxpl_copy, NULL); /* Check args */ if (H5I_VFL!=H5I_get_type(driver_id) || @@ -650,8 +650,7 @@ H5FD_dxpl_free(hid_t driver_id, void *dxpl) { H5FD_class_t *driver=NULL; - FUNC_ENTER(H5FD_dxpl_free, FAIL); - H5TRACE2("e","ix",driver_id,dxpl); + FUNC_ENTER_NOAPI(H5FD_dxpl_free, FAIL); /* Check args */ if (H5I_VFL!=H5I_get_type(driver_id) || @@ -733,7 +732,7 @@ H5FDopen(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) { H5FD_t *ret_value=NULL; - FUNC_ENTER(H5FDopen, NULL); + FUNC_ENTER_API(H5FDopen, NULL); if (NULL==(ret_value=H5FD_open(name, flags, fapl_id, maxaddr))) { HRETURN_ERROR(H5E_VFL, H5E_CANTINIT, NULL, @@ -774,7 +773,7 @@ H5FD_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) size_t meta_block_size=0; H5P_genplist_t *plist; /* Property list pointer */ - FUNC_ENTER(H5FD_open, NULL); + FUNC_ENTER_NOAPI(H5FD_open, NULL); /* Check arguments */ if(H5P_DEFAULT == fapl_id) @@ -857,7 +856,7 @@ H5FD_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) herr_t H5FDclose(H5FD_t *file) { - FUNC_ENTER(H5FDclose, FAIL); + FUNC_ENTER_API(H5FDclose, FAIL); H5TRACE1("e","x",file); if (!file || !file->cls) { @@ -902,7 +901,8 @@ H5FD_close(H5FD_t *file) hsize_t nbytes=0; #endif - FUNC_ENTER(H5FD_close, FAIL); + FUNC_ENTER_NOAPI(H5FD_close, FAIL); + assert(file && file->cls); /* Free all free-lists, leaking any memory thus described. Also leaks @@ -984,7 +984,7 @@ H5FDcmp(const H5FD_t *f1, const H5FD_t *f2) { int ret_value; - FUNC_ENTER(H5FDcmp, -1); /*return value is arbitrary*/ + FUNC_ENTER_API(H5FDcmp, -1); /*return value is arbitrary*/ H5TRACE2("Is","xx",f1,f2); ret_value = H5FD_cmp(f1, f2); @@ -1013,7 +1013,7 @@ H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2) { int ret_value; - FUNC_ENTER(H5FD_cmp, -1); /*return value is arbitrary*/ + FUNC_ENTER_NOAPI(H5FD_cmp, -1); /*return value is arbitrary*/ if ((!f1 || !f1->cls) && (!f2 || !f2->cls)) HRETURN(0); if (!f1 || !f1->cls) HRETURN(-1); @@ -1055,7 +1055,7 @@ H5FDquery(const H5FD_t *f, unsigned long *flags/*out*/) { int ret_value; - FUNC_ENTER(H5FDquery, FAIL); + FUNC_ENTER_API(H5FDquery, FAIL); H5TRACE2("Is","xx",f,flags); assert(f); @@ -1088,7 +1088,7 @@ H5FD_query(const H5FD_t *f, unsigned long *flags/*out*/) { int ret_value=0; - FUNC_ENTER(H5FD_query, FAIL); + FUNC_ENTER_NOAPI(H5FD_query, FAIL); assert(f); assert(flags); @@ -1149,7 +1149,7 @@ H5FDalloc(H5FD_t *file, H5FD_mem_t type, hsize_t size) { haddr_t ret_value = HADDR_UNDEF; - FUNC_ENTER(H5FDalloc, HADDR_UNDEF); + FUNC_ENTER_API(H5FDalloc, HADDR_UNDEF); H5TRACE3("a","xMth",file,type,size); /* Check args */ @@ -1200,7 +1200,7 @@ H5FD_alloc(H5FD_t *file, H5FD_mem_t type, hsize_t size) haddr_t ret_value = HADDR_UNDEF; H5FD_mem_t mapped_type; - FUNC_ENTER(H5FD_alloc, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_alloc, HADDR_UNDEF); /* Check args */ assert(file && file->cls); @@ -1587,7 +1587,7 @@ H5FD_real_alloc(H5FD_t *file, H5FD_mem_t type, hsize_t size) herr_t H5FDfree(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size) { - FUNC_ENTER(H5FDfree, FAIL); + FUNC_ENTER_API(H5FDfree, FAIL); H5TRACE4("e","xMtah",file,type,addr,size); /* Check args */ @@ -1629,7 +1629,7 @@ H5FD_free(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size) { H5FD_mem_t mapped_type; - FUNC_ENTER(H5FD_free, FAIL); + FUNC_ENTER_NOAPI(H5FD_free, FAIL); /* Check args */ assert(file && file->cls); @@ -1696,7 +1696,7 @@ H5FDrealloc(H5FD_t *file, H5FD_mem_t type, haddr_t old_addr, hsize_t old_size, { haddr_t ret_value=HADDR_UNDEF; - FUNC_ENTER(H5FDrealloc, HADDR_UNDEF); + FUNC_ENTER_API(H5FDrealloc, HADDR_UNDEF); H5TRACE5("a","xMtahh",file,type,old_addr,old_size,new_size); if (HADDR_UNDEF==(ret_value=H5FD_realloc(file, type, old_addr, old_size, @@ -1734,7 +1734,7 @@ H5FD_realloc(H5FD_t *file, H5FD_mem_t type, haddr_t old_addr, hsize_t old_size, uint8_t _buf[8192]; uint8_t *buf=_buf; - FUNC_ENTER(H5FD_realloc, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_realloc, HADDR_UNDEF); if (new_size==old_size) { /*nothing to do*/ @@ -1812,7 +1812,7 @@ H5FDget_eoa(H5FD_t *file) { haddr_t addr; - FUNC_ENTER(H5FDget_eoa, HADDR_UNDEF); + FUNC_ENTER_API(H5FDget_eoa, HADDR_UNDEF); H5TRACE1("a","x",file); /* Check args */ @@ -1852,7 +1852,7 @@ H5FD_get_eoa(H5FD_t *file) { haddr_t addr; - FUNC_ENTER(H5FD_get_eoa, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_get_eoa, HADDR_UNDEF); assert(file && file->cls); /* Dispatch to driver */ @@ -1895,7 +1895,7 @@ H5FD_get_eoa(H5FD_t *file) herr_t H5FDset_eoa(H5FD_t *file, haddr_t addr) { - FUNC_ENTER(H5FDset_eoa, FAIL); + FUNC_ENTER_API(H5FDset_eoa, FAIL); H5TRACE2("e","xa",file,addr); /* Check args */ @@ -1936,7 +1936,8 @@ H5FDset_eoa(H5FD_t *file, haddr_t addr) herr_t H5FD_set_eoa(H5FD_t *file, haddr_t addr) { - FUNC_ENTER(H5FD_set_eoa, FAIL); + FUNC_ENTER_NOAPI(H5FD_set_eoa, FAIL); + assert(file && file->cls); assert(H5F_addr_defined(addr) && addr<=file->maxaddr); @@ -1981,7 +1982,7 @@ H5FDget_eof(H5FD_t *file) { haddr_t addr; - FUNC_ENTER(H5FDget_eof, HADDR_UNDEF); + FUNC_ENTER_API(H5FDget_eof, HADDR_UNDEF); H5TRACE1("a","x",file); /* Check arguments */ @@ -2021,7 +2022,8 @@ H5FD_get_eof(H5FD_t *file) { haddr_t addr=HADDR_UNDEF; - FUNC_ENTER(H5FD_get_eof, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_get_eof, HADDR_UNDEF); + assert(file && file->cls); /* Dispatch to driver */ @@ -2063,7 +2065,7 @@ herr_t H5FDread(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, void *buf/*out*/) { - FUNC_ENTER(H5FDread, FAIL); + FUNC_ENTER_API(H5FDread, FAIL); H5TRACE6("e","xMtiazx",file,type,dxpl_id,addr,size,buf); /* Check args */ @@ -2110,7 +2112,8 @@ herr_t H5FD_read(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, void *buf/*out*/) { - FUNC_ENTER(H5FD_read, FAIL); + FUNC_ENTER_NOAPI(H5FD_read, FAIL); + assert(file && file->cls); assert(H5I_GENPROP_LST==H5I_get_type(dxpl_id)); assert(TRUE==H5P_isa_class(dxpl_id,H5P_DATASET_XFER)); @@ -2223,7 +2226,7 @@ herr_t H5FDwrite(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size, const void *buf) { - FUNC_ENTER(H5FDwrite, FAIL); + FUNC_ENTER_API(H5FDwrite, FAIL); H5TRACE6("e","xMtiazx",file,type,dxpl_id,addr,size,buf); /* Check args */ @@ -2273,7 +2276,8 @@ H5FD_write(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t si size_t new_size; /* New size of the accumulator buffer */ size_t old_offset; /* Offset of old data within the accumulator buffer */ - FUNC_ENTER(H5FD_write, FAIL); + FUNC_ENTER_NOAPI(H5FD_write, FAIL); + assert(file && file->cls); assert(H5I_GENPROP_LST==H5I_get_type(dxpl_id)); assert(TRUE==H5P_isa_class(dxpl_id,H5P_DATASET_XFER)); @@ -2484,7 +2488,7 @@ H5FD_write(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t si herr_t H5FDflush(H5FD_t *file, unsigned closing) { - FUNC_ENTER(H5FDflush, FAIL); + FUNC_ENTER_API(H5FDflush, FAIL); H5TRACE2("e","xIu",file,closing); /* Check args */ @@ -2523,7 +2527,8 @@ H5FDflush(H5FD_t *file, unsigned closing) herr_t H5FD_flush(H5FD_t *file, unsigned closing) { - FUNC_ENTER(H5FD_flush, FAIL); + FUNC_ENTER_NOAPI(H5FD_flush, FAIL); + assert(file && file->cls); /* Check if we need to flush out the metadata accumulator */ @@ -2563,7 +2568,7 @@ H5FD_flush(H5FD_t *file, unsigned closing) herr_t H5FD_get_fileno(const H5FD_t *file, unsigned long *filenum) { - FUNC_ENTER(H5FD_get_fileno, FAIL); + FUNC_ENTER_NOAPI(H5FD_get_fileno, FAIL); assert(file); assert(filenum); diff --git a/src/H5FDcore.c b/src/H5FDcore.c index 47bb551..7980b0b 100644 --- a/src/H5FDcore.c +++ b/src/H5FDcore.c @@ -144,7 +144,7 @@ static int interface_initialize_g = 0; hid_t H5FD_core_init(void) { - FUNC_ENTER(H5FD_core_init, FAIL); + FUNC_ENTER_NOAPI(H5FD_core_init, FAIL); if (H5I_VFL!=H5Iget_type(H5FD_CORE_g)) H5FD_CORE_g = H5FDregister(&H5FD_core_g); @@ -183,7 +183,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=FAIL; - FUNC_ENTER(H5FD_set_fapl_core, FAIL); + FUNC_ENTER_API(H5FD_set_fapl_core, FAIL); H5TRACE3("e","izb",fapl_id,increment,backing_store); /* Check argument */ @@ -228,7 +228,7 @@ H5Pget_fapl_core(hid_t fapl_id, size_t *increment/*out*/, H5FD_core_fapl_t *fa; H5P_genplist_t *plist; /* Property list pointer */ - FUNC_ENTER(H5Pget_fapl_core, FAIL); + FUNC_ENTER_API(H5Pget_fapl_core, FAIL); H5TRACE3("e","ixx",fapl_id,increment,backing_store); if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id))) @@ -270,7 +270,7 @@ H5FD_core_fapl_get(H5FD_t *_file) H5FD_core_t *file = (H5FD_core_t*)_file; H5FD_core_fapl_t *fa = NULL; - FUNC_ENTER(H5FD_core_fapl_get, NULL); + FUNC_ENTER_NOAPI(H5FD_core_fapl_get, NULL); if (NULL==(fa=H5MM_calloc(sizeof(H5FD_core_fapl_t)))) HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, @@ -311,7 +311,7 @@ H5FD_core_open(const char *name, unsigned UNUSED flags, hid_t fapl_id, H5P_genplist_t *plist; /* Property list pointer */ int fd=-1; - FUNC_ENTER(H5FD_core_open, NULL); + FUNC_ENTER_NOAPI(H5FD_core_open, NULL); /* Check arguments */ if (0==maxaddr || HADDR_UNDEF==maxaddr) @@ -369,7 +369,7 @@ H5FD_core_flush(H5FD_t *_file, unsigned UNUSED closing) { H5FD_core_t *file = (H5FD_core_t*)_file; - FUNC_ENTER(H5FD_core_flush, FAIL); + FUNC_ENTER_NOAPI(H5FD_core_flush, FAIL); /* Write to backing store */ if (file->dirty && file->fd>=0) { @@ -422,7 +422,7 @@ H5FD_core_close(H5FD_t *_file) { H5FD_core_t *file = (H5FD_core_t*)_file; - FUNC_ENTER(H5FD_core_close, FAIL); + FUNC_ENTER_NOAPI(H5FD_core_close, FAIL); /* Flush */ if (H5FD_core_flush(_file,TRUE)<0) @@ -465,7 +465,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; - FUNC_ENTER(H5FD_core_cmp, FAIL); + FUNC_ENTER_NOAPI(H5FD_core_cmp, FAIL); if (NULL==f1->name && NULL==f2->name) { if (f1<f2) HRETURN(-1); @@ -504,7 +504,7 @@ H5FD_core_get_eoa(H5FD_t *_file) { H5FD_core_t *file = (H5FD_core_t*)_file; - FUNC_ENTER(H5FD_core_get_eoa, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_core_get_eoa, HADDR_UNDEF); FUNC_LEAVE(file->eoa); } @@ -533,7 +533,7 @@ H5FD_core_set_eoa(H5FD_t *_file, haddr_t addr) { H5FD_core_t *file = (H5FD_core_t*)_file; - FUNC_ENTER(H5FD_core_set_eoa, FAIL); + FUNC_ENTER_NOAPI(H5FD_core_set_eoa, FAIL); if (ADDR_OVERFLOW(addr)) HRETURN_ERROR(H5E_ARGS, H5E_OVERFLOW, FAIL, "address overflow"); @@ -568,7 +568,7 @@ H5FD_core_get_eof(H5FD_t *_file) { H5FD_core_t *file = (H5FD_core_t*)_file; - FUNC_ENTER(H5FD_core_get_eof, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_core_get_eof, HADDR_UNDEF); FUNC_LEAVE(MAX(file->eof, file->eoa)); } @@ -599,7 +599,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; - FUNC_ENTER(H5FD_core_read, FAIL); + FUNC_ENTER_NOAPI(H5FD_core_read, FAIL); assert(file && file->pub.cls); assert(buf); @@ -664,7 +664,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; - FUNC_ENTER(H5FD_core_write, FAIL); + FUNC_ENTER_NOAPI(H5FD_core_write, FAIL); assert(file && file->pub.cls); assert(buf); diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c index f29ba7a..1d4e033 100644 --- a/src/H5FDfamily.c +++ b/src/H5FDfamily.c @@ -139,7 +139,7 @@ static int interface_initialize_g = 0; hid_t H5FD_family_init(void) { - FUNC_ENTER(H5FD_family_init, FAIL); + FUNC_ENTER_NOAPI(H5FD_family_init, FAIL); if (H5I_VFL!=H5Iget_type(H5FD_FAMILY_g)) H5FD_FAMILY_g = H5FDregister(&H5FD_family_g); @@ -180,7 +180,7 @@ H5Pset_fapl_family(hid_t fapl_id, hsize_t memb_size, hid_t memb_fapl_id) H5FD_family_fapl_t fa; H5P_genplist_t *plist; /* Property list pointer */ - FUNC_ENTER(H5Pset_fapl_family, FAIL); + FUNC_ENTER_API(H5Pset_fapl_family, FAIL); H5TRACE3("e","ihi",fapl_id,memb_size,memb_fapl_id); /* Check arguments */ @@ -233,7 +233,7 @@ H5Pget_fapl_family(hid_t fapl_id, hsize_t *memb_size/*out*/, H5FD_family_fapl_t *fa; H5P_genplist_t *plist; /* Property list pointer */ - FUNC_ENTER(H5Pget_fapl_family, FAIL); + FUNC_ENTER_API(H5Pget_fapl_family, FAIL); H5TRACE3("e","ixx",fapl_id,memb_size,memb_fapl_id); if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id))) @@ -278,7 +278,7 @@ H5FD_family_fapl_get(H5FD_t *_file) H5FD_family_fapl_t *fa = NULL; H5P_genplist_t *plist; /* Property list pointer */ - FUNC_ENTER(H5FD_family_fapl_get, NULL); + FUNC_ENTER_NOAPI(H5FD_family_fapl_get, NULL); if (NULL==(fa=H5MM_calloc(sizeof(H5FD_family_fapl_t)))) HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed"); @@ -315,7 +315,7 @@ H5FD_family_fapl_copy(const void *_old_fa) H5FD_family_fapl_t *new_fa = NULL; H5P_genplist_t *plist; /* Property list pointer */ - FUNC_ENTER(H5FD_family_fapl_copy, NULL); + FUNC_ENTER_NOAPI(H5FD_family_fapl_copy, NULL); if (NULL==(new_fa=H5MM_malloc(sizeof(H5FD_family_fapl_t)))) HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed"); @@ -357,7 +357,7 @@ H5FD_family_fapl_free(void *_fa) { H5FD_family_fapl_t *fa = (H5FD_family_fapl_t*)_fa; - FUNC_ENTER(H5FD_family_fapl_free, FAIL); + FUNC_ENTER_NOAPI(H5FD_family_fapl_free, FAIL); H5I_dec_ref(fa->memb_fapl_id); H5MM_xfree(fa); @@ -389,7 +389,7 @@ H5FD_family_dxpl_copy(const void *_old_dx) H5FD_family_dxpl_t *new_dx = NULL; H5P_genplist_t *plist; /* Property list pointer */ - FUNC_ENTER(H5FD_family_dxpl_copy, NULL); + FUNC_ENTER_NOAPI(H5FD_family_dxpl_copy, NULL); if (NULL==(new_dx=H5MM_malloc(sizeof(H5FD_family_dxpl_t)))) HRETURN_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed"); @@ -424,7 +424,7 @@ H5FD_family_dxpl_free(void *_dx) { H5FD_family_dxpl_t *dx = (H5FD_family_dxpl_t*)_dx; - FUNC_ENTER(H5FD_family_dxpl_free, FAIL); + FUNC_ENTER_NOAPI(H5FD_family_dxpl_free, FAIL); H5I_dec_ref(dx->memb_dxpl_id); H5MM_xfree(dx); @@ -462,7 +462,7 @@ H5FD_family_open(const char *name, unsigned flags, hid_t fapl_id, unsigned t_flags = flags & ~H5F_ACC_CREAT; H5P_genplist_t *plist; /* Property list pointer */ - FUNC_ENTER(H5FD_family_open, NULL); + FUNC_ENTER_NOAPI(H5FD_family_open, NULL); /* Check arguments */ if (!name || !*name) @@ -588,7 +588,7 @@ H5FD_family_close(H5FD_t *_file) H5FD_family_t *file = (H5FD_family_t*)_file; int i, nerrors=0; - FUNC_ENTER(H5FD_family_close, FAIL); + FUNC_ENTER_NOAPI(H5FD_family_close, FAIL); /* Close as many members as possible */ for (i=0; i<file->nmembs; i++) { @@ -641,7 +641,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(H5FD_family_cmp, H5FD_VFD_DEFAULT); + FUNC_ENTER_NOAPI(H5FD_family_cmp, H5FD_VFD_DEFAULT); assert(f1->nmembs>=1 && f1->memb[0]); assert(f2->nmembs>=1 && f2->memb[0]); @@ -674,7 +674,7 @@ H5FD_family_query(const H5FD_t UNUSED * _f, unsigned long *flags /* out */) { herr_t ret_value=SUCCEED; - FUNC_ENTER(H5FD_family_query, FAIL); + FUNC_ENTER_NOAPI(H5FD_family_query, FAIL); /* Set the VFL feature flags that this driver supports */ if(flags) { @@ -711,7 +711,7 @@ H5FD_family_get_eoa(H5FD_t *_file) { H5FD_family_t *file = (H5FD_family_t*)_file; - FUNC_ENTER(H5FD_family_get_eoa, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_family_get_eoa, HADDR_UNDEF); FUNC_LEAVE(file->eoa); } @@ -741,7 +741,7 @@ H5FD_family_set_eoa(H5FD_t *_file, haddr_t eoa) int i; char memb_name[4096]; - FUNC_ENTER(H5FD_family_set_eoa, FAIL); + FUNC_ENTER_NOAPI(H5FD_family_set_eoa, FAIL); for (i=0; addr || i<file->nmembs; i++) { @@ -811,7 +811,7 @@ H5FD_family_get_eof(H5FD_t *_file) haddr_t eof=0; int i; - FUNC_ENTER(H5FD_family_get_eof, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_family_get_eof, HADDR_UNDEF); /* * Find the last member that has a non-zero EOF and break out of the loop @@ -869,7 +869,7 @@ H5FD_family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, si #endif /* NDEBUG */ H5P_genplist_t *plist; /* Property list pointer */ - FUNC_ENTER(H5FD_family_read, FAIL); + FUNC_ENTER_NOAPI(H5FD_family_read, FAIL); /* * Get the member data transfer property list. If the transfer property @@ -947,7 +947,7 @@ H5FD_family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, s #endif /* NDEBUG */ H5P_genplist_t *plist; /* Property list pointer */ - FUNC_ENTER(H5FD_family_write, FAIL); + FUNC_ENTER_NOAPI(H5FD_family_write, FAIL); /* * Get the member data transfer property list. If the transfer property @@ -1014,7 +1014,7 @@ H5FD_family_flush(H5FD_t *_file, unsigned closing) H5FD_family_t *file = (H5FD_family_t*)_file; int i, nerrors=0; - FUNC_ENTER(H5FD_family_flush, FAIL); + FUNC_ENTER_NOAPI(H5FD_family_flush, FAIL); for (i=0; i<file->nmembs; i++) if (file->memb[i] && H5FDflush(file->memb[i],closing)<0) diff --git a/src/H5FDgass.c b/src/H5FDgass.c index e4d43ca..f5c3f2d 100644 --- a/src/H5FDgass.c +++ b/src/H5FDgass.c @@ -184,7 +184,7 @@ static int interface_initialize_g = 0; hid_t H5FD_gass_init(void) { - FUNC_ENTER(H5FD_gass_init, FAIL); + FUNC_ENTER_NOAPI(H5FD_gass_init, FAIL); if (!H5FD_GASS_g) H5FD_GASS_g = H5FDregister(&H5FD_gass_g); @@ -231,7 +231,7 @@ H5Pset_fapl_gass(hid_t fapl_id, GASS_Info info) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=FAIL; - FUNC_ENTER(H5Pset_fapl_gass, FAIL); + FUNC_ENTER_API(H5Pset_fapl_gass, FAIL); /*NO TRACE*/ /* Check arguments */ @@ -282,7 +282,7 @@ H5Pget_fapl_gass(hid_t fapl_id, GASS_Info *info/*out*/) H5FD_gass_fapl_t *fa; H5P_genplist_t *plist; /* Property list pointer */ - FUNC_ENTER(H5Pget_fapl_gass, FAIL); + FUNC_ENTER_API(H5Pget_fapl_gass, FAIL); H5TRACE2("e","ix",fapl_id,info); if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id))) @@ -334,7 +334,7 @@ H5FD_gass_open(const char *name, unsigned flags, hid_t fapl_id, H5P_genplist_t *plist; /* Property list pointer */ h5_stat_t sb; - FUNC_ENTER(H5FD_gass_open, NULL); + FUNC_ENTER_NOAPI(H5FD_gass_open, NULL); /* fprintf(stdout, "Entering H5FD_gass_open name=%s flags=0x%x\n", name, flags); */ @@ -446,13 +446,13 @@ H5FD_gass_close (H5FD_t *_file) { H5FD_gass_t *file = (H5FD_gass_t *)_file; - FUNC_ENTER(H5FD_gass_close, FAIL); + FUNC_ENTER_NOAPI(H5FD_gass_close, FAIL); - if (file == NULL) - HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file handle"); - - if (globus_gass_close (file->fd) < 0) - HRETURN_ERROR(H5E_IO, H5E_CANTCLOSEFILE, FAIL, "can't close GASS file"); + if (file == NULL) + HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid file handle"); + + if (globus_gass_close (file->fd) < 0) + HRETURN_ERROR(H5E_IO, H5E_CANTCLOSEFILE, FAIL, "can't close GASS file"); H5MM_xfree(file); @@ -483,7 +483,7 @@ H5FD_gass_query(const UNUSED H5FD_t *_f, unsigned long *flags /* out */) { herr_t ret_value=SUCCEED; - FUNC_ENTER(H5FD_gass_query, FAIL); + FUNC_ENTER_NOAPI(H5FD_gass_query, FAIL); /* Set the VFL feature flags that this driver supports */ if(flags) { @@ -516,9 +516,9 @@ H5FD_gass_query(const UNUSED H5FD_t *_f, unsigned long *flags /* out */) static haddr_t H5FD_gass_get_eoa(H5FD_t *_file) { - H5FD_gass_t *file = (H5FD_gass_t *)_file; + H5FD_gass_t *file = (H5FD_gass_t *)_file; - FUNC_ENTER(H5FD_gass_get_eoa, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_gass_get_eoa, HADDR_UNDEF); FUNC_LEAVE(file->eoa); } @@ -545,7 +545,7 @@ H5FD_gass_set_eoa(H5FD_t *_file, haddr_t addr) { H5FD_gass_t *file = (H5FD_gass_t *)_file; - FUNC_ENTER(H5FD_gass_set_eoa, FAIL); + FUNC_ENTER_NOAPI(H5FD_gass_set_eoa, FAIL); file->eoa = addr; @@ -578,7 +578,7 @@ H5FD_gass_get_eof(H5FD_t *_file) { H5FD_gass_t *file = (H5FD_gass_t*)_file; - FUNC_ENTER(H5FD_gass_get_eof, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_gass_get_eof, HADDR_UNDEF); FUNC_LEAVE(MAX(file->eof, file->eoa)); } @@ -608,7 +608,7 @@ H5FD_gass_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id/*unused*/, h H5FD_gass_t *file = (H5FD_gass_t*)_file; ssize_t nbytes; - FUNC_ENTER(H5FD_gass_read, FAIL); + FUNC_ENTER_NOAPI(H5FD_gass_read, FAIL); assert(file && file->pub.cls); assert(buf); @@ -686,7 +686,7 @@ H5FD_gass_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id/*unused*/, haddr_t H5FD_gass_t *file = (H5FD_gass_t*)_file; ssize_t nbytes; - FUNC_ENTER(H5FD_gass_write, FAIL); + FUNC_ENTER_NOAPI(H5FD_gass_write, FAIL); assert(file && file->pub.cls); assert(buf); diff --git a/src/H5FDlog.c b/src/H5FDlog.c index c7279cb..563f4f0 100644 --- a/src/H5FDlog.c +++ b/src/H5FDlog.c @@ -244,7 +244,7 @@ static int interface_initialize_g = 0; hid_t H5FD_log_init(void) { - FUNC_ENTER(H5FD_log_init, FAIL); + FUNC_ENTER_NOAPI(H5FD_log_init, FAIL); if (H5I_VFL!=H5Iget_type(H5FD_LOG_g)) H5FD_LOG_g = H5FDregister(&H5FD_log_g); @@ -281,7 +281,7 @@ H5Pset_fapl_log(hid_t fapl_id, char *logfile, int verbosity) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=FAIL; - FUNC_ENTER(H5Pset_fapl_log, FAIL); + FUNC_ENTER_API(H5Pset_fapl_log, FAIL); H5TRACE3("e","isIs",fapl_id,logfile,verbosity); if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id))) @@ -327,7 +327,7 @@ H5Pset_fapl_log(hid_t fapl_id, char *logfile, unsigned flags, size_t buf_size) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=FAIL; - FUNC_ENTER(H5Pset_fapl_log, FAIL); + FUNC_ENTER_API(H5Pset_fapl_log, FAIL); H5TRACE4("e","isIuz",fapl_id,logfile,flags,buf_size); if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id))) @@ -367,7 +367,7 @@ H5FD_log_fapl_get(H5FD_t *_file) { H5FD_log_t *file = (H5FD_log_t*)_file; - FUNC_ENTER(H5FD_log_fapl_get, NULL); + FUNC_ENTER_NOAPI(H5FD_log_fapl_get, NULL); FUNC_LEAVE(H5FD_log_fapl_copy(&(file->fa))); } /* end H5FD_log_fapl_get() */ @@ -395,7 +395,7 @@ H5FD_log_fapl_copy(const void *_old_fa) const H5FD_log_fapl_t *old_fa = (const H5FD_log_fapl_t*)_old_fa; H5FD_log_fapl_t *new_fa = H5MM_malloc(sizeof(H5FD_log_fapl_t)); - FUNC_ENTER(H5FD_log_fapl_copy, NULL); + FUNC_ENTER_NOAPI(H5FD_log_fapl_copy, NULL); assert(new_fa); @@ -433,7 +433,7 @@ H5FD_log_fapl_free(void *_fa) { H5FD_log_fapl_t *fa = (H5FD_log_fapl_t*)_fa; - FUNC_ENTER(H5FD_log_fapl_free, FAIL); + FUNC_ENTER_NOAPI(H5FD_log_fapl_free, FAIL); /* Free the fapl information */ if(fa->logfile) @@ -478,7 +478,7 @@ H5FD_log_open(const char *name, unsigned flags, hid_t fapl_id, h5_stat_t sb; H5P_genplist_t *plist; /* Property list */ - FUNC_ENTER(H5FD_log_open, NULL); + FUNC_ENTER_NOAPI(H5FD_log_open, NULL); /* Check arguments */ if (!name || !*name) @@ -578,7 +578,7 @@ H5FD_log_close(H5FD_t *_file) struct timeval timeval_diff; #endif /* H5_HAVE_GETTIMEOFDAY */ - FUNC_ENTER(H5FD_log_close, FAIL); + FUNC_ENTER_NOAPI(H5FD_log_close, FAIL); if (H5FD_log_flush(_file,TRUE)<0) HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to flush file"); @@ -706,7 +706,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(H5FD_log_cmp, H5FD_VFD_DEFAULT); + FUNC_ENTER_NOAPI(H5FD_log_cmp, H5FD_VFD_DEFAULT); #ifdef WIN32 if (f1->fileindexhi < f2->fileindexhi) ret_value= -1; @@ -758,7 +758,7 @@ H5FD_log_query(const H5FD_t UNUSED * _f, unsigned long *flags /* out */) { herr_t ret_value=SUCCEED; - FUNC_ENTER(H5FD_log_query, FAIL); + FUNC_ENTER_NOAPI(H5FD_log_query, FAIL); /* Set the VFL feature flags that this driver supports */ if(flags) { @@ -794,7 +794,7 @@ H5FD_log_alloc(H5FD_t *_file, H5FD_mem_t type, hsize_t size) H5FD_log_t *file = (H5FD_log_t*)_file; haddr_t addr; - FUNC_ENTER(H5FD_log_alloc, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_log_alloc, HADDR_UNDEF); /* Compute the address for the block to allocate */ addr = file->eoa; @@ -847,7 +847,7 @@ H5FD_log_get_eoa(H5FD_t *_file) { H5FD_log_t *file = (H5FD_log_t*)_file; - FUNC_ENTER(H5FD_log_get_eoa, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_log_get_eoa, HADDR_UNDEF); FUNC_LEAVE(file->eoa); } @@ -876,7 +876,7 @@ H5FD_log_set_eoa(H5FD_t *_file, haddr_t addr) { H5FD_log_t *file = (H5FD_log_t*)_file; - FUNC_ENTER(H5FD_log_set_eoa, FAIL); + FUNC_ENTER_NOAPI(H5FD_log_set_eoa, FAIL); file->eoa = addr; @@ -909,7 +909,7 @@ H5FD_log_get_eof(H5FD_t *_file) { H5FD_log_t *file = (H5FD_log_t*)_file; - FUNC_ENTER(H5FD_get_get_eof, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_get_get_eof, HADDR_UNDEF); FUNC_LEAVE(MAX(file->eof, file->eoa)); } @@ -941,7 +941,7 @@ H5FD_log_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, haddr H5FD_log_t *file = (H5FD_log_t*)_file; ssize_t nbytes; - FUNC_ENTER(H5FD_log_read, FAIL); + FUNC_ENTER_NOAPI(H5FD_log_read, FAIL); assert(file && file->pub.cls); assert(buf); @@ -1054,7 +1054,7 @@ H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, haddr_t add struct timeval timeval_diff; #endif /* H5_HAVE_GETTIMEOFDAY */ - FUNC_ENTER(H5FD_log_write, FAIL); + FUNC_ENTER_NOAPI(H5FD_log_write, FAIL); assert(file && file->pub.cls); assert(size>0); @@ -1215,7 +1215,7 @@ H5FD_log_flush(H5FD_t *_file, unsigned UNUSED closing) { H5FD_log_t *file = (H5FD_log_t*)_file; - FUNC_ENTER(H5FD_log_flush, FAIL); + FUNC_ENTER_NOAPI(H5FD_log_flush, FAIL); if (file->eoa>file->eof) { if (-1==file_seek(file->fd, (file_offset_t)(file->eoa-1), SEEK_SET)) diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c index 7792032..501ce17 100644 --- a/src/H5FDmpio.c +++ b/src/H5FDmpio.c @@ -66,8 +66,8 @@ typedef struct H5FD_mpio_t { } H5FD_mpio_t; /* Prototypes */ -static haddr_t MPIOff_to_haddr(MPI_Offset mpi_off); -static herr_t haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off/*out*/); +static haddr_t H5FD_mpio_MPIOff_to_haddr(MPI_Offset mpi_off); +static herr_t H5FD_mpio_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off/*out*/); /* Callbacks */ static void *H5FD_mpio_fapl_get(H5FD_t *_file); @@ -175,7 +175,7 @@ static int interface_initialize_g = 0; hid_t H5FD_mpio_init(void) { - FUNC_ENTER(H5FD_mpio_init, FAIL); + FUNC_ENTER_NOAPI(H5FD_mpio_init, FAIL); if (H5I_VFL!=H5Iget_type(H5FD_MPIO_g)) H5FD_MPIO_g = H5FDregister(&H5FD_mpio_g); @@ -244,7 +244,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=FAIL; - FUNC_ENTER(H5Pset_fapl_mpio, FAIL); + FUNC_ENTER_API(H5Pset_fapl_mpio, FAIL); H5TRACE3("e","iMcMi",fapl_id,comm,info); /* Check arguments */ @@ -305,7 +305,7 @@ H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm/*out*/, MPI_Info *info/*out*/) H5FD_mpio_fapl_t *fa; H5P_genplist_t *plist; /* Property list pointer */ - FUNC_ENTER(H5Pget_fapl_mpio, FAIL); + FUNC_ENTER_API(H5Pget_fapl_mpio, FAIL); H5TRACE3("e","ixx",fapl_id,comm,info); if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id))) @@ -357,7 +357,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=FAIL; - FUNC_ENTER(H5Pset_dxpl_mpio, FAIL); + FUNC_ENTER_API(H5Pset_dxpl_mpio, FAIL); H5TRACE2("e","iDt",dxpl_id,xfer_mode); /* Check arguments */ @@ -401,7 +401,7 @@ H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode/*out*/) H5FD_mpio_dxpl_t *dx; H5P_genplist_t *plist; /* Property list pointer */ - FUNC_ENTER(H5Pget_dxpl_mpio, FAIL); + FUNC_ENTER_API(H5Pget_dxpl_mpio, FAIL); H5TRACE2("e","ix",dxpl_id,xfer_mode); if(TRUE!=H5P_isa_class(dxpl_id,H5P_DATASET_XFER) || NULL == (plist = H5I_object(dxpl_id))) @@ -439,7 +439,8 @@ H5FD_mpio_communicator(H5FD_t *_file) { H5FD_mpio_t *file = (H5FD_mpio_t*)_file; - FUNC_ENTER(H5FD_mpio_communicator, NULL); + FUNC_ENTER_NOAPI(H5FD_mpio_communicator, NULL); + assert(file); assert(H5FD_MPIO==file->pub.driver_id); @@ -467,7 +468,8 @@ H5FD_mpio_mpi_rank(H5FD_t *_file) { H5FD_mpio_t *file = (H5FD_mpio_t*)_file; - FUNC_ENTER(H5FD_mpio_mpi_rank, FAIL); + FUNC_ENTER_NOAPI(H5FD_mpio_mpi_rank, FAIL); + assert(file); assert(H5FD_MPIO==file->pub.driver_id); @@ -495,7 +497,8 @@ H5FD_mpio_mpi_size(H5FD_t *_file) { H5FD_mpio_t *file = (H5FD_mpio_t*)_file; - FUNC_ENTER(H5FD_mpio_mpi_rank, FAIL); + FUNC_ENTER_NOAPI(H5FD_mpio_mpi_rank, FAIL); + assert(file); assert(H5FD_MPIO==file->pub.driver_id); @@ -529,7 +532,8 @@ H5FD_mpio_setup(H5FD_t *_file, MPI_Datatype btype, MPI_Datatype ftype, { H5FD_mpio_t *file = (H5FD_mpio_t*)_file; - FUNC_ENTER(H5FD_mpio_setup, FAIL); + FUNC_ENTER_NOAPI(H5FD_mpio_setup, FAIL); + assert(file); assert(H5FD_MPIO==file->pub.driver_id); @@ -575,7 +579,8 @@ H5FD_mpio_wait_for_left_neighbor(H5FD_t *_file) char msgbuf[1]; MPI_Status rcvstat; - FUNC_ENTER(H5FD_mpio_wait_for_left_neighbor, FAIL); + FUNC_ENTER_NOAPI(H5FD_mpio_wait_for_left_neighbor, FAIL); + assert(file); assert(H5FD_MPIO==file->pub.driver_id); @@ -621,7 +626,8 @@ H5FD_mpio_signal_right_neighbor(H5FD_t *_file) H5FD_mpio_t *file = (H5FD_mpio_t*)_file; char msgbuf[1]; - FUNC_ENTER(H5FD_mpio_signal_right_neighbor, FAIL); + FUNC_ENTER_NOAPI(H5FD_mpio_signal_right_neighbor, FAIL); + assert(file); assert(H5FD_MPIO==file->pub.driver_id); @@ -657,7 +663,8 @@ H5FD_mpio_fapl_get(H5FD_t *_file) H5FD_mpio_t *file = (H5FD_mpio_t*)_file; H5FD_mpio_fapl_t *fa = NULL; - FUNC_ENTER(H5FD_mpio_fapl_get, NULL); + FUNC_ENTER_NOAPI(H5FD_mpio_fapl_get, NULL); + assert(file); assert(H5FD_MPIO==file->pub.driver_id); @@ -728,7 +735,7 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id, H5FD_mpio_fapl_t _fa; H5P_genplist_t *plist; /* Property list pointer */ - FUNC_ENTER(H5FD_mpio_open, NULL); + FUNC_ENTER_NOAPI(H5FD_mpio_open, NULL); #ifdef H5FDmpio_DEBUG if (H5FD_mpio_Debug[(int)'t']) { @@ -841,7 +848,7 @@ H5FD_mpio_open(const char *name, unsigned flags, hid_t fapl_id, file->info = fa->info; file->mpi_rank = mpi_rank; file->mpi_size = mpi_size; - file->eof = MPIOff_to_haddr(size); + file->eof = H5FD_mpio_MPIOff_to_haddr(size); file->btype = MPI_DATATYPE_NULL; file->ftype = MPI_DATATYPE_NULL; @@ -880,7 +887,7 @@ H5FD_mpio_close(H5FD_t *_file) { H5FD_mpio_t *file = (H5FD_mpio_t*)_file; - FUNC_ENTER(H5FD_mpio_close, FAIL); + FUNC_ENTER_NOAPI(H5FD_mpio_close, FAIL); #ifdef H5FDmpio_DEBUG if (H5FD_mpio_Debug[(int)'t']) @@ -928,7 +935,8 @@ H5FD_mpio_query(const H5FD_t *_file, unsigned long *flags /* out */) const H5FD_mpio_t *file = (const H5FD_mpio_t*)_file; herr_t ret_value=SUCCEED; - FUNC_ENTER(H5FD_mpio_query, FAIL); + FUNC_ENTER_NOAPI(H5FD_mpio_query, FAIL); + assert(file); assert(H5FD_MPIO==file->pub.driver_id); @@ -965,7 +973,8 @@ H5FD_mpio_get_eoa(H5FD_t *_file) { H5FD_mpio_t *file = (H5FD_mpio_t*)_file; - FUNC_ENTER(H5FD_mpio_get_eoa, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_mpio_get_eoa, HADDR_UNDEF); + assert(file); assert(H5FD_MPIO==file->pub.driver_id); @@ -996,7 +1005,8 @@ H5FD_mpio_set_eoa(H5FD_t *_file, haddr_t addr) { H5FD_mpio_t *file = (H5FD_mpio_t*)_file; - FUNC_ENTER(H5FD_mpio_set_eoa, FAIL); + FUNC_ENTER_NOAPI(H5FD_mpio_set_eoa, FAIL); + assert(file); assert(H5FD_MPIO==file->pub.driver_id); @@ -1036,7 +1046,8 @@ H5FD_mpio_get_eof(H5FD_t *_file) { H5FD_mpio_t *file = (H5FD_mpio_t*)_file; - FUNC_ENTER(H5FD_mpio_get_eof, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_mpio_get_eof, HADDR_UNDEF); + assert(file); assert(H5FD_MPIO==file->pub.driver_id); @@ -1112,7 +1123,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=SUCCEED; - FUNC_ENTER(H5FD_mpio_read, FAIL); + FUNC_ENTER_NOAPI(H5FD_mpio_read, FAIL); #ifdef H5FDmpio_DEBUG if (H5FD_mpio_Debug[(int)'t']) @@ -1125,7 +1136,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add assert(TRUE==H5P_isa_class(dxpl_id,H5P_DATASET_XFER)); /* some numeric conversions */ - if (haddr_to_MPIOff(addr, &mpi_off/*out*/)<0) + if (H5FD_mpio_haddr_to_MPIOff(addr, &mpi_off/*out*/)<0) HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "can't convert from haddr to MPI off"); size_i = (int)size; if ((hsize_t)size_i != size) @@ -1159,7 +1170,7 @@ H5FD_mpio_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id, haddr_t add /* prepare for a full-blown xfer using btype, ftype, and disp */ buf_type = file->btype; file_type = file->ftype; - if (haddr_to_MPIOff(file->disp, &mpi_disp)<0) + if (H5FD_mpio_haddr_to_MPIOff(file->disp, &mpi_disp)<0) HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "can't convert from haddr to MPI off"); } else { /* @@ -1392,7 +1403,7 @@ H5FD_mpio_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; - FUNC_ENTER(H5FD_mpio_write, FAIL); + FUNC_ENTER_NOAPI(H5FD_mpio_write, FAIL); #ifdef H5FDmpio_DEBUG if (H5FD_mpio_Debug[(int)'t']) @@ -1405,9 +1416,9 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, assert(TRUE==H5P_isa_class(dxpl_id,H5P_DATASET_XFER)); /* some numeric conversions */ - if (haddr_to_MPIOff(addr, &mpi_off)<0) + if (H5FD_mpio_haddr_to_MPIOff(addr, &mpi_off)<0) HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "can't convert from haddr to MPI off"); - if (haddr_to_MPIOff(file->disp, &mpi_disp)<0) + if (H5FD_mpio_haddr_to_MPIOff(file->disp, &mpi_disp)<0) HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "can't convert from haddr to MPI off"); size_i = (int)size; if ((hsize_t)size_i != size) @@ -1441,7 +1452,7 @@ H5FD_mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, /* prepare for a full-blown xfer using btype, ftype, and disp */ buf_type = file->btype; file_type = file->ftype; - if (haddr_to_MPIOff(file->disp, &mpi_disp)<0) + if (H5FD_mpio_haddr_to_MPIOff(file->disp, &mpi_disp)<0) HGOTO_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "can't convert from haddr to MPI off"); } else { /* @@ -1621,7 +1632,7 @@ H5FD_mpio_flush(H5FD_t *_file, unsigned closing) MPI_Offset mpi_off; herr_t ret_value=SUCCEED; - FUNC_ENTER(H5FD_mpio_flush, FAIL); + FUNC_ENTER_NOAPI(H5FD_mpio_flush, FAIL); #ifdef H5FDmpio_DEBUG if (H5FD_mpio_Debug[(int)'t']) @@ -1637,7 +1648,7 @@ H5FD_mpio_flush(H5FD_t *_file, unsigned closing) if(file->eoa>file->last_eoa) { #ifdef OLD_WAY if (0==file->mpi_rank) { - if (haddr_to_MPIOff(file->eoa-1, &mpi_off)<0) + if (H5FD_mpio_haddr_to_MPIOff(file->eoa-1, &mpi_off)<0) HRETURN_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "cannot convert from haddr_t to MPI_Offset"); if (MPI_SUCCESS != MPI_File_read_at(file->f, mpi_off, &byte, 1, MPI_BYTE, &mpi_stat)) HRETURN_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "MPI_File_read_at() failed"); @@ -1645,7 +1656,7 @@ H5FD_mpio_flush(H5FD_t *_file, unsigned closing) HRETURN_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "MPI_File_write_at() failed"); } /* end if */ #else /* OLD_WAY */ - if (haddr_to_MPIOff(file->eoa, &mpi_off)<0) + if (H5FD_mpio_haddr_to_MPIOff(file->eoa, &mpi_off)<0) HRETURN_ERROR(H5E_INTERNAL, H5E_BADRANGE, FAIL, "cannot convert from haddr_t to MPI_Offset"); /* Extend the file's size */ @@ -1683,7 +1694,7 @@ done: /*------------------------------------------------------------------------- - * Function: MPIOff_to_haddr + * Function: H5FD_mpio_MPIOff_to_haddr * * Purpose: Convert an MPI_Offset value to haddr_t. * @@ -1705,11 +1716,11 @@ done: *------------------------------------------------------------------------- */ static haddr_t -MPIOff_to_haddr(MPI_Offset mpi_off) +H5FD_mpio_MPIOff_to_haddr(MPI_Offset mpi_off) { haddr_t ret_value=HADDR_UNDEF; - FUNC_ENTER_NOINIT(MPIOff_to_haddr); + FUNC_ENTER_NOINIT(H5FD_mpio_MPIOff_to_haddr); if (mpi_off != (MPI_Offset)(haddr_t)mpi_off) ret_value=HADDR_UNDEF; @@ -1721,7 +1732,7 @@ MPIOff_to_haddr(MPI_Offset mpi_off) /*------------------------------------------------------------------------- - * Function: haddr_to_MPIOff + * Function: H5FD_mpio_haddr_to_MPIOff * * Purpose: Convert an haddr_t value to MPI_Offset. * @@ -1746,11 +1757,11 @@ MPIOff_to_haddr(MPI_Offset mpi_off) *------------------------------------------------------------------------- */ static herr_t -haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off/*out*/) +H5FD_mpio_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off/*out*/) { herr_t ret_value=FAIL; - FUNC_ENTER_NOINIT(haddr_to_MPIOff); + FUNC_ENTER_NOINIT(H5FD_mpio_haddr_to_MPIOff); if (mpi_off) *mpi_off = (MPI_Offset)addr; diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c index 8ecae4a..03c4e29 100644 --- a/src/H5FDsec2.c +++ b/src/H5FDsec2.c @@ -203,7 +203,7 @@ H5FL_DEFINE_STATIC(H5FD_sec2_t); hid_t H5FD_sec2_init(void) { - FUNC_ENTER(H5FD_sec2_init, FAIL); + FUNC_ENTER_NOAPI(H5FD_sec2_init, FAIL); if (H5I_VFL!=H5I_get_type(H5FD_SEC2_g)) H5FD_SEC2_g = H5FDregister(&H5FD_sec2_g); @@ -234,7 +234,7 @@ H5Pset_fapl_sec2(hid_t fapl_id) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=FAIL; - FUNC_ENTER(H5Pset_fapl_sec2, FAIL); + FUNC_ENTER_API(H5Pset_fapl_sec2, FAIL); H5TRACE1("e","i",fapl_id); if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id))) @@ -278,7 +278,7 @@ H5FD_sec2_open(const char *name, unsigned flags, hid_t UNUSED fapl_id, #endif h5_stat_t sb; - FUNC_ENTER(H5FD_sec2_open, NULL); + FUNC_ENTER_NOAPI(H5FD_sec2_open, NULL); /* Check arguments */ if (!name || !*name) @@ -344,7 +344,7 @@ H5FD_sec2_close(H5FD_t *_file) { H5FD_sec2_t *file = (H5FD_sec2_t*)_file; - FUNC_ENTER(H5FD_sec2_close, FAIL); + FUNC_ENTER_NOAPI(H5FD_sec2_close, FAIL); if (H5FD_sec2_flush(_file,TRUE)<0) HRETURN_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "unable to flush file"); @@ -382,7 +382,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(H5FD_sec2_cmp, H5FD_VFD_DEFAULT); + FUNC_ENTER_NOAPI(H5FD_sec2_cmp, H5FD_VFD_DEFAULT); #ifdef WIN32 if (f1->fileindexhi < f2->fileindexhi) ret_value= -1; @@ -434,7 +434,7 @@ H5FD_sec2_query(const H5FD_t UNUSED * _f, unsigned long *flags /* out */) { herr_t ret_value=SUCCEED; - FUNC_ENTER(H5FD_sec2_query, FAIL); + FUNC_ENTER_NOAPI(H5FD_sec2_query, FAIL); /* Set the VFL feature flags that this driver supports */ if(flags) { @@ -471,7 +471,7 @@ H5FD_sec2_get_eoa(H5FD_t *_file) { H5FD_sec2_t *file = (H5FD_sec2_t*)_file; - FUNC_ENTER(H5FD_sec2_get_eoa, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_sec2_get_eoa, HADDR_UNDEF); FUNC_LEAVE(file->eoa); } @@ -500,7 +500,7 @@ H5FD_sec2_set_eoa(H5FD_t *_file, haddr_t addr) { H5FD_sec2_t *file = (H5FD_sec2_t*)_file; - FUNC_ENTER(H5FD_sec2_set_eoa, FAIL); + FUNC_ENTER_NOAPI(H5FD_sec2_set_eoa, FAIL); file->eoa = addr; @@ -533,7 +533,7 @@ H5FD_sec2_get_eof(H5FD_t *_file) { H5FD_sec2_t *file = (H5FD_sec2_t*)_file; - FUNC_ENTER(H5FD_get_get_eof, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_get_get_eof, HADDR_UNDEF); FUNC_LEAVE(MAX(file->eof, file->eoa)); } @@ -565,7 +565,7 @@ H5FD_sec2_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, hadd H5FD_sec2_t *file = (H5FD_sec2_t*)_file; ssize_t nbytes; - FUNC_ENTER(H5FD_sec2_read, FAIL); + FUNC_ENTER_NOAPI(H5FD_sec2_read, FAIL); assert(file && file->pub.cls); assert(buf); @@ -645,7 +645,7 @@ H5FD_sec2_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, had H5FD_sec2_t *file = (H5FD_sec2_t*)_file; ssize_t nbytes; - FUNC_ENTER(H5FD_sec2_write, FAIL); + FUNC_ENTER_NOAPI(H5FD_sec2_write, FAIL); assert(file && file->pub.cls); assert(buf); @@ -720,7 +720,7 @@ H5FD_sec2_flush(H5FD_t *_file, unsigned UNUSED closing) { H5FD_sec2_t *file = (H5FD_sec2_t*)_file; - FUNC_ENTER(H5FD_sec2_flush, FAIL); + FUNC_ENTER_NOAPI(H5FD_sec2_flush, FAIL); if (file->eoa>file->eof) { if (-1==file_seek(file->fd, (file_offset_t)(file->eoa-1), SEEK_SET)) diff --git a/src/H5FDsrb.c b/src/H5FDsrb.c index 314bed8..f2a97de 100644 --- a/src/H5FDsrb.c +++ b/src/H5FDsrb.c @@ -161,7 +161,7 @@ static int interface_initialize_g = 0; hid_t H5FD_srb_init(void) { - FUNC_ENTER(H5FD_srb_init, FAIL); + FUNC_ENTER_NOAPI(H5FD_srb_init, FAIL); if(H5I_VFL != H5Iget_type(H5FD_SRB_g)) H5FD_SRB_g = H5FDregister(&H5FD_srb_g); @@ -199,7 +199,7 @@ H5Pset_fapl_srb(hid_t fapl_id, SRB_Info info) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value = FAIL; - FUNC_ENTER(H5Pset_fapl_srb, FAIL); + FUNC_ENTER_API(H5Pset_fapl_srb, FAIL); /*NO TRACE*/ if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id))) @@ -247,7 +247,7 @@ H5Pget_fapl_srb(hid_t fapl_id, SRB_Info *info/*out*/) H5P_genplist_t *plist; /* Property list pointer */ H5FD_srb_fapl_t *fa; - FUNC_ENTER(H5Pget_fapl_srb, FAIL); + FUNC_ENTER_API(H5Pget_fapl_srb, FAIL); H5TRACE2("e","ix",fapl_id,info); if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id))) @@ -292,7 +292,7 @@ H5FD_srb_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr) int srb_fid; H5P_genplist_t *plist; /* Property list pointer */ - FUNC_ENTER(H5FD_srb_open, FAIL); + FUNC_ENTER_NOAPI(H5FD_srb_open, FAIL); /* Check arguments */ if (!name || !*name) @@ -396,12 +396,14 @@ static herr_t H5FD_srb_close(H5FD_t *_file) { H5FD_srb_t *file = (H5FD_srb_t *)_file; - FUNC_ENTER(H5FD_srb_close, FAIL); + + FUNC_ENTER_NOAPI(H5FD_srb_close, FAIL); srbFileClose(file->srb_conn, file->fd); clFinish(file->srb_conn); H5MM_xfree(file); + FUNC_LEAVE(SUCCEED); } @@ -428,7 +430,7 @@ H5FD_srb_query(const UNUSED H5FD_t *_f, unsigned long *flags /* out */) { herr_t ret_value=SUCCEED; - FUNC_ENTER(H5FD_srb_query, FAIL); + FUNC_ENTER_NOAPI(H5FD_srb_query, FAIL); /* Set the VFL feature flags that this driver supports */ if(flags) { @@ -460,7 +462,9 @@ static haddr_t H5FD_srb_get_eoa(H5FD_t *_file) { H5FD_srb_t *file = (H5FD_srb_t *)_file; - FUNC_ENTER(H5FD_srb_get_eoa, HADDR_UNDEF); + + FUNC_ENTER_NOAPI(H5FD_srb_get_eoa, HADDR_UNDEF); + FUNC_LEAVE(file->eoa); } @@ -486,8 +490,11 @@ static herr_t H5FD_srb_set_eoa(H5FD_t *_file, haddr_t addr) { H5FD_srb_t *file = (H5FD_srb_t *)_file; - FUNC_ENTER(H5FD_srb_set_eoa, FAIL); + + FUNC_ENTER_NOAPI(H5FD_srb_set_eoa, FAIL); + file->eoa = addr; + FUNC_LEAVE(SUCCEED); } @@ -511,7 +518,9 @@ static haddr_t H5FD_srb_get_eof(H5FD_t *_file) { H5FD_srb_t *file = (H5FD_srb_t *)_file; - FUNC_ENTER(H5FD_srb_get_eof, HADDR_UNDEF); + + FUNC_ENTER_NOAPI(H5FD_srb_get_eof, HADDR_UNDEF); + FUNC_LEAVE(file->eof); } @@ -536,7 +545,7 @@ H5FD_srb_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, haddr H5FD_srb_t *file = (H5FD_srb_t*)_file; ssize_t nbytes; - FUNC_ENTER(H5FD_srb_read, FAIL); + FUNC_ENTER_NOAPI(H5FD_srb_read, FAIL); /* Check for overflow conditions */ if (HADDR_UNDEF==addr) @@ -606,7 +615,7 @@ H5FD_srb_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, hadd H5FD_srb_t *file = (H5FD_srb_t*)_file; ssize_t nbytes; - FUNC_ENTER(H5FD_srb_write, FAIL); + FUNC_ENTER_NOAPI(H5FD_srb_write, FAIL); /* Check for overflow conditions */ if (HADDR_UNDEF==addr) @@ -665,7 +674,7 @@ H5FD_srb_flush(H5FD_t *_file, unsigned UNUSED closing) { H5FD_srb_t *file = (H5FD_srb_t*)_file; - FUNC_ENTER(H5FD_srb_flush, FAIL); + FUNC_ENTER_NOAPI(H5FD_srb_flush, FAIL); if(srbFileSync(file->srb_conn, file->fd) != 0) { srbFileClose(file->srb_conn, file->fd); diff --git a/src/H5FDstream.c b/src/H5FDstream.c index ec2c351..ac6e8dc 100644 --- a/src/H5FDstream.c +++ b/src/H5FDstream.c @@ -219,7 +219,7 @@ static int interface_initialize_g = 0; */ hid_t H5FD_stream_init (void) { - FUNC_ENTER (H5FD_stream_init, FAIL); + FUNC_ENTER_NOAPI(H5FD_stream_init, FAIL); if (H5I_VFL != H5Iget_type (H5FD_STREAM_g)) { @@ -266,7 +266,7 @@ herr_t H5Pset_fapl_stream (hid_t fapl_id, H5FD_stream_fapl_t *fapl) H5P_genplist_t *plist; /* Property list pointer */ herr_t result; - FUNC_ENTER (H5Pset_fapl_stream, FAIL); + FUNC_ENTER_API(H5Pset_fapl_stream, FAIL); H5TRACE2 ("e", "ix", fapl_id, fapl); if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id))) @@ -317,7 +317,7 @@ herr_t H5Pget_fapl_stream(hid_t fapl_id, H5FD_stream_fapl_t *fapl /* out */) H5FD_stream_fapl_t *this_fapl; H5P_genplist_t *plist; /* Property list pointer */ - FUNC_ENTER (H5Pget_fapl_stream, FAIL); + FUNC_ENTER_API(H5Pget_fapl_stream, FAIL); H5TRACE2("e","ix",fapl_id,fapl); if(TRUE!=H5P_isa_class(fapl_id,H5P_FILE_ACCESS) || NULL == (plist = H5I_object(fapl_id))) @@ -364,7 +364,7 @@ H5FD_stream_fapl_get (H5FD_t *_stream) H5FD_stream_fapl_t *fapl; - FUNC_ENTER (H5FD_stream_fapl_get, NULL); + FUNC_ENTER_NOAPI(H5FD_stream_fapl_get, NULL); if ((fapl = H5MM_calloc (sizeof (H5FD_stream_fapl_t))) == NULL) { @@ -618,7 +618,7 @@ H5FD_stream_open (const char *filename, H5P_genplist_t *plist; /* Property list pointer */ H5FD_t *ret_value=NULL; /* Function return value */ - FUNC_ENTER (H5FD_stream_open, NULL); + FUNC_ENTER_NOAPI(H5FD_stream_open, NULL); /* Check arguments */ if (filename == NULL|| *filename == '\0') @@ -785,7 +785,7 @@ H5FD_stream_flush (H5FD_t *_stream, unsigned UNUSED closing) socklen_t fromlen; H5FD_STREAM_SOCKET_TYPE sock; - FUNC_ENTER (H5FD_stream_flush, FAIL); + FUNC_ENTER_NOAPI(H5FD_stream_flush, FAIL); /* Write to backing store */ if (stream->dirty && ! H5FD_STREAM_ERROR_CHECK (stream->socket)) @@ -855,7 +855,7 @@ H5FD_stream_close (H5FD_t *_stream) { H5FD_stream_t *stream = (H5FD_stream_t *) _stream; - FUNC_ENTER (H5FD_stream_close, FAIL); + FUNC_ENTER_NOAPI(H5FD_stream_close, FAIL); /* Flush */ if (H5FD_stream_flush (_stream,TRUE) != SUCCEED) @@ -900,7 +900,7 @@ static herr_t H5FD_stream_query(const H5FD_t * UNUSED _f, unsigned long *flags/*out*/) { - FUNC_ENTER (H5FD_stream_query, SUCCEED); + FUNC_ENTER_NOAPI(H5FD_stream_query, SUCCEED); /* Set the VFL feature flags that this driver supports */ if (flags) { @@ -935,7 +935,7 @@ H5FD_stream_get_eoa (H5FD_t *_stream) { H5FD_stream_t *stream = (H5FD_stream_t *) _stream; - FUNC_ENTER (H5FD_stream_get_eoa, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_stream_get_eoa, HADDR_UNDEF); FUNC_LEAVE (stream->eoa); } @@ -963,7 +963,7 @@ H5FD_stream_set_eoa (H5FD_t *_stream, haddr_t addr) { H5FD_stream_t *stream = (H5FD_stream_t *) _stream; - FUNC_ENTER (H5FD_stream_set_eoa, FAIL); + FUNC_ENTER_NOAPI(H5FD_stream_set_eoa, FAIL); if (ADDR_OVERFLOW (addr)) { @@ -1000,7 +1000,7 @@ H5FD_stream_get_eof (H5FD_t *_stream) { H5FD_stream_t *stream = (H5FD_stream_t *) _stream; - FUNC_ENTER (H5FD_stream_get_eof, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5FD_stream_get_eof, HADDR_UNDEF); FUNC_LEAVE (MAX (stream->eof, stream->eoa)); } @@ -1036,7 +1036,7 @@ H5FD_stream_read (H5FD_t *_stream, H5FD_stream_t *stream = (H5FD_stream_t *) _stream; size_t nbytes; - FUNC_ENTER (H5FD_stream_read, FAIL); + FUNC_ENTER_NOAPI(H5FD_stream_read, FAIL); assert (stream && stream->pub.cls); assert (buf); @@ -1102,7 +1102,7 @@ H5FD_stream_write (H5FD_t *_stream, { H5FD_stream_t *stream = (H5FD_stream_t *) _stream; - FUNC_ENTER (H5FD_stream_write, FAIL); + FUNC_ENTER_NOAPI(H5FD_stream_write, FAIL); assert (stream && stream->pub.cls); assert (buf); @@ -127,7 +127,7 @@ H5FL_malloc(size_t mem_size) { void *ret_value=NULL; /* return value*/ - FUNC_ENTER (H5FL_malloc, NULL); + FUNC_ENTER_NOAPI(H5FL_malloc, NULL); /* Attempt to allocate the memory requested */ if(NULL==(ret_value=H5MM_malloc(mem_size))) { @@ -210,7 +210,7 @@ H5FL_reg_free(H5FL_reg_head_t *head, void *obj) { H5FL_reg_node_t *temp; /* Temp. ptr to the new free list node allocated */ - FUNC_ENTER (H5FL_reg_free, NULL); + FUNC_ENTER_NOAPI(H5FL_reg_free, NULL); /* Double check parameters */ assert(head); @@ -277,7 +277,7 @@ H5FL_reg_alloc(H5FL_reg_head_t *head, unsigned clear) { void *ret_value; /* Pointer to object to return */ - FUNC_ENTER (H5FL_reg_alloc, NULL); + FUNC_ENTER_NOAPI(H5FL_reg_alloc, NULL); /* Double check parameters */ assert(head); @@ -672,7 +672,7 @@ H5FL_blk_alloc(H5FL_blk_head_t *head, size_t size, unsigned clear) 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(H5FL_blk_alloc, NULL); + FUNC_ENTER_NOAPI(H5FL_blk_alloc, NULL); /* Double check parameters */ assert(head); @@ -760,7 +760,7 @@ H5FL_blk_free(H5FL_blk_head_t *head, void *block) H5FL_blk_list_t *temp; /* Temp. ptr to the new free list node allocated */ size_t free_size; /* Size of the block freed */ - FUNC_ENTER(H5FL_blk_free, NULL); + FUNC_ENTER_NOAPI(H5FL_blk_free, NULL); /* Double check parameters */ assert(head); @@ -833,7 +833,7 @@ H5FL_blk_realloc(H5FL_blk_head_t *head, void *block, size_t new_size) H5FL_blk_list_t *temp; /* Temp. ptr to the new block node allocated */ void *ret_value=NULL; /* Return value */ - FUNC_ENTER(H5FL_blk_realloc, NULL); + FUNC_ENTER_NOAPI(H5FL_blk_realloc, NULL); /* Double check parameters */ assert(head); @@ -1111,7 +1111,7 @@ H5FL_arr_free(H5FL_arr_head_t *head, void *obj) size_t mem_size; /* Size of memory being freed */ size_t free_nelem; /* Number of elements in node being free'd */ - FUNC_ENTER (H5FL_arr_free, NULL); + FUNC_ENTER_NOAPI(H5FL_arr_free, NULL); #ifdef NO_ARR_FREE_LISTS H5MM_xfree(obj); @@ -1195,7 +1195,7 @@ H5FL_arr_alloc(H5FL_arr_head_t *head, size_t elem, unsigned clear) void *ret_value; /* Pointer to object to return */ size_t mem_size; /* Size of memory block being recycled */ - FUNC_ENTER (H5FL_arr_alloc, NULL); + FUNC_ENTER_NOAPI(H5FL_arr_alloc, NULL); /* Double check parameters */ assert(head); @@ -1288,7 +1288,7 @@ H5FL_arr_realloc(H5FL_arr_head_t *head, void * obj, size_t new_elem) H5FL_arr_node_t *temp; /* Temp. ptr to the new free list node allocated */ void *ret_value; /* Pointer to object to return */ - FUNC_ENTER (H5FL_arr_realloc, NULL); + FUNC_ENTER_NOAPI(H5FL_arr_realloc, NULL); /* Double check parameters */ assert(head); @@ -1599,7 +1599,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(H5FL_set_free_list_limits, FAIL); + FUNC_ENTER_NOAPI(H5FL_set_free_list_limits, FAIL); /* Set the limit variables */ /* limit on all regular free lists */ diff --git a/src/H5Farray.c b/src/H5Farray.c index 4408a2e..211ccaa 100644 --- a/src/H5Farray.c +++ b/src/H5Farray.c @@ -57,7 +57,7 @@ H5F_arr_create (H5F_t *f, struct H5O_layout_t *layout/*in,out*/) hsize_t nbytes; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER (H5F_arr_create, FAIL); + FUNC_ENTER_NOAPI(H5F_arr_create, FAIL); /* check args */ assert (f); @@ -155,7 +155,7 @@ H5F_arr_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, #endif herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER(H5F_arr_read, FAIL); + FUNC_ENTER_NOAPI(H5F_arr_read, FAIL); /* Check args */ assert(f); @@ -405,7 +405,7 @@ H5F_arr_write(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, #endif herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER(H5F_arr_write, FAIL); + FUNC_ENTER_NOAPI(H5F_arr_write, FAIL); /* Check args */ assert(f); diff --git a/src/H5Fcontig.c b/src/H5Fcontig.c index e80a67f..a009de1 100644 --- a/src/H5Fcontig.c +++ b/src/H5Fcontig.c @@ -49,7 +49,7 @@ H5F_contig_read(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr, { hsize_t offset=0; /* Offset for vector call */ - FUNC_ENTER(H5F_contig_read, FAIL); + FUNC_ENTER_NOAPI(H5F_contig_read, FAIL); /* Check args */ assert(f); @@ -85,7 +85,7 @@ H5F_contig_write(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr, size { hsize_t offset=0; /* Offset for vector call */ - FUNC_ENTER(H5F_contig_write, FAIL); + FUNC_ENTER_NOAPI(H5F_contig_write, FAIL); assert (f); assert (buf); @@ -139,7 +139,7 @@ H5F_contig_readv(H5F_t *f, hsize_t _max_data, H5FD_mem_t type, haddr_t _addr, hsize_t *offset_arr_p; /* Pointer into the offset array */ #endif /* SLOW_WAY */ - FUNC_ENTER(H5F_contig_readv, FAIL); + FUNC_ENTER_NOAPI(H5F_contig_readv, FAIL); /* Check args */ assert(f); @@ -579,7 +579,7 @@ H5F_contig_writev(H5F_t *f, hsize_t _max_data, H5FD_mem_t type, haddr_t _addr, hsize_t *offset_arr_p; /* Pointer into the offset array */ #endif /* SLOW_WAY */ - FUNC_ENTER(H5F_contig_writev, FAIL); + FUNC_ENTER_NOAPI(H5F_contig_writev, FAIL); /* Check args */ assert(f); diff --git a/src/H5Fistore.c b/src/H5Fistore.c index 3b8b7a5..38d7a1f 100644 --- a/src/H5Fistore.c +++ b/src/H5Fistore.c @@ -224,7 +224,7 @@ H5F_istore_chunk_alloc(size_t chunk_size) { void *ret_value; /* Pointer to the chunk to return to the user */ - FUNC_ENTER(H5F_istore_chunk_alloc, NULL); + FUNC_ENTER_NOAPI(H5F_istore_chunk_alloc, NULL); ret_value=H5FL_BLK_ALLOC(istore_chunk,chunk_size,0); @@ -253,7 +253,7 @@ H5F_istore_chunk_alloc(size_t chunk_size) void * H5F_istore_chunk_free(void *chunk) { - FUNC_ENTER(H5F_istore_chunk_free, NULL); + FUNC_ENTER_NOAPI(H5F_istore_chunk_free, NULL); H5FL_BLK_FREE(istore_chunk,chunk); @@ -284,7 +284,7 @@ H5F_istore_chunk_realloc(void *chunk, size_t new_size) { void *ret_value=NULL; /* Return value */ - FUNC_ENTER(H5F_istore_chunk_realloc, NULL); + FUNC_ENTER_NOAPI(H5F_istore_chunk_realloc, NULL); ret_value=H5FL_BLK_REALLOC(istore_chunk,chunk,new_size); @@ -352,7 +352,7 @@ H5F_istore_decode_key(H5F_t UNUSED *f, H5B_t *bt, uint8_t *raw, void *_key) int i; int ndims = H5F_ISTORE_NDIMS(bt); - FUNC_ENTER(H5F_istore_decode_key, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_decode_key, FAIL); /* check args */ assert(f); @@ -393,7 +393,7 @@ H5F_istore_encode_key(H5F_t UNUSED *f, H5B_t *bt, uint8_t *raw, void *_key) int ndims = H5F_ISTORE_NDIMS(bt); int i; - FUNC_ENTER(H5F_istore_encode_key, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_encode_key, FAIL); /* check args */ assert(f); @@ -435,7 +435,8 @@ H5F_istore_debug_key (FILE *stream, int indent, int fwidth, const H5F_istore_ud1_t *udata = (const H5F_istore_ud1_t *)_udata; unsigned u; - FUNC_ENTER (H5F_istore_debug_key, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_debug_key, FAIL); + assert (key); HDfprintf(stream, "%*s%-*s %Zd bytes\n", indent, "", fwidth, @@ -483,7 +484,7 @@ H5F_istore_cmp2(H5F_t UNUSED *f, void *_lt_key, void *_udata, H5F_istore_ud1_t *udata = (H5F_istore_ud1_t *) _udata; int cmp; - FUNC_ENTER(H5F_istore_cmp2, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_cmp2, FAIL); assert(lt_key); assert(rt_key); @@ -535,7 +536,7 @@ H5F_istore_cmp3(H5F_t UNUSED *f, void *_lt_key, void *_udata, H5F_istore_ud1_t *udata = (H5F_istore_ud1_t *) _udata; int cmp = 0; - FUNC_ENTER(H5F_istore_cmp3, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_cmp3, FAIL); assert(lt_key); assert(rt_key); @@ -583,7 +584,7 @@ H5F_istore_new_node(H5F_t *f, H5B_ins_t op, H5F_istore_ud1_t *udata = (H5F_istore_ud1_t *) _udata; unsigned u; - FUNC_ENTER(H5F_istore_new_node, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_new_node, FAIL); #ifdef AKC printf("%s: Called\n", FUNC); #endif @@ -671,7 +672,7 @@ H5F_istore_found(H5F_t UNUSED *f, haddr_t addr, const void *_lt_key, const H5F_istore_key_t *lt_key = (const H5F_istore_key_t *) _lt_key; unsigned u; - FUNC_ENTER(H5F_istore_found, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_found, FAIL); /* Check arguments */ assert(f); @@ -746,7 +747,7 @@ H5F_istore_insert(H5F_t *f, haddr_t addr, void *_lt_key, unsigned u; H5B_ins_t ret_value = H5B_INS_ERROR; - FUNC_ENTER(H5F_istore_insert, H5B_INS_ERROR); + FUNC_ENTER_NOAPI(H5F_istore_insert, H5B_INS_ERROR); #ifdef AKC printf("%s: Called\n", FUNC); #endif @@ -946,7 +947,7 @@ H5F_istore_init (H5F_t *f) { H5F_rdcc_t *rdcc = &(f->shared->rdcc); - FUNC_ENTER (H5F_istore_init, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_init, FAIL); HDmemset (rdcc, 0, sizeof(H5F_rdcc_t)); if (f->shared->rdcc_nbytes>0 && f->shared->rdcc_nelmts>0) { @@ -1186,7 +1187,7 @@ H5F_istore_flush (H5F_t *f, hbool_t preempt) int nerrors=0; H5F_rdcc_ent_t *ent=NULL, *next=NULL; - FUNC_ENTER (H5F_istore_flush, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_flush, FAIL); for (ent=rdcc->head; ent; ent=next) { next = ent->next; @@ -1233,7 +1234,7 @@ H5F_istore_dest (H5F_t *f) int nerrors=0; H5F_rdcc_ent_t *ent=NULL, *next=NULL; - FUNC_ENTER (H5F_istore_dest, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_dest, FAIL); for (ent=rdcc->head; ent; ent=next) { #ifdef H5F_ISTORE_DEBUG @@ -1795,7 +1796,7 @@ H5F_istore_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, H5O_fill_t fill; /* Fill value information */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER(H5F_istore_read, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_read, FAIL); /* Check args */ assert(f); @@ -1977,7 +1978,7 @@ H5F_istore_write(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, H5O_fill_t fill; /* Fill value information */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER(H5F_istore_write, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_write, FAIL); /* Check args */ assert(f); @@ -2144,7 +2145,7 @@ H5F_istore_create(H5F_t *f, H5O_layout_t *layout /*out */ ) unsigned u; #endif - FUNC_ENTER(H5F_istore_create, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_create, FAIL); /* Check args */ assert(f); @@ -2189,7 +2190,7 @@ H5F_istore_allocated(H5F_t *f, unsigned ndims, haddr_t addr) { H5F_istore_ud1_t udata; - FUNC_ENTER(H5F_istore_nchunks, 0); + FUNC_ENTER_NOAPI(H5F_istore_nchunks, 0); HDmemset(&udata, 0, sizeof udata); udata.mesg.ndims = ndims; @@ -2224,7 +2225,7 @@ H5F_istore_dump_btree(H5F_t *f, FILE *stream, unsigned ndims, haddr_t addr) { H5F_istore_ud1_t udata; - FUNC_ENTER(H5F_istore_dump_btree, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_dump_btree, FAIL); HDmemset(&udata, 0, sizeof udata); udata.mesg.ndims = ndims; @@ -2260,7 +2261,8 @@ H5F_istore_stats (H5F_t *f, hbool_t headers) double miss_rate; char ascii[32]; - FUNC_ENTER (H5F_istore_stats, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_stats, FAIL); + if (!H5DEBUG(AC)) HRETURN(SUCCEED); if (headers) { @@ -2319,7 +2321,7 @@ H5F_istore_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent, { H5F_istore_ud1_t udata; - FUNC_ENTER (H5F_istore_debug, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_debug, FAIL); HDmemset (&udata, 0, sizeof udata); udata.mesg.ndims = ndims; @@ -2445,7 +2447,7 @@ H5F_istore_allocate(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, unsigned u; /* Local index variable */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER(H5F_istore_allocate, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_allocate, FAIL); /* Check args */ assert(f); @@ -2683,7 +2685,7 @@ H5F_istore_prune_by_extent(H5F_t *f, const H5O_layout_t *layout, const H5S_t * s H5F_istore_ud1_t udata; /*B-tree pass-through */ hsize_t curr_dims[H5O_LAYOUT_NDIMS]; /*current dataspace dimensions */ - FUNC_ENTER(H5F_istore_prune_by_extent, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_prune_by_extent, FAIL); /* Check args */ assert(f); @@ -2837,7 +2839,7 @@ H5F_istore_remove(H5F_t *f, haddr_t addr, void *_lt_key /*in,out */ , { H5F_istore_key_t *lt_key = (H5F_istore_key_t *)_lt_key; - FUNC_ENTER(H5F_istore_remove,H5B_INS_ERROR); + FUNC_ENTER_NOAPI(H5F_istore_remove,H5B_INS_ERROR); H5FD_free(f->shared->lf, H5FD_MEM_DRAW, addr, (hsize_t)lt_key->nbytes); *lt_key_changed = FALSE; @@ -2898,7 +2900,7 @@ H5F_istore_initialize_by_extent(H5F_t *f, const H5O_layout_t *layout, H5O_fill_t fill; /* Fill value information */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER(H5F_istore_initialize_by_extent, FAIL); + FUNC_ENTER_NOAPI(H5F_istore_initialize_by_extent, FAIL); /* Check args */ assert(f); diff --git a/src/H5Fseq.c b/src/H5Fseq.c index 2714174..191748f 100644 --- a/src/H5Fseq.c +++ b/src/H5Fseq.c @@ -62,7 +62,7 @@ H5F_seq_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, const H5S_t *file_space, size_t elmt_size, size_t seq_len, hsize_t file_offset, void *buf/*out*/) { - FUNC_ENTER(H5F_seq_read, FAIL); + FUNC_ENTER_NOAPI(H5F_seq_read, FAIL); /* Check args */ assert(f); @@ -103,7 +103,7 @@ H5F_seq_write(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, const H5S_t *file_space, size_t elmt_size, size_t seq_len, hsize_t file_offset, const void *buf) { - FUNC_ENTER(H5F_seq_write, FAIL); + FUNC_ENTER_NOAPI(H5F_seq_write, FAIL); /* Check args */ assert(f); @@ -170,7 +170,7 @@ H5F_seq_readv(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, #endif herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER(H5F_seq_readv, FAIL); + FUNC_ENTER_NOAPI(H5F_seq_readv, FAIL); /* Check args */ assert(f); @@ -552,7 +552,7 @@ H5F_seq_writev(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout, #endif herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER(H5F_seq_writev, FAIL); + FUNC_ENTER_NOAPI(H5F_seq_writev, FAIL); /* Check args */ assert(f); @@ -144,7 +144,7 @@ H5Gcreate(hid_t loc_id, const char *name, size_t size_hint) H5G_t *grp = NULL; hid_t ret_value = FAIL; - FUNC_ENTER(H5Gcreate, FAIL); + FUNC_ENTER_API(H5Gcreate, FAIL); H5TRACE3("i","isz",loc_id,name,size_hint); /* Check arguments */ @@ -194,7 +194,7 @@ H5Gopen(hid_t loc_id, const char *name) H5G_t *grp = NULL; H5G_entry_t *loc = NULL; - FUNC_ENTER(H5Gopen, FAIL); + FUNC_ENTER_API(H5Gopen, FAIL); H5TRACE2("i","is",loc_id,name); /* Check args */ @@ -237,7 +237,7 @@ H5Gopen(hid_t loc_id, const char *name) herr_t H5Gclose(hid_t group_id) { - FUNC_ENTER(H5Gclose, FAIL); + FUNC_ENTER_API(H5Gclose, FAIL); H5TRACE1("e","i",group_id); /* Check args */ @@ -292,7 +292,7 @@ H5Giterate(hid_t loc_id, const char *name, int *idx, herr_t ret_value = FAIL; H5G_entry_t *loc = NULL; - FUNC_ENTER (H5Giterate, FAIL); + FUNC_ENTER_API(H5Giterate, FAIL); H5TRACE5("e","is*Isxx",loc_id,name,idx,op,op_data); /* Check args */ @@ -370,7 +370,7 @@ H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, H5G_entry_t *src_loc=NULL; H5G_entry_t *dst_loc=NULL; - FUNC_ENTER (H5Gmove2, FAIL); + FUNC_ENTER_API(H5Gmove2, FAIL); H5TRACE4("e","isis",src_loc_id,src_name,dst_loc_id,dst_name); if (src_loc_id != H5G_SAME_LOC && NULL==(src_loc=H5G_loc(src_loc_id))) { @@ -446,7 +446,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type, H5G_entry_t *cur_loc = NULL; H5G_entry_t *new_loc = NULL; - FUNC_ENTER (H5Glink2, FAIL); + FUNC_ENTER_API(H5Glink2, FAIL); H5TRACE5("e","isGlis",cur_loc_id,cur_name,type,new_loc_id,new_name); /* Check arguments */ @@ -516,7 +516,7 @@ H5Gunlink(hid_t loc_id, const char *name) { H5G_entry_t *loc = NULL; - FUNC_ENTER (H5Gunlink, FAIL); + FUNC_ENTER_API(H5Gunlink, FAIL); H5TRACE2("e","is",loc_id,name); /* Check arguments */ @@ -559,7 +559,7 @@ H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link, { H5G_entry_t *loc = NULL; - FUNC_ENTER (H5Gget_objinfo, FAIL); + FUNC_ENTER_API(H5Gget_objinfo, FAIL); H5TRACE4("e","isbx",loc_id,name,follow_link,statbuf); /* Check arguments */ @@ -602,7 +602,7 @@ H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf/*out*/) { H5G_entry_t *loc = NULL; - FUNC_ENTER (H5Gget_linkval, FAIL); + FUNC_ENTER_API(H5Gget_linkval, FAIL); H5TRACE4("e","iszx",loc_id,name,size,buf); /* Check arguments */ @@ -645,7 +645,7 @@ H5Gset_comment(hid_t loc_id, const char *name, const char *comment) { H5G_entry_t *loc = NULL; - FUNC_ENTER(H5Gset_comment, FAIL); + FUNC_ENTER_API(H5Gset_comment, FAIL); H5TRACE3("e","iss",loc_id,name,comment); if (NULL==(loc=H5G_loc(loc_id))) { @@ -693,7 +693,7 @@ H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf) H5G_entry_t *loc = NULL; int retval = FAIL; - FUNC_ENTER(H5Gget_comment, FAIL); + FUNC_ENTER_API(H5Gget_comment, FAIL); H5TRACE4("Is","iszs",loc_id,name,bufsize,buf); if (NULL==(loc=H5G_loc(loc_id))) { @@ -842,7 +842,8 @@ H5G_register_type(int type, htri_t(*isa)(H5G_entry_t*), const char *_desc) size_t i; herr_t ret_value = FAIL; - FUNC_ENTER(H5G_register_type, FAIL); + FUNC_ENTER_NOAPI(H5G_register_type, FAIL); + assert(type>=0); assert(isa); assert(_desc); @@ -1200,7 +1201,7 @@ H5G_traverse_slink (H5G_entry_t *grp_ent/*in,out*/, char *linkval = NULL; /*the copied link value */ herr_t ret_value = FAIL; /*return value */ - FUNC_ENTER (H5G_traverse_slink, FAIL); + FUNC_ENTER_NOAPI(H5G_traverse_slink, FAIL); /* Get the link value */ if (NULL==H5O_read (grp_ent, H5O_STAB, 0, &stab_mesg)) { @@ -1254,7 +1255,7 @@ H5G_mkroot (H5F_t *f, H5G_entry_t *ent) H5G_entry_t new_root; /*new root object */ H5O_stab_t stab; /*symbol table message */ - FUNC_ENTER(H5G_mkroot, FAIL); + FUNC_ENTER_NOAPI(H5G_mkroot, FAIL); /* check args */ assert(f); @@ -1339,7 +1340,7 @@ H5G_create(H5G_entry_t *loc, const char *name, size_t size_hint) size_t nchars; /*number of characters in compon*/ H5G_t *grp = NULL; /*new group */ - FUNC_ENTER(H5G_create, NULL); + FUNC_ENTER_NOAPI(H5G_create, NULL); /* check args */ assert(loc); @@ -1418,7 +1419,8 @@ H5G_isa(H5G_entry_t *ent) { htri_t exists; - FUNC_ENTER(H5G_isa, FAIL); + FUNC_ENTER_NOAPI(H5G_isa, FAIL); + assert(ent); if ((exists=H5O_exists(ent, H5O_STAB, 0))<0) { @@ -1454,7 +1456,7 @@ H5G_open(H5G_entry_t *loc, const char *name) H5G_t *ret_value = NULL; H5G_entry_t ent; /*dataset symbol table entry */ - FUNC_ENTER(H5G_open, NULL); + FUNC_ENTER_NOAPI(H5G_open, NULL); /* Check args */ assert(loc); @@ -1502,7 +1504,7 @@ H5G_open_oid(H5G_entry_t *ent) H5G_t *ret_value = NULL; H5O_stab_t mesg; - FUNC_ENTER(H5G_open_oid, NULL); + FUNC_ENTER_NOAPI(H5G_open_oid, NULL); /* Check args */ assert(ent); @@ -1554,7 +1556,7 @@ H5G_open_oid(H5G_entry_t *ent) H5G_t * H5G_reopen(H5G_t *grp) { - FUNC_ENTER(H5G_reopen, NULL); + FUNC_ENTER_NOAPI(H5G_reopen, NULL); assert(grp); assert(grp->nref > 0); @@ -1582,7 +1584,7 @@ H5G_reopen(H5G_t *grp) herr_t H5G_close(H5G_t *grp) { - FUNC_ENTER(H5G_close, FAIL); + FUNC_ENTER_NOAPI(H5G_close, FAIL); /* Check args */ assert(grp); @@ -1626,7 +1628,7 @@ H5G_close(H5G_t *grp) H5G_t * H5G_rootof(H5F_t *f) { - FUNC_ENTER(H5G_rootof, NULL); + FUNC_ENTER_NOAPI(H5G_rootof, NULL); while (f->mtab.parent) f = f->mtab.parent; FUNC_LEAVE(f->shared->root_grp); } @@ -1656,7 +1658,7 @@ H5G_insert(H5G_entry_t *loc, const char *name, H5G_entry_t *ent) size_t nchars; /*number of characters in name */ char _comp[1024]; /*name component */ - FUNC_ENTER(H5G_insert, FAIL); + FUNC_ENTER_NOAPI(H5G_insert, FAIL); /* Check args. */ assert (loc); @@ -1735,7 +1737,7 @@ herr_t H5G_find(H5G_entry_t *loc, const char *name, H5G_entry_t *grp_ent/*out*/, H5G_entry_t *obj_ent/*out*/) { - FUNC_ENTER(H5G_find, FAIL); + FUNC_ENTER_NOAPI(H5G_find, FAIL); /* check args */ assert (loc); @@ -1830,7 +1832,7 @@ H5G_loc (hid_t loc_id) H5D_t *dset=NULL; H5A_t *attr=NULL; - FUNC_ENTER (H5G_loc, NULL); + FUNC_ENTER_NOAPI(H5G_loc, NULL); switch (H5I_get_type(loc_id)) { case H5I_FILE: @@ -1936,7 +1938,7 @@ H5G_link (H5G_entry_t *cur_loc, const char *cur_name, H5G_entry_t *new_loc, size_t nchars; /*characters in component */ size_t offset; /*offset to sym-link value */ - FUNC_ENTER (H5G_link, FAIL); + FUNC_ENTER_NOAPI(H5G_link, FAIL); /* Check args */ assert (cur_loc); @@ -2058,7 +2060,7 @@ H5G_get_type(H5G_entry_t *ent) htri_t isa; size_t i; - FUNC_ENTER(H5G_get_type, H5G_UNKNOWN); + FUNC_ENTER_NOAPI(H5G_get_type, H5G_UNKNOWN); for (i=H5G_ntypes_g; i>0; --i) { if ((isa=(H5G_type_g[i-1].isa)(ent))<0) { @@ -2103,7 +2105,7 @@ H5G_get_objinfo (H5G_entry_t *loc, const char *name, hbool_t follow_link, H5G_entry_t grp_ent, obj_ent; const char *s = NULL; - FUNC_ENTER (H5G_get_objinfo, FAIL); + FUNC_ENTER_NOAPI(H5G_get_objinfo, FAIL); assert (loc); assert (name && *name); @@ -2190,7 +2192,7 @@ H5G_linkval (H5G_entry_t *loc, const char *name, size_t size, char *buf/*out*/) H5G_entry_t grp_ent, obj_ent; H5O_stab_t stab_mesg; - FUNC_ENTER (H5G_linkval, FAIL); + FUNC_ENTER_NOAPI(H5G_linkval, FAIL); /* * Get the symbol table entry for the link head and the symbol table @@ -2249,7 +2251,7 @@ H5G_set_comment(H5G_entry_t *loc, const char *name, const char *buf) H5G_entry_t obj_ent; H5O_name_t comment; - FUNC_ENTER(H5G_set_comment, FAIL); + FUNC_ENTER_NOAPI(H5G_set_comment, FAIL); /* Get the symbol table entry for the object */ if (H5G_namei(loc, name, NULL, NULL, &obj_ent/*out*/, H5G_TARGET_NORMAL, @@ -2299,7 +2301,7 @@ H5G_get_comment(H5G_entry_t *loc, const char *name, size_t bufsize, char *buf) H5G_entry_t obj_ent; int retval = FAIL; - FUNC_ENTER(H5G_get_comment, FAIL); + FUNC_ENTER_NOAPI(H5G_get_comment, FAIL); /* Get the symbol table entry for the object */ if (H5G_namei(loc, name, NULL, NULL, &obj_ent/*out*/, H5G_TARGET_NORMAL, @@ -2343,7 +2345,7 @@ H5G_unlink(H5G_entry_t *loc, const char *name) size_t len; const char *base=NULL; - FUNC_ENTER(H5G_unlink, FAIL); + FUNC_ENTER_NOAPI(H5G_unlink, FAIL); assert(loc); assert(name && *name); @@ -2396,7 +2398,7 @@ H5G_move(H5G_entry_t *src_loc, const char *src_name, H5G_entry_t *dst_loc, char *linkval=NULL; size_t lv_size=32; - FUNC_ENTER(H5G_move, FAIL); + FUNC_ENTER_NOAPI(H5G_move, FAIL); assert(src_loc); assert(dst_loc); assert(src_name && *src_name); @@ -2475,7 +2477,7 @@ H5G_insertion_file(H5G_entry_t *loc, const char *name) H5G_entry_t grp_ent; size_t size; - FUNC_ENTER(H5G_insertion_file, NULL); + FUNC_ENTER_NOAPI(H5G_insertion_file, NULL); assert(loc); assert(name && *name); diff --git a/src/H5Gent.c b/src/H5Gent.c index 565ae47..35fd0af 100644 --- a/src/H5Gent.c +++ b/src/H5Gent.c @@ -42,7 +42,8 @@ static int interface_initialize_g = 0; H5G_cache_t * H5G_ent_cache(H5G_entry_t *ent, H5G_type_t *cache_type) { - FUNC_ENTER(H5G_ent_cache, NULL); + FUNC_ENTER_NOAPI(H5G_ent_cache, NULL); + if (!ent) { HRETURN_ERROR(H5E_SYM, H5E_BADVALUE, NULL, "no entry"); } @@ -73,10 +74,13 @@ H5G_ent_cache(H5G_entry_t *ent, H5G_type_t *cache_type) herr_t H5G_ent_modified(H5G_entry_t *ent, H5G_type_t cache_type) { - FUNC_ENTER(H5G_ent_modified, FAIL); + FUNC_ENTER_NOAPI(H5G_ent_modified, FAIL); + assert(ent); + if (H5G_NO_CHANGE != ent->type) ent->type = cache_type; ent->dirty = TRUE; + FUNC_LEAVE(SUCCEED); } @@ -107,7 +111,7 @@ H5G_ent_decode_vec(H5F_t *f, const uint8_t **pp, H5G_entry_t *ent, int n) { int i; - FUNC_ENTER(H5G_ent_decode_vec, FAIL); + FUNC_ENTER_NOAPI(H5G_ent_decode_vec, FAIL); /* check arguments */ assert(f); @@ -153,7 +157,7 @@ H5G_ent_decode(H5F_t *f, const uint8_t **pp, H5G_entry_t *ent) const uint8_t *p_ret = *pp; uint32_t tmp; - FUNC_ENTER(H5G_ent_decode, FAIL); + FUNC_ENTER_NOAPI(H5G_ent_decode, FAIL); /* check arguments */ assert(f); @@ -219,7 +223,7 @@ H5G_ent_encode_vec(H5F_t *f, uint8_t **pp, const H5G_entry_t *ent, int n) { int i; - FUNC_ENTER(H5G_ent_encode_vec, FAIL); + FUNC_ENTER_NOAPI(H5G_ent_encode_vec, FAIL); /* check arguments */ assert(f); @@ -267,7 +271,7 @@ H5G_ent_encode(H5F_t *f, uint8_t **pp, const H5G_entry_t *ent) { uint8_t *p_ret = *pp + H5G_SIZEOF_ENTRY(f); - FUNC_ENTER(H5G_ent_encode, FAIL); + FUNC_ENTER_NOAPI(H5G_ent_encode, FAIL); /* check arguments */ assert(f); @@ -336,7 +340,7 @@ H5G_ent_debug(H5F_t UNUSED *f, const H5G_entry_t *ent, FILE * stream, { const char *lval = NULL; - FUNC_ENTER(H5G_ent_debug, FAIL); + FUNC_ENTER_NOAPI(H5G_ent_debug, FAIL); HDfprintf(stream, "%*s%-*s %lu\n", indent, "", fwidth, "Name offset into private heap:", diff --git a/src/H5Gnode.c b/src/H5Gnode.c index e46be42..eedb8e6 100644 --- a/src/H5Gnode.c +++ b/src/H5Gnode.c @@ -153,7 +153,7 @@ H5G_node_decode_key(H5F_t *f, H5B_t UNUSED *bt, uint8_t *raw, void *_key) { H5G_node_key_t *key = (H5G_node_key_t *) _key; - FUNC_ENTER(H5G_node_decode_key, FAIL); + FUNC_ENTER_NOAPI(H5G_node_decode_key, FAIL); assert(f); assert(raw); @@ -185,7 +185,7 @@ H5G_node_encode_key(H5F_t *f, H5B_t UNUSED *bt, uint8_t *raw, void *_key) { H5G_node_key_t *key = (H5G_node_key_t *) _key; - FUNC_ENTER(H5G_node_encode_key, FAIL); + FUNC_ENTER_NOAPI(H5G_node_encode_key, FAIL); assert(f); assert(raw); @@ -254,7 +254,7 @@ H5G_node_create(H5F_t *f, H5B_ins_t UNUSED op, void *_lt_key, H5G_node_t *sym = NULL; hsize_t size = 0; - FUNC_ENTER(H5G_node_create, FAIL); + FUNC_ENTER_NOAPI(H5G_node_create, FAIL); /* * Check arguments. @@ -325,7 +325,7 @@ H5G_node_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5G_node_t *sym) herr_t status; int i; - FUNC_ENTER(H5G_node_flush, FAIL); + FUNC_ENTER_NOAPI(H5G_node_flush, FAIL); /* * Check arguments. @@ -417,7 +417,7 @@ H5G_node_load(H5F_t *f, haddr_t addr, const void * UNUSED _udata1, const uint8_t *p = NULL; H5G_node_t *ret_value = NULL; /*for error handling */ - FUNC_ENTER(H5G_node_load, NULL); + FUNC_ENTER_NOAPI(H5G_node_load, NULL); /* * Check arguments. @@ -515,7 +515,7 @@ H5G_node_cmp2(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key) const char *s1, *s2; int cmp; - FUNC_ENTER(H5G_node_cmp2, FAIL); + FUNC_ENTER_NOAPI(H5G_node_cmp2, FAIL); assert(udata); assert(lt_key); @@ -570,7 +570,7 @@ H5G_node_cmp3(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key) H5G_node_key_t *rt_key = (H5G_node_key_t *) _rt_key; const char *s; - FUNC_ENTER(H5G_node_cmp3, FAIL); + FUNC_ENTER_NOAPI(H5G_node_cmp3, FAIL); /* left side */ if (NULL == (s = H5HL_peek(f, udata->heap_addr, lt_key->offset))) { @@ -631,7 +631,7 @@ H5G_node_found(H5F_t *f, haddr_t addr, const void UNUSED *_lt_key, const char *s; herr_t ret_value = FAIL; - FUNC_ENTER(H5G_node_found, FAIL); + FUNC_ENTER_NOAPI(H5G_node_found, FAIL); /* * Check arguments. @@ -748,7 +748,7 @@ H5G_node_insert(H5F_t *f, haddr_t addr, void UNUSED *_lt_key, H5B_ins_t ret_value = H5B_INS_ERROR; H5G_node_t *insert_into = NULL; /*node that gets new entry*/ - FUNC_ENTER(H5G_node_insert, H5B_INS_ERROR); + FUNC_ENTER_NOAPI(H5G_node_insert, H5B_INS_ERROR); /* * Check arguments. @@ -913,7 +913,7 @@ H5G_node_remove(H5F_t *f, haddr_t addr, void *_lt_key/*in,out*/, int lt=0, rt, idx=0, cmp=1; const char *s = NULL; - FUNC_ENTER(H5G_node_remove, H5B_INS_ERROR); + FUNC_ENTER_NOAPI(H5G_node_remove, H5B_INS_ERROR); /* Check arguments */ assert(f); @@ -1070,7 +1070,7 @@ H5G_node_iterate (H5F_t *f, void UNUSED *_lt_key, haddr_t addr, char buf[1024], *s; herr_t ret_value = FAIL; - FUNC_ENTER(H5G_node_iterate, FAIL); + FUNC_ENTER_NOAPI(H5G_node_iterate, FAIL); /* * Check arguments. @@ -1162,7 +1162,7 @@ H5G_node_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent, herr_t status; const char *s; - FUNC_ENTER(H5G_node_debug, FAIL); + FUNC_ENTER_NOAPI(H5G_node_debug, FAIL); /* * Check arguments. @@ -1240,7 +1240,7 @@ unsigned H5G_node_k(const H5F_t *f) unsigned sym_leaf_k; H5P_genplist_t *plist; /* Property list pointer */ - FUNC_ENTER(H5G_node_k, UFAIL); + FUNC_ENTER_NOAPI(H5G_node_k, UFAIL); assert(f); diff --git a/src/H5Gstab.c b/src/H5Gstab.c index d0b1cd9..9a23256 100644 --- a/src/H5Gstab.c +++ b/src/H5Gstab.c @@ -51,7 +51,7 @@ H5G_stab_create(H5F_t *f, size_t init, H5G_entry_t *self/*out*/) size_t name; /*offset of "" name */ H5O_stab_t stab; /*symbol table message */ - FUNC_ENTER(H5G_stab_create, FAIL); + FUNC_ENTER_NOAPI(H5G_stab_create, FAIL); /* * Check arguments. @@ -131,7 +131,7 @@ H5G_stab_find(H5G_entry_t *grp_ent, const char *name, H5G_bt_ud1_t udata; /*data to pass through B-tree */ H5O_stab_t stab; /*symbol table message */ - FUNC_ENTER(H5G_stab_find, FAIL); + FUNC_ENTER_NOAPI(H5G_stab_find, FAIL); /* Check arguments */ assert(grp_ent); @@ -180,7 +180,7 @@ H5G_stab_insert(H5G_entry_t *grp_ent, const char *name, H5G_entry_t *obj_ent) H5G_bt_ud1_t udata; /*data to pass through B-tree */ static double split_ratios[3] = {0.1, 0.5, 0.9}; - FUNC_ENTER(H5G_stab_insert, FAIL); + FUNC_ENTER_NOAPI(H5G_stab_insert, FAIL); /* check arguments */ assert(grp_ent && grp_ent->file); @@ -232,7 +232,8 @@ H5G_stab_remove(H5G_entry_t *grp_ent, const char *name) H5O_stab_t stab; /*symbol table message */ H5G_bt_ud1_t udata; /*data to pass through B-tree */ - FUNC_ENTER(H5G_stab_remove, FAIL); + FUNC_ENTER_NOAPI(H5G_stab_remove, FAIL); + assert(grp_ent && grp_ent->file); assert(name && *name); @@ -114,7 +114,7 @@ H5HG_create (H5F_t *f, size_t size) haddr_t addr; size_t n; - FUNC_ENTER (H5HG_create, NULL); + FUNC_ENTER_NOAPI(H5HG_create, NULL); /* Check args */ assert (f); @@ -233,7 +233,7 @@ H5HG_load (H5F_t *f, haddr_t addr, const void * UNUSED udata1, int i; size_t nalloc, need; - FUNC_ENTER (H5HG_load, NULL); + FUNC_ENTER_NOAPI(H5HG_load, NULL); /* check arguments */ assert (f); @@ -404,7 +404,7 @@ H5HG_flush (H5F_t *f, hbool_t destroy, haddr_t addr, H5HG_heap_t *heap) { int i; - FUNC_ENTER (H5HG_flush, FAIL); + FUNC_ENTER_NOAPI(H5HG_flush, FAIL); /* Check arguments */ assert (f); @@ -567,7 +567,7 @@ H5HG_insert (H5F_t *f, size_t size, void *obj, H5HG_t *hobj/*out*/) unsigned idx; H5HG_heap_t *heap = NULL; - FUNC_ENTER (H5HG_insert, FAIL); + FUNC_ENTER_NOAPI(H5HG_insert, FAIL); /* Check args */ assert (f); @@ -661,7 +661,7 @@ H5HG_peek (H5F_t *f, H5HG_t *hobj) void *retval = NULL; int i; - FUNC_ENTER (H5HG_peek, NULL); + FUNC_ENTER_NOAPI(H5HG_peek, NULL); /* Check args */ assert (f); @@ -722,7 +722,7 @@ H5HG_read (H5F_t *f, H5HG_t *hobj, void *object/*out*/) size_t size; uint8_t *p = NULL; - FUNC_ENTER (H5HG_read, NULL); + FUNC_ENTER_NOAPI(H5HG_read, NULL); /* Check args */ assert (f); @@ -787,7 +787,7 @@ H5HG_link (H5F_t *f, H5HG_t *hobj, int adjust) { H5HG_heap_t *heap = NULL; - FUNC_ENTER (H5HG_link, FAIL); + FUNC_ENTER_NOAPI(H5HG_link, FAIL); /* Check args */ assert (f); @@ -841,7 +841,7 @@ H5HG_remove (H5F_t *f, H5HG_t *hobj) int i; unsigned u; - FUNC_ENTER (H5HG_remove, FAIL); + FUNC_ENTER_NOAPI(H5HG_remove, FAIL); /* Check args */ assert (f); @@ -948,7 +948,7 @@ H5HG_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, size_t size; uint8_t *p = NULL; - FUNC_ENTER(H5HG_debug, FAIL); + FUNC_ENTER_NOAPI(H5HG_debug, FAIL); /* check arguments */ assert(f); @@ -113,7 +113,7 @@ H5HL_create(H5F_t *f, size_t size_hint, haddr_t *addr_p/*out*/) hsize_t total_size; /*total heap size on disk */ herr_t ret_value = FAIL; - FUNC_ENTER(H5HL_create, FAIL); + FUNC_ENTER_NOAPI(H5HL_create, FAIL); /* check arguments */ assert(f); @@ -208,7 +208,7 @@ H5HL_load(H5F_t *f, haddr_t addr, const void * UNUSED udata1, size_t free_block = H5HL_FREE_NULL; H5HL_t *ret_value = NULL; - FUNC_ENTER(H5HL_load, NULL); + FUNC_ENTER_NOAPI(H5HL_load, NULL); /* check arguments */ assert(f); @@ -332,7 +332,7 @@ H5HL_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5HL_t *heap) H5HL_free_t *fl = heap->freelist; haddr_t hdr_end_addr; - FUNC_ENTER(H5HL_flush, FAIL); + FUNC_ENTER_NOAPI(H5HL_flush, FAIL); /* check arguments */ assert(f); @@ -462,7 +462,7 @@ H5HL_read(H5F_t *f, haddr_t addr, size_t offset, size_t size, void *buf) { H5HL_t *heap = NULL; - FUNC_ENTER(H5HL_read, NULL); + FUNC_ENTER_NOAPI(H5HL_read, NULL); /* check arguments */ assert(f); @@ -521,7 +521,7 @@ H5HL_peek(H5F_t *f, haddr_t addr, size_t offset) H5HL_t *heap = NULL; const void *retval = NULL; - FUNC_ENTER(H5HL_peek, NULL); + FUNC_ENTER_NOAPI(H5HL_peek, NULL); /* check arguments */ assert(f); @@ -592,7 +592,7 @@ H5HL_insert(H5F_t *f, haddr_t addr, size_t buf_size, const void *buf) size_t need_size, old_size, need_more; hbool_t found; - FUNC_ENTER(H5HL_insert, (size_t)(-1)); + FUNC_ENTER_NOAPI(H5HL_insert, (size_t)(-1)); /* check arguments */ assert(f); @@ -754,7 +754,7 @@ H5HL_write(H5F_t *f, haddr_t addr, size_t offset, size_t size, const void *buf) { H5HL_t *heap = NULL; - FUNC_ENTER(H5HL_write, FAIL); + FUNC_ENTER_NOAPI(H5HL_write, FAIL); /* check arguments */ assert(f); @@ -812,7 +812,7 @@ H5HL_remove(H5F_t *f, haddr_t addr, size_t offset, size_t size) H5HL_t *heap = NULL; H5HL_free_t *fl = NULL, *fl2 = NULL; - FUNC_ENTER(H5HL_remove, FAIL); + FUNC_ENTER_NOAPI(H5HL_remove, FAIL); /* check arguments */ assert(f); @@ -937,7 +937,7 @@ H5HL_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent, int fwidth) uint8_t *marker = NULL; size_t amount_free = 0; - FUNC_ENTER(H5HL_debug, FAIL); + FUNC_ENTER_NOAPI(H5HL_debug, FAIL); /* check arguments */ assert(f); @@ -186,7 +186,7 @@ H5I_init_group(H5I_type_t grp, size_t hash_size, unsigned reserved, H5I_id_group_t *grp_ptr = NULL; /*ptr to the atomic group*/ int ret_value = SUCCEED; /*return value */ - FUNC_ENTER(H5I_init_group, FAIL); + FUNC_ENTER_NOAPI(H5I_init_group, FAIL); /* Check arguments */ if ((grp <= H5I_BADID || grp >= H5I_NGROUPS) && hash_size > 0) { @@ -265,7 +265,7 @@ H5I_nmembers(H5I_type_t grp) int n=0; unsigned i; - FUNC_ENTER(H5I_nmembers, FAIL); + FUNC_ENTER_NOAPI(H5I_nmembers, FAIL); if (grp<=H5I_BADID || grp>=H5I_NGROUPS) { HRETURN_ERROR(H5E_ARGS, H5E_BADRANGE, FAIL, "invalid group number"); @@ -323,7 +323,7 @@ H5I_clear_group(H5I_type_t grp, hbool_t force) unsigned delete_node; /* Flag to indicate node should be removed from linked list */ unsigned i,j; - FUNC_ENTER(H5I_clear_group, FAIL); + FUNC_ENTER_NOAPI(H5I_clear_group, FAIL); if (grp <= H5I_BADID || grp >= H5I_NGROUPS) { HGOTO_DONE(FAIL); @@ -468,7 +468,7 @@ H5I_destroy_group(H5I_type_t grp) H5I_id_group_t *grp_ptr = NULL; /* ptr to the atomic group */ int ret_value = SUCCEED; - FUNC_ENTER(H5I_destroy_group, FAIL); + FUNC_ENTER_NOAPI(H5I_destroy_group, FAIL); if (grp <= H5I_BADID || grp >= H5I_NGROUPS) { HGOTO_DONE(FAIL); @@ -531,7 +531,7 @@ H5I_register(H5I_type_t grp, void *object) H5I_id_info_t *curr_id; /*ptr to the current atom */ unsigned i; /*counter */ - FUNC_ENTER(H5I_register, FAIL); + FUNC_ENTER_NOAPI(H5I_register, FAIL); /* Check arguments */ if (grp <= H5I_BADID || grp >= H5I_NGROUPS) { @@ -638,7 +638,7 @@ H5I_object(hid_t id) H5I_id_info_t *id_ptr = NULL; /*ptr to the new atom */ void *ret_value = NULL; /*return value */ - FUNC_ENTER(H5I_object, NULL); + FUNC_ENTER_NOAPI(H5I_object, NULL); /* General lookup of the ID */ if (NULL==(id_ptr = H5I_find_id(id))) HGOTO_DONE(NULL); @@ -675,7 +675,7 @@ H5I_get_type(hid_t id) { H5I_type_t ret_value = H5I_BADID; - FUNC_ENTER(H5I_get_type, H5I_BADID); + FUNC_ENTER_NOAPI(H5I_get_type, H5I_BADID); if (id>0) ret_value = H5I_GROUP(id); assert(ret_value>=H5I_BADID && ret_value<H5I_NGROUPS); @@ -709,7 +709,7 @@ H5Iget_type(hid_t id) { H5I_type_t ret_value = H5I_BADID; - FUNC_ENTER(H5Iget_type, H5I_BADID); + FUNC_ENTER_API(H5Iget_type, H5I_BADID); H5TRACE1("It","i",id); ret_value = H5I_get_type(id); @@ -754,7 +754,7 @@ H5I_remove(hid_t id) #endif void * ret_value = NULL; /*return value */ - FUNC_ENTER(H5I_remove, NULL); + FUNC_ENTER_NOAPI(H5I_remove, NULL); /* Check arguments */ grp = H5I_GROUP(id); @@ -855,7 +855,7 @@ H5I_dec_ref(hid_t id) H5I_id_info_t *id_ptr = NULL; /*ptr to the new ID */ int ret_value = FAIL; /*return value */ - FUNC_ENTER(H5I_dec_ref, FAIL); + FUNC_ENTER_NOAPI(H5I_dec_ref, FAIL); /* Check arguments */ grp_ptr = H5I_id_group_list_g[grp]; @@ -914,7 +914,7 @@ H5I_inc_ref(hid_t id) H5I_id_group_t *grp_ptr = NULL; /*ptr to the group */ H5I_id_info_t *id_ptr = NULL; /*ptr to the ID */ - FUNC_ENTER(H5I_inc_ref, FAIL); + FUNC_ENTER_NOAPI(H5I_inc_ref, FAIL); /* Check arguments */ if (id<0) HRETURN(FAIL); @@ -962,7 +962,7 @@ H5I_search(H5I_type_t grp, H5I_search_func_t func, const void *key) unsigned i; /*counter */ void *ret_value = NULL; /*return value */ - FUNC_ENTER(H5I_search, NULL); + FUNC_ENTER_NOAPI(H5I_search, NULL); /* Check arguments */ if (grp <= H5I_BADID || grp >= H5I_NGROUPS) { @@ -1102,7 +1102,7 @@ H5I_debug(H5I_type_t grp) int is, js; unsigned int iu; - FUNC_ENTER(H5I_debug, FAIL); + FUNC_ENTER_NOAPI(H5I_debug, FAIL); fprintf(stderr, "Dumping group %d\n", (int)grp); grp_ptr = H5I_id_group_list_g[grp]; @@ -61,7 +61,7 @@ H5MF_alloc(H5F_t *f, H5FD_mem_t type, hsize_t size) { haddr_t ret_value=HADDR_UNDEF; - FUNC_ENTER(H5MF_alloc, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5MF_alloc, HADDR_UNDEF); /* check arguments */ assert(f); @@ -109,7 +109,7 @@ H5MF_alloc(H5F_t *f, H5FD_mem_t type, hsize_t size) herr_t H5MF_xfree(H5F_t *f, H5FD_mem_t type, haddr_t addr, hsize_t size) { - FUNC_ENTER(H5MF_xfree, FAIL); + FUNC_ENTER_NOAPI(H5MF_xfree, FAIL); /* check arguments */ assert(f); @@ -177,7 +177,7 @@ H5MF_realloc(H5F_t *f, H5FD_mem_t type, haddr_t old_addr, hsize_t old_size, { haddr_t ret_value=HADDR_UNDEF; - FUNC_ENTER (H5MF_realloc, HADDR_UNDEF); + FUNC_ENTER_NOAPI(H5MF_realloc, HADDR_UNDEF); /* Convert old relative address to absolute address */ old_addr += f->shared->base_addr; @@ -129,7 +129,7 @@ H5MM_strdup(const char *s) { char *mem; - FUNC_ENTER (H5MM_strdup, NULL); + FUNC_ENTER_NOAPI(H5MM_strdup, NULL); if (!s) { HRETURN_ERROR (H5E_ARGS, H5E_BADVALUE, NULL, @@ -157,7 +157,7 @@ H5O_create(H5F_t *f, size_t size_hint, H5G_entry_t *ent/*out*/) H5O_t *oh = NULL; haddr_t tmp_addr; - FUNC_ENTER(H5O_create, FAIL); + FUNC_ENTER_NOAPI(H5O_create, FAIL); /* check args */ assert(f); @@ -246,7 +246,7 @@ H5O_create(H5F_t *f, size_t size_hint, H5G_entry_t *ent/*out*/) herr_t H5O_open(H5G_entry_t *obj_ent) { - FUNC_ENTER(H5O_open, FAIL); + FUNC_ENTER_NOAPI(H5O_open, FAIL); /* Check args */ assert(obj_ent); @@ -281,7 +281,7 @@ H5O_open(H5G_entry_t *obj_ent) herr_t H5O_close(H5G_entry_t *obj_ent) { - FUNC_ENTER(H5O_close, FAIL); + FUNC_ENTER_NOAPI(H5O_close, FAIL); /* Check args */ assert(obj_ent); @@ -359,7 +359,7 @@ H5O_load(H5F_t *f, haddr_t addr, const void * UNUSED _udata1, H5O_cont_t *cont = NULL; uint8_t flags; - FUNC_ENTER(H5O_load, NULL); + FUNC_ENTER_NOAPI(H5O_load, NULL); /* check args */ assert(f); @@ -549,7 +549,7 @@ H5O_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5O_t *oh) herr_t (*encode)(H5F_t*, uint8_t*, const void*) = NULL; unsigned combine=0; /* Whether to combine the object header prefix & the first chunk */ - FUNC_ENTER(H5O_flush, FAIL); + FUNC_ENTER_NOAPI(H5O_flush, FAIL); /* check args */ assert(f); @@ -741,7 +741,7 @@ H5O_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5O_t *oh) herr_t H5O_reset(const H5O_class_t *type, void *native) { - FUNC_ENTER(H5O_reset, FAIL); + FUNC_ENTER_NOAPI(H5O_reset, FAIL); if (native) { if (type->reset) { @@ -777,7 +777,7 @@ H5O_reset(const H5O_class_t *type, void *native) void * H5O_free (const H5O_class_t *type, void *mesg) { - FUNC_ENTER (H5O_free, NULL); + FUNC_ENTER_NOAPI(H5O_free, NULL); if (mesg) { H5O_reset (type, mesg); @@ -813,7 +813,7 @@ H5O_copy (const H5O_class_t *type, const void *mesg, void *dst) { void *ret_value = NULL; - FUNC_ENTER (H5O_copy, NULL); + FUNC_ENTER_NOAPI(H5O_copy, NULL); assert (type); assert (type->copy); @@ -859,7 +859,7 @@ H5O_link(H5G_entry_t *ent, int adjust) H5O_t *oh = NULL; int ret_value = FAIL; - FUNC_ENTER(H5O_link, FAIL); + FUNC_ENTER_NOAPI(H5O_link, FAIL); /* check args */ assert(ent); @@ -924,7 +924,7 @@ H5O_count (H5G_entry_t *ent, const H5O_class_t *type) int acc; unsigned u; - FUNC_ENTER (H5O_count, FAIL); + FUNC_ENTER_NOAPI(H5O_count, FAIL); /* Check args */ assert (ent); @@ -973,7 +973,8 @@ H5O_exists(H5G_entry_t *ent, const H5O_class_t *type, int sequence) H5O_t *oh=NULL; unsigned u; - FUNC_ENTER(H5O_exists, FAIL); + FUNC_ENTER_NOAPI(H5O_exists, FAIL); + assert(ent); assert(ent->file); assert(type); @@ -1031,7 +1032,7 @@ H5O_read(H5G_entry_t *ent, const H5O_class_t *type, int sequence, void *mesg) H5G_cache_t *cache = NULL; H5G_type_t cache_type; - FUNC_ENTER(H5O_read, NULL); + FUNC_ENTER_NOAPI(H5O_read, NULL); /* check args */ assert(ent); @@ -1248,7 +1249,7 @@ H5O_modify(H5G_entry_t *ent, const H5O_class_t *type, int overwrite, size_t size = 0; H5O_shared_t sh_mesg = {0,{{0,0}}}; - FUNC_ENTER(H5O_modify, FAIL); + FUNC_ENTER_NOAPI(H5O_modify, FAIL); /* check args */ assert(ent); @@ -1412,6 +1413,7 @@ H5O_touch_oh(H5F_t *f, H5O_t *oh, hbool_t force) size_t size; FUNC_ENTER_NOINIT(H5O_touch_oh); + assert(oh); /* Look for existing message */ @@ -1470,7 +1472,7 @@ H5O_touch(H5G_entry_t *ent, hbool_t force) H5O_t *oh = NULL; herr_t ret_value = FAIL; - FUNC_ENTER(H5O_touch, FAIL); + FUNC_ENTER_NOAPI(H5O_touch, FAIL); /* check args */ assert(ent); @@ -1538,7 +1540,7 @@ H5O_remove(H5G_entry_t *ent, const H5O_class_t *type, int sequence) herr_t ret_value = FAIL; H5O_shared_t *sh_mesg = NULL; - FUNC_ENTER(H5O_remove, FAIL); + FUNC_ENTER_NOAPI(H5O_remove, FAIL); /* check args */ assert(ent); @@ -2093,7 +2095,7 @@ H5O_share (H5F_t *f, const H5O_class_t *type, const void *mesg, void *buf = NULL; herr_t ret_value = FAIL; - FUNC_ENTER (H5O_share, FAIL); + FUNC_ENTER_NOAPI(H5O_share, FAIL); /* Check args */ assert (f); @@ -2152,7 +2154,7 @@ H5O_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth) void *(*decode)(H5F_t*, const uint8_t*, H5O_shared_t*); herr_t (*debug)(H5F_t*, const void*, FILE*, int, int)=NULL; - FUNC_ENTER(H5O_debug, FAIL); + FUNC_ENTER_NOAPI(H5O_debug, FAIL); /* check args */ assert(f); diff --git a/src/H5Oattr.c b/src/H5Oattr.c index 951ffbb..d1f4c74 100644 --- a/src/H5Oattr.c +++ b/src/H5Oattr.c @@ -96,7 +96,7 @@ H5O_attr_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh) size_t name_len; /*attribute name length */ int version; /*message version number*/ - FUNC_ENTER(H5O_attr_decode, NULL); + FUNC_ENTER_NOAPI(H5O_attr_decode, NULL); /* check args */ assert(f); @@ -194,7 +194,7 @@ H5O_attr_encode(H5F_t *f, uint8_t *p, const void *mesg) const H5A_t *attr = (const H5A_t *) mesg; size_t name_len; /* Attribute name length */ - FUNC_ENTER(H5O_attr_encode, FAIL); + FUNC_ENTER_NOAPI(H5O_attr_encode, FAIL); /* check args */ assert(f); @@ -268,7 +268,7 @@ H5O_attr_copy(const void *_src, void *_dst) const H5A_t *src = (const H5A_t *) _src; H5A_t *dst = NULL; - FUNC_ENTER(H5O_attr_copy, NULL); + FUNC_ENTER_NOAPI(H5O_attr_copy, NULL); /* check args */ assert(src); @@ -313,7 +313,7 @@ H5O_attr_size(H5F_t UNUSED *f, const void *mesg) size_t name_len; const H5A_t *attr = (const H5A_t *) mesg; - FUNC_ENTER(H5O_attr_size, 0); + FUNC_ENTER_NOAPI(H5O_attr_size, 0); assert(attr); @@ -353,7 +353,7 @@ H5O_attr_reset(void *_mesg) H5A_t *attr = (H5A_t *) _mesg; H5A_t *tmp = NULL; - FUNC_ENTER(H5O_attr_reset, FAIL); + FUNC_ENTER_NOAPI(H5O_attr_reset, FAIL); if (attr) { if (NULL==(tmp = H5MM_malloc(sizeof(H5A_t)))) { @@ -391,7 +391,7 @@ H5O_attr_debug(H5F_t *f, const void *_mesg, FILE * stream, int indent, { const H5A_t *mesg = (const H5A_t *)_mesg; - FUNC_ENTER(H5O_attr_debug, FAIL); + FUNC_ENTER_NOAPI(H5O_attr_debug, FAIL); /* check args */ assert(f); diff --git a/src/H5Ocomp.c b/src/H5Ocomp.c index 1caea0c..3946d80 100644 --- a/src/H5Ocomp.c +++ b/src/H5Ocomp.c @@ -75,7 +75,7 @@ H5O_pline_decode(H5F_t UNUSED *f, const uint8_t *p, unsigned version; size_t i, j, n, name_length; - FUNC_ENTER(H5O_pline_decode, NULL); + FUNC_ENTER_NOAPI(H5O_pline_decode, NULL); /* check args */ assert(p); @@ -178,7 +178,7 @@ H5O_pline_encode (H5F_t UNUSED *f, uint8_t *p/*out*/, const void *mesg) const char *name=NULL; H5Z_class_t *cls=NULL; - FUNC_ENTER (H5O_pline_encode, FAIL); + FUNC_ENTER_NOAPI(H5O_pline_encode, FAIL); /* Check args */ assert (p); @@ -253,7 +253,7 @@ H5O_pline_copy (const void *_src, void *_dst/*out*/) size_t i; H5O_pline_t *ret_value = NULL; - FUNC_ENTER (H5O_pline_copy, NULL); + FUNC_ENTER_NOAPI(H5O_pline_copy, NULL); if (!dst && NULL==(dst = H5FL_ALLOC (H5O_pline_t,0))) { HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, @@ -330,7 +330,7 @@ H5O_pline_size (H5F_t UNUSED *f, const void *mesg) const char *name = NULL; H5Z_class_t *cls = NULL; - FUNC_ENTER (H5O_pline_size, 0); + FUNC_ENTER_NOAPI(H5O_pline_size, 0); /* Message header */ size = 1 + /*version */ @@ -381,7 +381,7 @@ H5O_pline_reset (void *mesg) H5O_pline_t *pline = (H5O_pline_t*)mesg; size_t i; - FUNC_ENTER (H5O_pline_reset, FAIL); + FUNC_ENTER_NOAPI(H5O_pline_reset, FAIL); assert (pline); for (i=0; i<pline->nfilters; i++) { @@ -412,7 +412,7 @@ H5O_pline_reset (void *mesg) static herr_t H5O_pline_free (void *mesg) { - FUNC_ENTER (H5O_pline_free, FAIL); + FUNC_ENTER_NOAPI(H5O_pline_free, FAIL); assert (mesg); @@ -445,7 +445,7 @@ H5O_pline_debug (H5F_t UNUSED *f, const void *mesg, FILE *stream, const H5O_pline_t *pline = (const H5O_pline_t *)mesg; size_t i, j; - FUNC_ENTER(H5O_pline_debug, FAIL); + FUNC_ENTER_NOAPI(H5O_pline_debug, FAIL); /* check args */ assert(f); diff --git a/src/H5Ocont.c b/src/H5Ocont.c index 969a7c4..c79f01e 100644 --- a/src/H5Ocont.c +++ b/src/H5Ocont.c @@ -73,7 +73,7 @@ H5O_cont_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh) { H5O_cont_t *cont = NULL; - FUNC_ENTER(H5O_cont_decode, NULL); + FUNC_ENTER_NOAPI(H5O_cont_decode, NULL); /* check args */ assert(f); @@ -111,7 +111,7 @@ H5O_cont_encode(H5F_t *f, uint8_t *p, const void *_mesg) { const H5O_cont_t *cont = (const H5O_cont_t *) _mesg; - FUNC_ENTER(H5O_cont_encode, FAIL); + FUNC_ENTER_NOAPI(H5O_cont_encode, FAIL); /* check args */ assert(f); @@ -146,7 +146,7 @@ H5O_cont_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream, { const H5O_cont_t *cont = (const H5O_cont_t *) _mesg; - FUNC_ENTER(H5O_cont_debug, FAIL); + FUNC_ENTER_NOAPI(H5O_cont_debug, FAIL); /* check args */ assert(f); diff --git a/src/H5Odtype.c b/src/H5Odtype.c index 8adfc8b..cad92d9 100644 --- a/src/H5Odtype.c +++ b/src/H5Odtype.c @@ -821,7 +821,7 @@ H5O_dtype_decode(H5F_t *f, const uint8_t *p, { H5T_t *dt = NULL; - FUNC_ENTER(H5O_dtype_decode, NULL); + FUNC_ENTER_NOAPI(H5O_dtype_decode, NULL); /* check args */ assert(p); @@ -862,7 +862,7 @@ H5O_dtype_encode(H5F_t UNUSED *f, uint8_t *p, const void *mesg) { const H5T_t *dt = (const H5T_t *) mesg; - FUNC_ENTER(H5O_dtype_encode, FAIL); + FUNC_ENTER_NOAPI(H5O_dtype_encode, FAIL); /* check args */ assert(f); @@ -900,7 +900,7 @@ H5O_dtype_copy(const void *_src, void *_dst) const H5T_t *src = (const H5T_t *) _src; H5T_t *dst = NULL; - FUNC_ENTER(H5O_dtype_copy, NULL); + FUNC_ENTER_NOAPI(H5O_dtype_copy, NULL); /* check args */ assert(src); @@ -941,7 +941,7 @@ H5O_dtype_size(H5F_t *f, const void *mesg) size_t ret_value = 8; const H5T_t *dt = (const H5T_t *) mesg; - FUNC_ENTER(H5O_dtype_size, 0); + FUNC_ENTER_NOAPI(H5O_dtype_size, 0); assert(mesg); @@ -1027,7 +1027,7 @@ H5O_dtype_reset(void *_mesg) H5T_t *dt = (H5T_t *) _mesg; H5T_t *tmp = NULL; - FUNC_ENTER(H5O_dtype_reset, FAIL); + FUNC_ENTER_NOAPI(H5O_dtype_reset, FAIL); if (dt) { if (NULL==(tmp = H5FL_ALLOC(H5T_t,0))) { @@ -1059,7 +1059,7 @@ H5O_dtype_reset(void *_mesg) static herr_t H5O_dtype_free (void *mesg) { - FUNC_ENTER (H5O_dtype_free, FAIL); + FUNC_ENTER_NOAPI(H5O_dtype_free, FAIL); assert (mesg); @@ -1090,7 +1090,8 @@ H5O_dtype_get_share(H5F_t UNUSED *f, const void *_mesg, { const H5T_t *dt = (const H5T_t *)_mesg; - FUNC_ENTER (H5O_dtype_get_share, FAIL); + FUNC_ENTER_NOAPI(H5O_dtype_get_share, FAIL); + assert (dt); assert (sh); @@ -1127,7 +1128,8 @@ H5O_dtype_set_share (H5F_t UNUSED *f, void *_mesg/*in,out*/, { H5T_t *dt = (H5T_t *)_mesg; - FUNC_ENTER (H5O_dtype_set_share, FAIL); + FUNC_ENTER_NOAPI(H5O_dtype_set_share, FAIL); + assert (dt); assert (sh); assert (!sh->in_gh); @@ -1167,8 +1169,7 @@ H5O_dtype_debug(H5F_t *f, const void *mesg, FILE *stream, int i; size_t k; - - FUNC_ENTER(H5O_dtype_debug, FAIL); + FUNC_ENTER_NOAPI(H5O_dtype_debug, FAIL); /* check args */ assert(f); diff --git a/src/H5Oefl.c b/src/H5Oefl.c index a6267a1..2dbeaa9 100644 --- a/src/H5Oefl.c +++ b/src/H5Oefl.c @@ -74,7 +74,7 @@ H5O_efl_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh) int i, version; const char *s = NULL; - FUNC_ENTER(H5O_efl_decode, NULL); + FUNC_ENTER_NOAPI(H5O_efl_decode, NULL); /* Check args */ assert(f); @@ -162,7 +162,7 @@ H5O_efl_encode(H5F_t *f, uint8_t *p, const void *_mesg) const H5O_efl_t *mesg = (const H5O_efl_t *)_mesg; int i; - FUNC_ENTER(H5O_efl_encode, FAIL); + FUNC_ENTER_NOAPI(H5O_efl_encode, FAIL); /* check args */ assert(f); @@ -227,7 +227,7 @@ H5O_efl_copy(const void *_mesg, void *_dest) H5O_efl_t *dest = (H5O_efl_t *) _dest; int i; - FUNC_ENTER(H5O_efl_copy, NULL); + FUNC_ENTER_NOAPI(H5O_efl_copy, NULL); /* check args */ assert(mesg); @@ -285,7 +285,7 @@ H5O_efl_size(H5F_t *f, const void *_mesg) const H5O_efl_t *mesg = (const H5O_efl_t *) _mesg; size_t ret_value = 0; - FUNC_ENTER(H5O_efl_size, 0); + FUNC_ENTER_NOAPI(H5O_efl_size, 0); /* check args */ assert(f); @@ -324,8 +324,7 @@ H5O_efl_reset(void *_mesg) H5O_efl_t *mesg = (H5O_efl_t *) _mesg; int i; - - FUNC_ENTER(H5O_efl_reset, FAIL); + FUNC_ENTER_NOAPI(H5O_efl_reset, FAIL); /* check args */ assert(mesg); @@ -365,7 +364,7 @@ H5O_efl_total_size (H5O_efl_t *efl) int i; hsize_t ret_value = 0, tmp; - FUNC_ENTER (H5O_efl_total_size, 0); + FUNC_ENTER_NOAPI(H5O_efl_total_size, 0); if (efl->nused>0 && H5O_EFL_UNLIMITED==efl->slot[efl->nused-1].size) { @@ -416,7 +415,7 @@ H5O_efl_read (H5F_t UNUSED *f, const H5O_efl_t *efl, haddr_t addr, ssize_t n; herr_t ret_value = FAIL; - FUNC_ENTER (H5O_efl_read, FAIL); + FUNC_ENTER_NOAPI(H5O_efl_read, FAIL); /* Check args */ assert (efl && efl->nused>0); @@ -511,7 +510,7 @@ H5O_efl_write (H5F_t UNUSED *f, const H5O_efl_t *efl, haddr_t addr, hsize_t skip=0; herr_t ret_value = FAIL; - FUNC_ENTER (H5O_efl_write, FAIL); + FUNC_ENTER_NOAPI(H5O_efl_write, FAIL); /* Check args */ assert (efl && efl->nused>0); @@ -600,7 +599,7 @@ H5O_efl_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream, char buf[64]; int i; - FUNC_ENTER(H5O_efl_debug, FAIL); + FUNC_ENTER_NOAPI(H5O_efl_debug, FAIL); /* check args */ assert(f); diff --git a/src/H5Ofill.c b/src/H5Ofill.c index b50e2da..77523e0 100644 --- a/src/H5Ofill.c +++ b/src/H5Ofill.c @@ -98,7 +98,8 @@ H5O_fill_new_decode(H5F_t UNUSED *f, const uint8_t *p, int version; void *ret_value = NULL; - FUNC_ENTER(H5O_fill_new_decode, NULL); + FUNC_ENTER_NOAPI(H5O_fill_new_decode, NULL); + assert(f); assert(p); assert(!sh); @@ -170,7 +171,8 @@ H5O_fill_decode(H5F_t UNUSED *f, const uint8_t *p, H5O_fill_t *mesg=NULL; void *ret_value = NULL; - FUNC_ENTER(H5O_fill_decode, NULL); + FUNC_ENTER_NOAPI(H5O_fill_decode, NULL); + assert(f); assert(p); assert(!sh); @@ -221,7 +223,8 @@ H5O_fill_new_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg) { const H5O_fill_new_t *mesg = (const H5O_fill_new_t *)_mesg; - FUNC_ENTER(H5O_fill_new_encode, FAIL); + FUNC_ENTER_NOAPI(H5O_fill_new_encode, FAIL); + assert(f); assert(p); assert(mesg && NULL==mesg->type); @@ -266,7 +269,8 @@ H5O_fill_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg) { const H5O_fill_t *mesg = (const H5O_fill_t *)_mesg; - FUNC_ENTER(H5O_fill_encode, FAIL); + FUNC_ENTER_NOAPI(H5O_fill_encode, FAIL); + assert(f); assert(p); assert(mesg && NULL==mesg->type); @@ -305,7 +309,8 @@ H5O_fill_new_copy(const void *_mesg, void *_dest) H5O_fill_new_t *dest = (H5O_fill_new_t *)_dest; void *ret_value = NULL; - FUNC_ENTER(H5O_fill_new_copy, NULL); + FUNC_ENTER_NOAPI(H5O_fill_new_copy, NULL); + assert(mesg); if (!dest && NULL==(dest=H5MM_calloc(sizeof(H5O_fill_new_t)))) { @@ -373,7 +378,8 @@ H5O_fill_copy(const void *_mesg, void *_dest) H5O_fill_t *dest = (H5O_fill_t *)_dest; void *ret_value = NULL; - FUNC_ENTER(H5O_fill_copy, NULL); + FUNC_ENTER_NOAPI(H5O_fill_copy, NULL); + assert(mesg); if (!dest && NULL==(dest=H5MM_calloc(sizeof(H5O_fill_t)))) { @@ -434,7 +440,8 @@ H5O_fill_new_size(H5F_t UNUSED *f, const void *_mesg) const H5O_fill_new_t *mesg = (const H5O_fill_new_t *)_mesg; size_t ret_value = 0; - FUNC_ENTER(H5O_fill_new_size, 0); + FUNC_ENTER_NOAPI(H5O_fill_new_size, 0); + assert(f); assert(mesg); @@ -471,7 +478,8 @@ H5O_fill_size(H5F_t UNUSED *f, const void *_mesg) { const H5O_fill_t *mesg = (const H5O_fill_t *)_mesg; - FUNC_ENTER(H5O_fill_size, 0); + FUNC_ENTER_NOAPI(H5O_fill_size, 0); + assert(f); assert(mesg); @@ -500,7 +508,8 @@ H5O_fill_new_reset(void *_mesg) { H5O_fill_new_t *mesg = (H5O_fill_new_t *)_mesg; - FUNC_ENTER(H5O_fill_new_reset, FAIL); + FUNC_ENTER_NOAPI(H5O_fill_new_reset, FAIL); + assert(mesg); if(mesg->buf) @@ -536,7 +545,8 @@ H5O_fill_reset(void *_mesg) { H5O_fill_t *mesg = (H5O_fill_t *)_mesg; - FUNC_ENTER(H5O_fill_reset, FAIL); + FUNC_ENTER_NOAPI(H5O_fill_reset, FAIL); + assert(mesg); if(mesg->buf) @@ -571,7 +581,8 @@ H5O_fill_new_debug(H5F_t UNUSED *f, const void *_mesg, FILE *stream, { const H5O_fill_new_t *mesg = (const H5O_fill_new_t *)_mesg; - FUNC_ENTER(H5O_fill_new_debug, FAIL); + FUNC_ENTER_NOAPI(H5O_fill_new_debug, FAIL); + assert(f); assert(mesg); assert(stream); @@ -612,7 +623,8 @@ H5O_fill_debug(H5F_t UNUSED *f, const void *_mesg, FILE *stream, { const H5O_fill_t *mesg = (const H5O_fill_t *)_mesg; - FUNC_ENTER(H5O_fill_debug, FAIL); + FUNC_ENTER_NOAPI(H5O_fill_debug, FAIL); + assert(f); assert(mesg); assert(stream); @@ -659,7 +671,8 @@ H5O_fill_convert(void *_fill, H5T_t *dset_type) hid_t src_id=-1, dst_id=-1; /*data type identifiers */ herr_t ret_value=FAIL; /*return value */ - FUNC_ENTER(H5O_fill_convert, FAIL); + FUNC_ENTER_NOAPI(H5O_fill_convert, FAIL); + assert(fill); assert(dset_type); diff --git a/src/H5Olayout.c b/src/H5Olayout.c index a4d3fa0..b1b4680 100644 --- a/src/H5Olayout.c +++ b/src/H5Olayout.c @@ -83,7 +83,7 @@ H5O_layout_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh) int version; unsigned u; - FUNC_ENTER(H5O_layout_decode, NULL); + FUNC_ENTER_NOAPI(H5O_layout_decode, NULL); /* check args */ assert(f); @@ -155,7 +155,7 @@ H5O_layout_encode(H5F_t *f, uint8_t *p, const void *_mesg) const H5O_layout_t *mesg = (const H5O_layout_t *) _mesg; unsigned u; - FUNC_ENTER(H5O_layout_encode, FAIL); + FUNC_ENTER_NOAPI(H5O_layout_encode, FAIL); /* check args */ assert(f); @@ -216,7 +216,7 @@ H5O_layout_copy(const void *_mesg, void *_dest) const H5O_layout_t *mesg = (const H5O_layout_t *) _mesg; H5O_layout_t *dest = (H5O_layout_t *) _dest; - FUNC_ENTER(H5O_layout_copy, NULL); + FUNC_ENTER_NOAPI(H5O_layout_copy, NULL); /* check args */ assert(mesg); @@ -255,7 +255,7 @@ H5O_layout_size(H5F_t *f, const void *_mesg) const H5O_layout_t *mesg = (const H5O_layout_t *) _mesg; size_t ret_value = 0; - FUNC_ENTER(H5O_layout_size, 0); + FUNC_ENTER_NOAPI(H5O_layout_size, 0); /* check args */ assert(f); @@ -289,7 +289,7 @@ H5O_layout_size(H5F_t *f, const void *_mesg) static herr_t H5O_layout_free (void *mesg) { - FUNC_ENTER (H5O_layout_free, FAIL); + FUNC_ENTER_NOAPI(H5O_layout_free, FAIL); assert (mesg); @@ -320,7 +320,7 @@ H5O_layout_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream, const H5O_layout_t *mesg = (const H5O_layout_t *) _mesg; unsigned u; - FUNC_ENTER(H5O_layout_debug, FAIL); + FUNC_ENTER_NOAPI(H5O_layout_debug, FAIL); /* check args */ assert(f); diff --git a/src/H5Omtime.c b/src/H5Omtime.c index 19badfa..a424f27 100644 --- a/src/H5Omtime.c +++ b/src/H5Omtime.c @@ -79,7 +79,7 @@ H5O_mtime_decode(H5F_t UNUSED *f, const uint8_t *p, struct tm tm; static int ncalls=0; - FUNC_ENTER(H5O_mtime_decode, NULL); + FUNC_ENTER_NOAPI(H5O_mtime_decode, NULL); /* check args */ assert(f); @@ -205,8 +205,7 @@ H5O_mtime_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg) const time_t *mesg = (const time_t *) _mesg; struct tm *tm; - - FUNC_ENTER(H5O_mtime_encode, FAIL); + FUNC_ENTER_NOAPI(H5O_mtime_encode, FAIL); /* check args */ assert(f); @@ -247,7 +246,7 @@ H5O_mtime_copy(const void *_mesg, void *_dest) const time_t *mesg = (const time_t *) _mesg; time_t *dest = (time_t *) _dest; - FUNC_ENTER(H5O_mtime_copy, NULL); + FUNC_ENTER_NOAPI(H5O_mtime_copy, NULL); /* check args */ assert(mesg); @@ -285,7 +284,7 @@ H5O_mtime_copy(const void *_mesg, void *_dest) static size_t H5O_mtime_size(H5F_t * UNUSED f, const void * UNUSED mesg) { - FUNC_ENTER(H5O_mtime_size, 0); + FUNC_ENTER_NOAPI(H5O_mtime_size, 0); /* check args */ assert(f); @@ -312,7 +311,7 @@ H5O_mtime_size(H5F_t * UNUSED f, const void * UNUSED mesg) static herr_t H5O_mtime_free (void *mesg) { - FUNC_ENTER (H5O_mtime_free, FAIL); + FUNC_ENTER_NOAPI(H5O_mtime_free, FAIL); assert (mesg); @@ -345,7 +344,7 @@ H5O_mtime_debug(H5F_t UNUSED *f, const void *_mesg, FILE *stream, struct tm *tm; char buf[128]; - FUNC_ENTER(H5O_mtime_debug, FAIL); + FUNC_ENTER_NOAPI(H5O_mtime_debug, FAIL); /* check args */ assert(f); diff --git a/src/H5Oname.c b/src/H5Oname.c index 916b0a9..cd39d24 100644 --- a/src/H5Oname.c +++ b/src/H5Oname.c @@ -75,7 +75,7 @@ H5O_name_decode(H5F_t UNUSED *f, const uint8_t *p, { H5O_name_t *mesg; - FUNC_ENTER(H5O_name_decode, NULL); + FUNC_ENTER_NOAPI(H5O_name_decode, NULL); /* check args */ assert(f); @@ -114,7 +114,7 @@ H5O_name_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg) { const H5O_name_t *mesg = (const H5O_name_t *) _mesg; - FUNC_ENTER(H5O_name_encode, FAIL); + FUNC_ENTER_NOAPI(H5O_name_encode, FAIL); /* check args */ assert(f); @@ -150,7 +150,7 @@ H5O_name_copy(const void *_mesg, void *_dest) const H5O_name_t *mesg = (const H5O_name_t *) _mesg; H5O_name_t *dest = (H5O_name_t *) _dest; - FUNC_ENTER(H5O_name_copy, NULL); + FUNC_ENTER_NOAPI(H5O_name_copy, NULL); /* check args */ assert(mesg); @@ -192,7 +192,7 @@ H5O_name_size(H5F_t UNUSED *f, const void *_mesg) const H5O_name_t *mesg = (const H5O_name_t *) _mesg; size_t size; - FUNC_ENTER(H5O_name_size, 0); + FUNC_ENTER_NOAPI(H5O_name_size, 0); /* check args */ assert(f); @@ -223,7 +223,7 @@ H5O_name_reset(void *_mesg) { H5O_name_t *mesg = (H5O_name_t *) _mesg; - FUNC_ENTER(H5O_name_reset, FAIL); + FUNC_ENTER_NOAPI(H5O_name_reset, FAIL); /* check args */ assert(mesg); @@ -255,7 +255,7 @@ H5O_name_debug(H5F_t UNUSED *f, const void *_mesg, FILE *stream, { const H5O_name_t *mesg = (const H5O_name_t *)_mesg; - FUNC_ENTER(H5O_name_debug, FAIL); + FUNC_ENTER_NOAPI(H5O_name_debug, FAIL); /* check args */ assert(f); diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c index 10ed482..b1244af 100644 --- a/src/H5Osdspace.c +++ b/src/H5Osdspace.c @@ -96,7 +96,7 @@ H5O_sdspace_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh) unsigned u; /* local counting variable */ unsigned flags, version; - FUNC_ENTER(H5O_sdspace_decode, NULL); + FUNC_ENTER_NOAPI(H5O_sdspace_decode, NULL); /* check args */ assert(f); @@ -186,7 +186,7 @@ H5O_sdspace_encode(H5F_t *f, uint8_t *p, const void *mesg) unsigned u; /* Local counting variable */ unsigned flags = 0; - FUNC_ENTER(H5O_sdspace_encode, FAIL); + FUNC_ENTER_NOAPI(H5O_sdspace_encode, FAIL); /* check args */ assert(f); @@ -249,7 +249,7 @@ H5O_sdspace_copy(const void *mesg, void *dest) const H5S_simple_t *src = (const H5S_simple_t *) mesg; H5S_simple_t *dst = (H5S_simple_t *) dest; - FUNC_ENTER(H5O_sdspace_copy, NULL); + FUNC_ENTER_NOAPI(H5O_sdspace_copy, NULL); /* check args */ assert(src); @@ -319,7 +319,7 @@ H5O_sdspace_size(H5F_t *f, const void *mesg) */ size_t ret_value = 8; - FUNC_ENTER(H5O_sdspace_size, 0); + FUNC_ENTER_NOAPI(H5O_sdspace_size, 0); /* add in the dimension sizes */ ret_value += space->rank * H5F_SIZEOF_SIZE (f); @@ -356,7 +356,7 @@ H5O_sdspace_reset(void *_mesg) { H5S_simple_t *mesg = (H5S_simple_t*)_mesg; - FUNC_ENTER (H5O_sdspace_reset, FAIL); + FUNC_ENTER_NOAPI(H5O_sdspace_reset, FAIL); H5S_release_simple(mesg); @@ -381,7 +381,7 @@ H5O_sdspace_reset(void *_mesg) static herr_t H5O_sdspace_free (void *mesg) { - FUNC_ENTER (H5O_sdspace_free, FAIL); + FUNC_ENTER_NOAPI(H5O_sdspace_free, FAIL); assert (mesg); @@ -415,7 +415,7 @@ H5O_sdspace_debug(H5F_t UNUSED *f, const void *mesg, const H5S_simple_t *sdim = (const H5S_simple_t *) mesg; unsigned u; /* local counting variable */ - FUNC_ENTER(H5O_sdspace_debug, FAIL); + FUNC_ENTER_NOAPI(H5O_sdspace_debug, FAIL); /* check args */ assert(f); diff --git a/src/H5Oshared.c b/src/H5Oshared.c index 1b8b423..d012149 100644 --- a/src/H5Oshared.c +++ b/src/H5Oshared.c @@ -71,7 +71,7 @@ H5O_shared_decode (H5F_t *f, const uint8_t *buf, H5O_shared_t UNUSED *sh) H5O_shared_t *mesg; unsigned flags, version; - FUNC_ENTER (H5O_shared_decode, NULL); + FUNC_ENTER_NOAPI(H5O_shared_decode, NULL); /* Check args */ assert (f); @@ -132,7 +132,7 @@ H5O_shared_encode (H5F_t *f, uint8_t *buf/*out*/, const void *_mesg) const H5O_shared_t *mesg = (const H5O_shared_t *)_mesg; unsigned flags; - FUNC_ENTER (H5O_shared_encode, FAIL); + FUNC_ENTER_NOAPI(H5O_shared_encode, FAIL); /* Check args */ assert (f); @@ -182,7 +182,7 @@ H5O_shared_size (H5F_t *f, const void UNUSED *_mesg) { size_t size; - FUNC_ENTER (H5O_shared_size, 0); + FUNC_ENTER_NOAPI(H5O_shared_size, 0); size = 1 + /*the flags field */ 7 + /*reserved */ @@ -213,7 +213,7 @@ H5O_shared_debug (H5F_t UNUSED *f, const void *_mesg, { const H5O_shared_t *mesg = (const H5O_shared_t *)_mesg; - FUNC_ENTER (H5O_shared_debug, FAIL); + FUNC_ENTER_NOAPI(H5O_shared_debug, FAIL); /* Check args */ assert (f); diff --git a/src/H5Ostab.c b/src/H5Ostab.c index cec6c6f..76aef3b 100644 --- a/src/H5Ostab.c +++ b/src/H5Ostab.c @@ -79,7 +79,7 @@ H5O_stab_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh) { H5O_stab_t *stab; - FUNC_ENTER(H5O_stab_decode, NULL); + FUNC_ENTER_NOAPI(H5O_stab_decode, NULL); /* check args */ assert(f); @@ -117,7 +117,7 @@ H5O_stab_encode(H5F_t *f, uint8_t *p, const void *_mesg) { const H5O_stab_t *stab = (const H5O_stab_t *) _mesg; - FUNC_ENTER(H5O_stab_encode, FAIL); + FUNC_ENTER_NOAPI(H5O_stab_encode, FAIL); /* check args */ assert(f); @@ -155,7 +155,7 @@ H5O_stab_fast(const H5G_cache_t *cache, const H5O_class_t *type, void *_mesg) { H5O_stab_t *stab = NULL; - FUNC_ENTER(H5O_stab_fast, NULL); + FUNC_ENTER_NOAPI(H5O_stab_fast, NULL); /* check args */ assert(cache); @@ -198,7 +198,7 @@ H5O_stab_copy(const void *_mesg, void *_dest) const H5O_stab_t *stab = (const H5O_stab_t *) _mesg; H5O_stab_t *dest = (H5O_stab_t *) _dest; - FUNC_ENTER(H5O_stab_copy, NULL); + FUNC_ENTER_NOAPI(H5O_stab_copy, NULL); /* check args */ assert(stab); @@ -235,7 +235,7 @@ H5O_stab_copy(const void *_mesg, void *_dest) static size_t H5O_stab_size(H5F_t *f, const void UNUSED *_mesg) { - FUNC_ENTER(H5O_stab_size, 0); + FUNC_ENTER_NOAPI(H5O_stab_size, 0); FUNC_LEAVE(2 * H5F_SIZEOF_ADDR(f)); } @@ -257,7 +257,7 @@ H5O_stab_size(H5F_t *f, const void UNUSED *_mesg) static herr_t H5O_stab_free (void *mesg) { - FUNC_ENTER (H5O_stab_free, FAIL); + FUNC_ENTER_NOAPI(H5O_stab_free, FAIL); assert (mesg); @@ -288,7 +288,7 @@ H5O_stab_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream, { const H5O_stab_t *stab = (const H5O_stab_t *) _mesg; - FUNC_ENTER(H5O_stab_debug, FAIL); + FUNC_ENTER_NOAPI(H5O_stab_debug, FAIL); /* check args */ assert(f); @@ -92,7 +92,7 @@ static herr_t H5P_free_prop(H5P_genprop_t *prop); herr_t H5P_init(void) { - FUNC_ENTER(H5P_init, FAIL); + FUNC_ENTER_NOAPI(H5P_init, FAIL); /* FUNC_ENTER() does all the work */ FUNC_LEAVE(SUCCEED); } @@ -436,7 +436,7 @@ hid_t H5P_copy_plist(H5P_genplist_t *old_plist) unsigned u; /* Local index variable */ hid_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5P_copy_plist, FAIL); + FUNC_ENTER_NOAPI(H5P_copy_plist, FAIL); assert(old_plist); @@ -543,7 +543,7 @@ hid_t H5Pcopy(hid_t id) void *obj; /* Property object to copy */ hid_t ret_value=FALSE; /* return value */ - FUNC_ENTER (H5Pcopy, FAIL); + FUNC_ENTER_API(H5Pcopy, FAIL); if (H5P_DEFAULT==id) HGOTO_DONE(H5P_DEFAULT); @@ -606,7 +606,7 @@ H5Pget_version(hid_t plist_id, int *boot/*out*/, int *freelist/*out*/, H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER(H5Pget_version, FAIL); + FUNC_ENTER_API(H5Pget_version, FAIL); H5TRACE5("e","ixxxx",plist_id,boot,freelist,stab,shhdr); /* Check arguments */ @@ -668,7 +668,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(H5Pset_userblock, FAIL); + FUNC_ENTER_API(H5Pset_userblock, FAIL); H5TRACE2("e","ih",plist_id,size); /* Check arguments */ @@ -724,7 +724,7 @@ H5Pget_userblock(hid_t plist_id, hsize_t *size) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER(H5Pget_userblock, FAIL); + FUNC_ENTER_API(H5Pget_userblock, FAIL); H5TRACE2("e","i*h",plist_id,size); /* Check args */ @@ -781,7 +781,7 @@ 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 */ - FUNC_ENTER (H5Pset_alignment, FAIL); + FUNC_ENTER_API(H5Pset_alignment, FAIL); H5TRACE3("e","ihh",fapl_id,threshold,alignment); /* Check args */ @@ -833,7 +833,7 @@ H5Pget_alignment(hid_t fapl_id, hsize_t *threshold/*out*/, H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Pget_alignment, FAIL); + FUNC_ENTER_API(H5Pget_alignment, FAIL); H5TRACE3("e","ixx",fapl_id,threshold,alignment); /* Check args */ @@ -882,7 +882,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(H5Pset_sizes, FAIL); + FUNC_ENTER_API(H5Pset_sizes, FAIL); H5TRACE3("e","izz",plist_id,sizeof_addr,sizeof_size); /* Check arguments */ @@ -942,7 +942,7 @@ H5Pget_sizes(hid_t plist_id, H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER(H5Pget_sizes, FAIL); + FUNC_ENTER_API(H5Pget_sizes, FAIL); H5TRACE3("e","ixx",plist_id,sizeof_addr,sizeof_size); /* Check args */ @@ -1004,7 +1004,7 @@ H5Pset_sym_k(hid_t plist_id, int ik, int lk) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER(H5Pset_sym_k, FAIL); + FUNC_ENTER_API(H5Pset_sym_k, FAIL); H5TRACE3("e","iIsIs",plist_id,ik,lk); /* Check arguments */ @@ -1062,7 +1062,7 @@ H5Pget_sym_k(hid_t plist_id, int *ik /*out */ , int *lk /*out */ ) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER(H5Pget_sym_k, FAIL); + FUNC_ENTER_API(H5Pget_sym_k, FAIL); H5TRACE3("e","ixx",plist_id,ik,lk); /* Check arguments */ @@ -1128,7 +1128,7 @@ H5Pset_sym_k(hid_t plist_id, int ik, unsigned lk) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER(H5Pset_sym_k, FAIL); + FUNC_ENTER_API(H5Pset_sym_k, FAIL); H5TRACE3("e","iIsIu",plist_id,ik,lk); /* Check arguments */ @@ -1186,7 +1186,7 @@ H5Pget_sym_k(hid_t plist_id, int *ik /*out */ , unsigned *lk /*out */ ) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER(H5Pget_sym_k, FAIL); + FUNC_ENTER_API(H5Pget_sym_k, FAIL); H5TRACE3("e","ixx",plist_id,ik,lk); /* Check arguments */ @@ -1242,7 +1242,7 @@ H5Pset_istore_k(hid_t plist_id, int ik) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER(H5Pset_istore_k, FAIL); + FUNC_ENTER_API(H5Pset_istore_k, FAIL); H5TRACE2("e","iIs",plist_id,ik); /* Check arguments */ @@ -1298,7 +1298,7 @@ H5Pget_istore_k(hid_t plist_id, int *ik /*out */ ) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER(H5Pget_istore_k, FAIL); + FUNC_ENTER_API(H5Pget_istore_k, FAIL); H5TRACE2("e","ix",plist_id,ik); /* Check arguments */ @@ -1346,7 +1346,7 @@ H5Pset_layout(hid_t plist_id, H5D_layout_t layout) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER(H5Pset_layout, FAIL); + FUNC_ENTER_API(H5Pset_layout, FAIL); H5TRACE2("e","iDl",plist_id,layout); /* Check arguments */ @@ -1395,7 +1395,7 @@ H5Pget_layout(hid_t plist_id) H5P_genplist_t *plist; /* Property list pointer */ H5D_layout_t ret_value=H5D_LAYOUT_ERROR; - FUNC_ENTER(H5Pget_layout, H5D_LAYOUT_ERROR); + FUNC_ENTER_API(H5Pget_layout, H5D_LAYOUT_ERROR); H5TRACE1("Dl","i",plist_id); /* Check arguments */ @@ -1448,7 +1448,7 @@ H5Pset_chunk(hid_t plist_id, int ndims, const hsize_t dim[/*ndims*/]) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER(H5Pset_chunk, FAIL); + FUNC_ENTER_API(H5Pset_chunk, FAIL); H5TRACE3("e","iIs*[a1]h",plist_id,ndims,dim); /* Check arguments */ @@ -1520,7 +1520,7 @@ H5Pget_chunk(hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/) H5P_genplist_t *plist; /* Property list pointer */ int ret_value; - FUNC_ENTER(H5Pget_chunk, FAIL); + FUNC_ENTER_API(H5Pget_chunk, FAIL); H5TRACE3("Is","iIsx",plist_id,max_ndims,dim); /* Check arguments */ @@ -1592,7 +1592,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=FAIL; /* return value */ - FUNC_ENTER(H5Pset_external, FAIL); + FUNC_ENTER_API(H5Pset_external, FAIL); H5TRACE4("e","isoh",plist_id,name,offset,size); /* Check arguments */ @@ -1679,7 +1679,7 @@ H5Pget_external_count(hid_t plist_id) H5P_genplist_t *plist; /* Property list pointer */ int ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Pget_external_count, FAIL); + FUNC_ENTER_API(H5Pget_external_count, FAIL); H5TRACE1("Is","i",plist_id); /* Check arguments */ @@ -1741,7 +1741,7 @@ H5Pget_external(hid_t plist_id, int idx, size_t name_size, char *name/*out*/, H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Pget_external, FAIL); + FUNC_ENTER_API(H5Pget_external, FAIL); H5TRACE6("e","iIszxxx",plist_id,idx,name_size,name,offset,size); /* Check arguments */ @@ -1807,7 +1807,7 @@ H5P_set_driver(H5P_genplist_t *plist, hid_t new_driver_id, const void *new_drive void *tmp_driver_info; /* Temporary VFL driver info */ herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER(H5P_set_driver, FAIL); + FUNC_ENTER_NOAPI(H5P_set_driver, FAIL); if (H5I_VFL!=H5I_get_type(new_driver_id) || NULL==H5I_object(new_driver_id)) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file driver ID"); @@ -1907,7 +1907,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(H5Pset_driver, FAIL); + FUNC_ENTER_API(H5Pset_driver, FAIL); H5TRACE3("e","iix",plist_id,new_driver_id,new_driver_info); /* Check arguments */ @@ -1963,7 +1963,7 @@ H5P_get_driver(H5P_genplist_t *plist) { hid_t ret_value=-1; - FUNC_ENTER (H5P_get_driver, FAIL); + FUNC_ENTER_NOAPI(H5P_get_driver, FAIL); /* Get the current driver ID */ if(TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS) ) { @@ -2018,7 +2018,7 @@ H5Pget_driver(hid_t plist_id) H5P_genplist_t *plist; /* Property list pointer */ hid_t ret_value=-1; - FUNC_ENTER (H5Pget_driver, FAIL); + FUNC_ENTER_API(H5Pget_driver, FAIL); H5TRACE1("i","i",plist_id); if(H5I_GENPROP_LST != H5I_get_type(plist_id) || NULL == (plist = H5I_object(plist_id))) @@ -2061,7 +2061,7 @@ H5P_get_driver_info(H5P_genplist_t *plist) { void *ret_value=NULL; - FUNC_ENTER(H5P_get_driver_info, NULL); + FUNC_ENTER_NOAPI(H5P_get_driver_info, NULL); /* Get the current driver info */ if( TRUE == H5P_isa_class(plist->plist_id, H5P_FILE_ACCESS) ) { @@ -2111,7 +2111,7 @@ H5Pget_driver_info(hid_t plist_id) H5P_genplist_t *plist; /* Property list pointer */ void *ret_value=NULL; - FUNC_ENTER(H5Pget_driver_info, NULL); + FUNC_ENTER_API(H5Pget_driver_info, NULL); if(H5I_GENPROP_LST != H5I_get_type(plist_id) || NULL == (plist = H5I_object(plist_id))) HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a property list"); @@ -2160,7 +2160,7 @@ H5Pset_cache(hid_t plist_id, int mdc_nelmts, size_t rdcc_nelmts=(size_t)_rdcc_nelmts; /* Work around variable changing size */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Pset_cache, FAIL); + FUNC_ENTER_API(H5Pset_cache, FAIL); H5TRACE5("e","iIsIszd",plist_id,mdc_nelmts,_rdcc_nelmts,rdcc_nbytes, rdcc_w0); @@ -2222,7 +2222,7 @@ H5Pget_cache(hid_t plist_id, int *mdc_nelmts, size_t rdcc_nelmts; /* Work around variable changing size */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Pget_cache, FAIL); + FUNC_ENTER_API(H5Pget_cache, FAIL); H5TRACE5("e","i*Is*Is*z*d",plist_id,mdc_nelmts,_rdcc_nelmts,rdcc_nbytes, rdcc_w0); @@ -2291,7 +2291,7 @@ H5Pset_cache(hid_t plist_id, int mdc_nelmts, H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Pset_cache, FAIL); + FUNC_ENTER_API(H5Pset_cache, FAIL); H5TRACE5("e","iIszzd",plist_id,mdc_nelmts,rdcc_nelmts,rdcc_nbytes,rdcc_w0); /* Check arguments */ @@ -2351,7 +2351,7 @@ H5Pget_cache(hid_t plist_id, int *mdc_nelmts, H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Pget_cache, FAIL); + FUNC_ENTER_API(H5Pget_cache, FAIL); H5TRACE5("e","i*Is*z*z*d",plist_id,mdc_nelmts,rdcc_nelmts,rdcc_nbytes, rdcc_w0); @@ -2414,7 +2414,7 @@ H5Pset_buffer(hid_t plist_id, hsize_t _size, void *tconv, void *bkg) size_t size=(size_t)_size; /* Work around size difference */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Pset_buffer, FAIL); + FUNC_ENTER_API(H5Pset_buffer, FAIL); H5TRACE4("e","ihxx",plist_id,_size,tconv,bkg); /* Check arguments */ @@ -2463,7 +2463,7 @@ H5Pget_buffer(hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/) size_t size; /* Type conversion buffer size */ hsize_t ret_value=0; /* Type conversion buffer size */ - FUNC_ENTER (H5Pget_buffer, 0); + FUNC_ENTER_API(H5Pget_buffer, 0); H5TRACE3("h","ixx",plist_id,tconv,bkg); /* Check arguments */ @@ -2524,7 +2524,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 (H5Pset_buffer, FAIL); + FUNC_ENTER_API(H5Pset_buffer, FAIL); H5TRACE4("e","izxx",plist_id,size,tconv,bkg); /* Check arguments */ @@ -2573,7 +2573,7 @@ H5Pget_buffer(hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/) size_t size; /* Type conversion buffer size */ size_t ret_value=0; /* Type conversion buffer size */ - FUNC_ENTER (H5Pget_buffer, 0); + FUNC_ENTER_API(H5Pget_buffer, 0); H5TRACE3("z","ixx",plist_id,tconv,bkg); /* Check arguments */ @@ -2636,7 +2636,7 @@ H5Pset_hyper_cache(hid_t plist_id, unsigned cache, unsigned limit) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=SUCCEED; - FUNC_ENTER (H5Pset_hyper_cache, FAIL); + FUNC_ENTER_API(H5Pset_hyper_cache, FAIL); H5TRACE3("e","iIuIu",plist_id,cache,limit); /* Check arguments */ @@ -2680,7 +2680,7 @@ H5Pget_hyper_cache(hid_t plist_id, unsigned *cache/*out*/, H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Pget_hyper_cache, FAIL); + FUNC_ENTER_API(H5Pget_hyper_cache, FAIL); H5TRACE3("e","ixx",plist_id,cache,limit); /* Check arguments */ @@ -2730,7 +2730,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 (H5Pset_preserve, FAIL); + FUNC_ENTER_API(H5Pset_preserve, FAIL); H5TRACE2("e","ib",plist_id,status); /* Check arguments */ @@ -2774,7 +2774,7 @@ H5Pget_preserve(hid_t plist_id) H5P_genplist_t *plist; /* Property list pointer */ int ret_value; /* return value */ - FUNC_ENTER (H5Pget_preserve, FAIL); + FUNC_ENTER_API(H5Pget_preserve, FAIL); H5TRACE1("Is","i",plist_id); /* Check arguments */ @@ -2846,7 +2846,7 @@ H5Pset_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags, H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Pset_filter, FAIL); + FUNC_ENTER_API(H5Pset_filter, FAIL); H5TRACE5("e","iZfIuz*[a3]Iu",plist_id,filter,flags,cd_nelmts,cd_values); /* Check arguments */ @@ -2909,7 +2909,7 @@ H5Pget_nfilters(hid_t plist_id) H5P_genplist_t *plist; /* Property list pointer */ int ret_value; /* return value */ - FUNC_ENTER(H5Pget_nfilters, FAIL); + FUNC_ENTER_API(H5Pget_nfilters, FAIL); H5TRACE1("Is","i",plist_id); /* Check args */ @@ -2972,7 +2972,7 @@ H5Pget_filter(hid_t plist_id, int idx, unsigned int *flags/*out*/, H5P_genplist_t *plist; /* Property list pointer */ H5Z_filter_t ret_value; /* return value */ - FUNC_ENTER (H5Pget_filter, H5Z_FILTER_ERROR); + FUNC_ENTER_API(H5Pget_filter, H5Z_FILTER_ERROR); H5TRACE7("Zf","iIsx*zxzx",plist_id,idx,flags,cd_nelmts,cd_values,namelen, name); @@ -3075,7 +3075,7 @@ H5Pset_deflate(hid_t plist_id, unsigned level) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Pset_deflate, FAIL); + FUNC_ENTER_API(H5Pset_deflate, FAIL); H5TRACE2("e","iIu",plist_id,level); /* Check arguments */ @@ -3126,7 +3126,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(H5Pget_btree_ratios, FAIL); + FUNC_ENTER_API(H5Pget_btree_ratios, FAIL); H5TRACE4("e","ixxx",plist_id,left,middle,right); /* Check arguments */ @@ -3184,7 +3184,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(H5Pset_btree_ratios, FAIL); + FUNC_ENTER_API(H5Pset_btree_ratios, FAIL); H5TRACE4("e","iddd",plist_id,left,middle,right); /* Check arguments */ @@ -3245,7 +3245,7 @@ H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER(H5Pset_fill_value, FAIL); + FUNC_ENTER_API(H5Pset_fill_value, FAIL); H5TRACE3("e","iix",plist_id,type_id,value); /* Check arguments */ @@ -3326,7 +3326,7 @@ H5Pget_fill_value(hid_t plist_id, hid_t type_id, void *value/*out*/) herr_t ret_value = FAIL; /*return value */ H5P_genplist_t *plist; /* Property list pointer */ - FUNC_ENTER(H5Pget_fill_value, FAIL); + FUNC_ENTER_API(H5Pget_fill_value, FAIL); H5TRACE3("e","iix",plist_id,type_id,value); /* Check arguments */ @@ -3422,7 +3422,7 @@ H5P_fill_value_defined(H5P_genplist_t *plist, H5D_fill_value_t *status) herr_t ret_value = SUCCEED; H5O_fill_t fill; - FUNC_ENTER(H5P_fill_value_defined, FAIL); + FUNC_ENTER_NOAPI(H5P_fill_value_defined, FAIL); assert(plist); assert(status); @@ -3474,7 +3474,7 @@ H5Pfill_value_defined(hid_t plist_id, H5D_fill_value_t *status) H5P_genplist_t *plist; herr_t ret_value = SUCCEED; - FUNC_ENTER(H5Pfill_value_defined, FAIL); + FUNC_ENTER_API(H5Pfill_value_defined, FAIL); H5TRACE2("e","i*Df",plist_id,status); assert(status); @@ -3518,7 +3518,7 @@ H5Pset_space_time(hid_t plist_id, H5D_space_time_t alloc_time) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value = SUCCEED; /* return value */ - FUNC_ENTER(H5Pset_space_time, FAIL); + FUNC_ENTER_API(H5Pset_space_time, FAIL); H5TRACE2("e","iDs",plist_id,alloc_time); /* Check args */ @@ -3560,7 +3560,7 @@ H5Pget_space_time(hid_t plist_id, H5D_space_time_t *alloc_time/*out*/) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value = SUCCEED; /* return value */ - FUNC_ENTER(H5Pget_space_time, FAIL); + FUNC_ENTER_API(H5Pget_space_time, FAIL); H5TRACE2("e","ix",plist_id,alloc_time); /* Check args */ @@ -3602,7 +3602,7 @@ H5Pset_fill_time(hid_t plist_id, H5D_fill_time_t fill_time) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value = SUCCEED; /* return value */ - FUNC_ENTER(H5Pset_fill_time, FAIL); + FUNC_ENTER_API(H5Pset_fill_time, FAIL); /* Check args */ if(TRUE != H5P_isa_class(plist_id, H5P_DATASET_CREATE)) @@ -3642,7 +3642,7 @@ H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t *fill_time/*out*/) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value = SUCCEED; /* return value */ - FUNC_ENTER(H5Pget_fill_time, FAIL); + FUNC_ENTER_API(H5Pget_fill_time, FAIL); H5TRACE2("e","ix",plist_id,fill_time); /* Check args */ @@ -3700,7 +3700,7 @@ H5Pset_gc_references(hid_t plist_id, unsigned gc_ref) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER(H5Pset_gc_references, FAIL); + FUNC_ENTER_API(H5Pset_gc_references, FAIL); H5TRACE2("e","iIu",plist_id,gc_ref); /* Check args */ @@ -3746,7 +3746,7 @@ 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 */ - FUNC_ENTER(H5Pget_gc_references, FAIL); + FUNC_ENTER_API(H5Pget_gc_references, FAIL); H5TRACE2("e","ix",plist_id,gc_ref); /* Check args */ @@ -3789,7 +3789,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(H5Pset_fclose_degree, FAIL); + FUNC_ENTER_API(H5Pset_fclose_degree, FAIL); H5TRACE2("e","iFc",plist_id,degree); /* Check args */ @@ -3828,7 +3828,7 @@ herr_t 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(H5Pget_fclose_degree, FAIL); + FUNC_ENTER_API(H5Pget_fclose_degree, FAIL); /* Check args */ if(TRUE != H5P_isa_class(plist_id, H5P_FILE_ACCESS)) @@ -3873,7 +3873,7 @@ H5P_set_vlen_mem_manager(H5P_genplist_t *plist, H5MM_allocate_t alloc_func, { herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER(H5P_set_vlen_mem_manager, FAIL); + FUNC_ENTER_NOAPI(H5P_set_vlen_mem_manager, FAIL); assert(plist); @@ -3920,7 +3920,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(H5Pset_vlen_mem_manager, FAIL); + FUNC_ENTER_API(H5Pset_vlen_mem_manager, FAIL); H5TRACE5("e","ixxxx",plist_id,alloc_func,alloc_info,free_func,free_info); /* Check arguments */ @@ -3959,7 +3959,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(H5Pget_vlen_mem_manager, FAIL); + FUNC_ENTER_API(H5Pget_vlen_mem_manager, FAIL); H5TRACE5("e","ixxxx",plist_id,alloc_func,alloc_info,free_func,free_info); /* Check arguments */ @@ -4025,7 +4025,7 @@ H5Pset_meta_block_size(hid_t plist_id, hsize_t _size) size_t size=(size_t)_size; /* Work around parameter size difference */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Pset_meta_block_size, FAIL); + FUNC_ENTER_API(H5Pset_meta_block_size, FAIL); H5TRACE2("e","ih",plist_id,_size); /* Check args */ @@ -4072,7 +4072,7 @@ H5Pget_meta_block_size(hid_t plist_id, hsize_t *_size/*out*/) size_t size; /* Work around parameter size difference */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Pget_meta_block_size, FAIL); + FUNC_ENTER_API(H5Pget_meta_block_size, FAIL); H5TRACE2("e","ix",plist_id,_size); /* Check args */ @@ -4130,7 +4130,7 @@ H5Pset_meta_block_size(hid_t plist_id, size_t size) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Pset_meta_block_size, FAIL); + FUNC_ENTER_API(H5Pset_meta_block_size, FAIL); H5TRACE2("e","iz",plist_id,size); /* Check args */ @@ -4176,7 +4176,7 @@ H5Pget_meta_block_size(hid_t plist_id, size_t *size/*out*/) H5P_genplist_t *plist; /* Property list pointer */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Pget_meta_block_size, FAIL); + FUNC_ENTER_API(H5Pget_meta_block_size, FAIL); H5TRACE2("e","ix",plist_id,size); /* Check args */ @@ -4235,7 +4235,7 @@ H5Pset_sieve_buf_size(hid_t plist_id, hsize_t _size) size_t size=(size_t)_size; /* Work around size difference */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Pset_sieve_buf_size, FAIL); + FUNC_ENTER_API(H5Pset_sieve_buf_size, FAIL); H5TRACE2("e","ih",plist_id,_size); /* Check args */ @@ -4282,7 +4282,7 @@ H5Pget_sieve_buf_size(hid_t plist_id, hsize_t *_size/*out*/) size_t size; /* Work around size difference */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Pget_sieve_buf_size, FAIL); + FUNC_ENTER_API(H5Pget_sieve_buf_size, FAIL); H5TRACE2("e","ix",plist_id,_size); /* Check args */ @@ -4340,7 +4340,7 @@ 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 */ - FUNC_ENTER (H5Pset_sieve_buf_size, FAIL); + FUNC_ENTER_API(H5Pset_sieve_buf_size, FAIL); H5TRACE2("e","iz",plist_id,size); /* Check args */ @@ -4386,7 +4386,7 @@ 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 */ - FUNC_ENTER (H5Pget_sieve_buf_size, FAIL); + FUNC_ENTER_API(H5Pget_sieve_buf_size, FAIL); H5TRACE2("e","ix",plist_id,size); /* Check args */ @@ -4437,7 +4437,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 (H5Pset_hyper_vector_size, FAIL); + FUNC_ENTER_API(H5Pset_hyper_vector_size, FAIL); H5TRACE2("e","iz",plist_id,vector_size); /* Check arguments */ @@ -4479,7 +4479,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 (H5Pget_hyper_vector_size, FAIL); + FUNC_ENTER_API(H5Pget_hyper_vector_size, FAIL); H5TRACE2("e","ix",plist_id,vector_size); /* Check arguments */ @@ -5107,7 +5107,7 @@ H5Pcreate_class(hid_t parent, const char *name, unsigned hashsize, H5P_genclass_t *pclass = NULL; /* Property list class created */ hid_t ret_value = FAIL; /* Return value */ - FUNC_ENTER(H5Pcreate_class, FAIL); + FUNC_ENTER_API(H5Pcreate_class, FAIL); H5TRACE9("i","isIuxxxxxx",parent,name,hashsize,cls_create,create_data, cls_copy,copy_data,cls_close,close_data); @@ -5304,7 +5304,7 @@ hid_t H5P_create_id(H5P_genclass_t *pclass) hid_t plist_id=FAIL; /* Property list ID */ hid_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5P_create_id, FAIL); + FUNC_ENTER_NOAPI(H5P_create_id, FAIL); assert(pclass); @@ -5369,7 +5369,7 @@ hid_t H5Pcreate(hid_t cls_id) H5P_genclass_t *pclass; /* Property list class to modify */ hid_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Pcreate, FAIL); + FUNC_ENTER_API(H5Pcreate, FAIL); /* Check arguments. */ if (H5I_GENPROP_CLS != H5I_get_type(cls_id) || NULL == (pclass = H5I_object(cls_id))) @@ -5526,7 +5526,7 @@ herr_t H5P_register(H5P_genclass_t *pclass, const char *name, size_t size, unsigned u; /* Local index variable */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5P_register, FAIL); + FUNC_ENTER_NOAPI(H5P_register, FAIL); assert(pclass); assert(name); @@ -5736,7 +5736,7 @@ herr_t H5Pregister(hid_t cls_id, const char *name, size_t size, void *def_value, H5P_genclass_t *pclass; /* Property list class to modify */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Pregister, FAIL); + FUNC_ENTER_API(H5Pregister, FAIL); /* Check arguments. */ if (H5I_GENPROP_CLS != H5I_get_type(cls_id) || NULL == (pclass = H5I_object(cls_id))) @@ -6023,7 +6023,7 @@ herr_t H5Pinsert(hid_t plist_id, const char *name, size_t size, void *value, H5P_genplist_t *plist; /* Property list to modify */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Pinsert, FAIL); + FUNC_ENTER_API(H5Pinsert, FAIL); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(plist_id) || NULL == (plist = H5I_object(plist_id))) @@ -6078,7 +6078,7 @@ herr_t H5P_set(H5P_genplist_t *plist, const char *name, const void *value) H5P_genprop_t *prop; /* Temporary property pointer */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5P_set, FAIL); + FUNC_ENTER_NOAPI(H5P_set, FAIL); assert(plist); assert(name); @@ -6159,7 +6159,7 @@ herr_t 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 (H5Pset, FAIL); + FUNC_ENTER_API(H5Pset, FAIL); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(plist_id) || NULL == (plist = H5I_object(plist_id))) @@ -6288,7 +6288,7 @@ htri_t H5Pexist(hid_t id, const char *name) H5P_genclass_t *pclass; /* Property class to query */ htri_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Pexist, FAIL); + FUNC_ENTER_API(H5Pexist, FAIL); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id)) @@ -6439,7 +6439,7 @@ herr_t H5Pget_size(hid_t id, const char *name, size_t *size) H5P_genplist_t *plist; /* Property list to query */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Pget_size, FAIL); + FUNC_ENTER_API(H5Pget_size, FAIL); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id)) @@ -6535,7 +6535,7 @@ hid_t H5Pget_class(hid_t plist_id) H5P_genclass_t *pclass=NULL; /* Property list class */ hid_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Pget_class, FAIL); + FUNC_ENTER_API(H5Pget_class, FAIL); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(plist_id) || NULL == (plist = H5I_object(plist_id))) @@ -6622,7 +6622,7 @@ herr_t H5P_get_nprops_pclass(H5P_genclass_t *pclass, size_t *nprops) { herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5P_get_nprops_pclass, FAIL); + FUNC_ENTER_NOAPI(H5P_get_nprops_pclass, FAIL); assert(pclass); assert(nprops); @@ -6663,7 +6663,7 @@ herr_t 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 (H5Pget_nprops, FAIL); + FUNC_ENTER_API(H5Pget_nprops, FAIL); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id)) @@ -6997,7 +6997,7 @@ htri_t H5Pequal(hid_t id1, hid_t id2) void *obj1, *obj2; /* Property objects to compare */ htri_t ret_value=FALSE; /* return value */ - FUNC_ENTER (H5Pequal, FAIL); + FUNC_ENTER_API(H5Pequal, FAIL); /* Check arguments. */ if ((H5I_GENPROP_LST != H5I_get_type(id1) && H5I_GENPROP_CLS != H5I_get_type(id1)) @@ -7107,7 +7107,7 @@ htri_t H5P_isa_class(hid_t plist_id, hid_t pclass_id) H5P_genclass_t *pclass; /* Property list class */ htri_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5P_isa_class, FAIL); + FUNC_ENTER_NOAPI(H5P_isa_class, FAIL); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(plist_id) || NULL == (plist = H5I_object(plist_id))) @@ -7151,7 +7151,7 @@ htri_t H5Pisa_class(hid_t plist_id, hid_t pclass_id) { htri_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Pisa_class, FAIL); + FUNC_ENTER_API(H5Pisa_class, FAIL); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(plist_id)) @@ -7467,7 +7467,7 @@ int 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=FAIL; /* return value */ - FUNC_ENTER (H5Piterate, FAIL); + FUNC_ENTER_API(H5Piterate, FAIL); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(id) && H5I_GENPROP_CLS != H5I_get_type(id)) @@ -7525,7 +7525,7 @@ unsigned H5P_peek_unsigned(H5P_genplist_t *plist, const char *name) { unsigned ret_value; /* return value */ - FUNC_ENTER (H5P_peek_unsigned, UFAIL); + FUNC_ENTER_NOAPI(H5P_peek_unsigned, UFAIL); assert(plist); assert(name); @@ -7568,7 +7568,7 @@ hid_t H5P_peek_hid_t(H5P_genplist_t *plist, const char *name) { hid_t ret_value; /* return value */ - FUNC_ENTER (H5P_peek_hid_t, FAIL); + FUNC_ENTER_NOAPI(H5P_peek_hid_t, FAIL); assert(plist); assert(name); @@ -7611,7 +7611,7 @@ void *H5P_peek_voidp(H5P_genplist_t *plist, const char *name) { void * ret_value; /* return value */ - FUNC_ENTER (H5P_peek_voidp_t, NULL); + FUNC_ENTER_NOAPI(H5P_peek_voidp_t, NULL); assert(plist); assert(name); @@ -7654,7 +7654,7 @@ hsize_t H5P_peek_hsize_t(H5P_genplist_t *plist, const char *name) { hsize_t ret_value; /* return value */ - FUNC_ENTER (H5P_peek_hsize_t, UFAIL); + FUNC_ENTER_NOAPI(H5P_peek_hsize_t, UFAIL); assert(plist); assert(name); @@ -7697,7 +7697,7 @@ size_t H5P_peek_size_t(H5P_genplist_t *plist, const char *name) { size_t ret_value; /* return value */ - FUNC_ENTER (H5P_peek_size_t, UFAIL); + FUNC_ENTER_NOAPI(H5P_peek_size_t, UFAIL); assert(plist); assert(name); @@ -7742,7 +7742,7 @@ herr_t H5P_get(H5P_genplist_t *plist, const char *name, void *value) H5P_genprop_t *prop; /* Temporary property pointer */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5P_get, FAIL); + FUNC_ENTER_NOAPI(H5P_get, FAIL); assert(plist); assert(name); @@ -7820,7 +7820,7 @@ herr_t 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 (H5Pget, FAIL); + FUNC_ENTER_API(H5Pget, FAIL); /* Check arguments. */ if(H5I_GENPROP_LST != H5I_get_type(plist_id) || NULL == (plist = H5I_object(plist_id))) @@ -7965,7 +7965,7 @@ herr_t H5Premove(hid_t plist_id, const char *name) H5P_genplist_t *plist; /* Property list to modify */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Premove, FAIL); + FUNC_ENTER_API(H5Premove, FAIL); /* Check arguments. */ if (H5I_GENPROP_LST != H5I_get_type(plist_id) || NULL == (plist = H5I_object(plist_id))) @@ -8200,7 +8200,7 @@ H5Pcopy_prop(hid_t dst_id, hid_t src_id, const char *name) void *src_obj, *dst_obj; /* Property objects to copy between */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Pcopy_prop, FAIL); + FUNC_ENTER_API(H5Pcopy_prop, FAIL); H5TRACE3("e","iis",dst_id,src_id,name); /* Check arguments. */ @@ -8338,7 +8338,7 @@ herr_t H5Punregister(hid_t pclass_id, const char *name) H5P_genclass_t *pclass; /* Property list class to modify */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Punregister, FAIL); + FUNC_ENTER_API(H5Punregister, FAIL); /* Check arguments. */ if (H5I_GENPROP_CLS != H5I_get_type(pclass_id) || NULL == (pclass = H5I_object(pclass_id))) @@ -8436,7 +8436,7 @@ herr_t H5Pclose(hid_t plist_id) H5P_genplist_t *plist; /* Property list created */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Pclose, FAIL); + FUNC_ENTER_API(H5Pclose, FAIL); if (plist_id==H5P_DEFAULT) HGOTO_DONE(SUCCEED); @@ -8482,7 +8482,7 @@ char *H5P_get_class_name(H5P_genclass_t *pclass) { char *ret_value=NULL; /* return value */ - FUNC_ENTER (H5P_get_class_name, NULL); + FUNC_ENTER_NOAPI(H5P_get_class_name, NULL); assert(pclass); @@ -8518,7 +8518,7 @@ char *H5Pget_class_name(hid_t pclass_id) H5P_genclass_t *pclass; /* Property class to query */ char *ret_value=NULL; /* return value */ - FUNC_ENTER (H5Pget_class_name, NULL); + FUNC_ENTER_API(H5Pget_class_name, NULL); /* Check arguments. */ if (H5I_GENPROP_CLS != H5I_get_type(pclass_id) || NULL == (pclass = H5I_object(pclass_id))) @@ -8593,7 +8593,7 @@ hid_t H5Pget_class_parent(hid_t pclass_id) H5P_genclass_t *parent=NULL; /* Parent's property class */ hid_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Pget_class_parent, FAIL); + FUNC_ENTER_API(H5Pget_class_parent, FAIL); /* Check arguments. */ if (H5I_GENPROP_CLS != H5I_get_type(pclass_id) || NULL == (pclass = H5I_object(pclass_id))) @@ -8697,7 +8697,7 @@ H5Pclose_class(hid_t cls_id) H5P_genclass_t *pclass; /* Property list class created */ hid_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER(H5Pclose_class, FAIL); + FUNC_ENTER_API(H5Pclose_class, FAIL); H5TRACE1("e","i",cls_id); /* Check arguments */ @@ -284,7 +284,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 = FAIL; - FUNC_ENTER(H5Rcreate, FAIL); + FUNC_ENTER_API(H5Rcreate, FAIL); H5TRACE5("e","xisRti",ref,loc_id,name,ref_type,space_id); /* Check args */ @@ -490,7 +490,7 @@ H5Rdereference(hid_t id, H5R_type_t ref_type, void *_ref) H5F_t *file=NULL; /* File object */ hid_t ret_value = FAIL; - FUNC_ENTER(H5Rdereference, FAIL); + FUNC_ENTER_API(H5Rdereference, FAIL); H5TRACE3("i","iRtx",id,ref_type,_ref); /* Check args */ @@ -630,7 +630,7 @@ H5Rget_region(hid_t id, H5R_type_t ref_type, void *_ref) H5F_t *file=NULL; /* File object */ hid_t ret_value = FAIL; - FUNC_ENTER(H5Rget_region, FAIL); + FUNC_ENTER_API(H5Rget_region, FAIL); H5TRACE3("i","iRtx",id,ref_type,_ref); /* Check args */ @@ -739,7 +739,7 @@ H5Rget_object_type(hid_t id, void *_ref) H5F_t *file=NULL; /* File object */ hid_t ret_value = H5G_UNKNOWN; - FUNC_ENTER(H5Rget_object_type, H5G_UNKNOWN); + FUNC_ENTER_API(H5Rget_object_type, H5G_UNKNOWN); H5TRACE2("Is","ix",id,_ref); /* Check args */ @@ -892,7 +892,7 @@ H5Rget_obj_type(hid_t id, H5R_type_t ref_type, void *_ref) H5F_t *file=NULL; /* File object */ hid_t ret_value = H5G_UNKNOWN; - FUNC_ENTER(H5Rget_obj_type, H5G_UNKNOWN); + FUNC_ENTER_API(H5Rget_obj_type, H5G_UNKNOWN); H5TRACE3("Is","iRtx",id,ref_type,_ref); /* Check args */ @@ -303,7 +303,7 @@ herr_t H5S_register(H5S_sel_type cls, const H5S_fconv_t *fconv, const H5S_mconv_t *mconv) { - FUNC_ENTER(H5S_register, FAIL); + FUNC_ENTER_NOAPI(H5S_register, FAIL); assert(cls>=0 && cls<H5S_SEL_N); assert(fconv); @@ -339,7 +339,7 @@ H5S_create(H5S_class_t type) { H5S_t *ret_value = NULL; - FUNC_ENTER(H5S_create, NULL); + FUNC_ENTER_NOAPI(H5S_create, NULL); /* Create a new data space */ if((ret_value = H5FL_ALLOC(H5S_t,1))!=NULL) @@ -378,7 +378,7 @@ H5Screate(H5S_class_t type) H5S_t *new_ds=NULL; hid_t ret_value = FAIL; - FUNC_ENTER(H5Screate, FAIL); + FUNC_ENTER_API(H5Screate, FAIL); H5TRACE1("i","Sc",type); /* Check args */ @@ -418,7 +418,7 @@ done: herr_t H5S_extent_release(H5S_t *ds) { - FUNC_ENTER(H5S_extent_release, FAIL); + FUNC_ENTER_NOAPI(H5S_extent_release, FAIL); assert(ds); @@ -464,7 +464,7 @@ H5S_extent_release(H5S_t *ds) herr_t H5S_close(H5S_t *ds) { - FUNC_ENTER(H5S_close, FAIL); + FUNC_ENTER_NOAPI(H5S_close, FAIL); assert(ds); @@ -503,7 +503,7 @@ H5S_close(H5S_t *ds) herr_t H5Sclose(hid_t space_id) { - FUNC_ENTER(H5Sclose, FAIL); + FUNC_ENTER_API(H5Sclose, FAIL); H5TRACE1("e","i",space_id); /* Check args */ @@ -536,7 +536,7 @@ H5Sclose(hid_t space_id) herr_t H5S_release_simple(H5S_simple_t *simple) { - FUNC_ENTER(H5S_release_simple, FAIL); + FUNC_ENTER_NOAPI(H5S_release_simple, FAIL); assert(simple); @@ -575,7 +575,7 @@ H5Scopy(hid_t space_id) H5S_t *dst = NULL; hid_t ret_value = FAIL; - FUNC_ENTER (H5Scopy, FAIL); + FUNC_ENTER_API(H5Scopy, FAIL); H5TRACE1("i","i",space_id); /* Check args */ @@ -618,7 +618,7 @@ H5Sextent_copy(hid_t dst_id,hid_t src_id) H5S_t *dst = NULL; hid_t ret_value = SUCCEED; - FUNC_ENTER (H5Scopy, FAIL); + FUNC_ENTER_API(H5Sextent_copy, FAIL); H5TRACE2("e","ii",dst_id,src_id); /* Check args */ @@ -656,7 +656,7 @@ H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src) { unsigned u; - FUNC_ENTER(H5S_extent_copy, FAIL); + FUNC_ENTER_NOAPI(H5S_extent_copy, FAIL); /* Copy the regular fields */ *dst=*src; @@ -715,7 +715,7 @@ H5S_copy(const H5S_t *src) { H5S_t *dst = NULL; - FUNC_ENTER(H5S_copy, NULL); + FUNC_ENTER_NOAPI(H5S_copy, NULL); if (NULL==(dst = H5FL_ALLOC(H5S_t,0))) { HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed"); @@ -757,7 +757,7 @@ H5S_get_simple_extent_npoints(const H5S_t *ds) hssize_t ret_value = -1; unsigned u; - FUNC_ENTER(H5S_get_simple_extent_npoints, -1); + FUNC_ENTER_NOAPI(H5S_get_simple_extent_npoints, -1); /* check args */ assert(ds); @@ -810,7 +810,7 @@ H5Sget_simple_extent_npoints(hid_t space_id) H5S_t *ds = NULL; hssize_t ret_value = -1; - FUNC_ENTER(H5Sget_simple_extent_npoints, -1); + FUNC_ENTER_API(H5Sget_simple_extent_npoints, -1); H5TRACE1("Hs","i",space_id); /* Check args */ @@ -849,7 +849,7 @@ H5S_get_npoints_max(const H5S_t *ds) hsize_t ret_value = 0; unsigned u; - FUNC_ENTER(H5S_get_npoints_max, 0); + FUNC_ENTER_NOAPI(H5S_get_npoints_max, 0); /* check args */ assert(ds); @@ -912,7 +912,7 @@ H5Sget_simple_extent_ndims(hid_t space_id) H5S_t *ds = NULL; int ret_value = 0; - FUNC_ENTER(H5Sget_simple_extent_ndims, FAIL); + FUNC_ENTER_API(H5Sget_simple_extent_ndims, FAIL); H5TRACE1("Is","i",space_id); /* Check args */ @@ -947,7 +947,7 @@ H5S_get_simple_extent_ndims(const H5S_t *ds) { int ret_value = FAIL; - FUNC_ENTER(H5S_get_simple_extent_ndims, FAIL); + FUNC_ENTER_NOAPI(H5S_get_simple_extent_ndims, FAIL); /* check args */ assert(ds); @@ -1003,7 +1003,7 @@ H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[]/*out*/, H5S_t *ds = NULL; int ret_value = 0; - FUNC_ENTER(H5Sget_simple_extent_dims, FAIL); + FUNC_ENTER_API(H5Sget_simple_extent_dims, FAIL); H5TRACE3("Is","ixx",space_id,dims,maxdims); /* Check args */ @@ -1039,7 +1039,7 @@ H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[], hsize_t max_dims[]) int ret_value = FAIL; int i; - FUNC_ENTER(H5S_get_simple_extent_dims, FAIL); + FUNC_ENTER_NOAPI(H5S_get_simple_extent_dims, FAIL); /* check args */ assert(ds); @@ -1095,7 +1095,7 @@ H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[], hsize_t max_dims[]) herr_t H5S_modify(H5G_entry_t *ent, const H5S_t *ds) { - FUNC_ENTER(H5S_modify, FAIL); + FUNC_ENTER_NOAPI(H5S_modify, FAIL); assert(ent); assert(ds); @@ -1144,7 +1144,7 @@ H5S_read(H5G_entry_t *ent) { H5S_t *ds = NULL; - FUNC_ENTER(H5S_read, NULL); + FUNC_ENTER_NOAPI(H5S_read, NULL); /* check args */ assert(ent); @@ -1195,7 +1195,7 @@ H5S_cmp(const H5S_t *ds1, const H5S_t *ds2) { unsigned u; - FUNC_ENTER(H5S_cmp, 0); + FUNC_ENTER_NOAPI(H5S_cmp, 0); /* check args */ assert(ds1); @@ -1263,7 +1263,7 @@ H5S_is_simple(const H5S_t *sdim) { htri_t ret_value = FAIL; - FUNC_ENTER(H5S_is_simple, FAIL); + FUNC_ENTER_NOAPI(H5S_is_simple, FAIL); /* Check args and all the boring stuff. */ assert(sdim); @@ -1293,7 +1293,7 @@ H5Sis_simple(hid_t space_id) H5S_t *space = NULL; /* dataspace to modify */ htri_t ret_value = FAIL; - FUNC_ENTER(H5Sis_simple, FAIL); + FUNC_ENTER_API(H5Sis_simple, FAIL); H5TRACE1("b","i",space_id); /* Check args and all the boring stuff. */ @@ -1339,7 +1339,7 @@ H5Sset_extent_simple(hid_t space_id, int rank, const hsize_t dims[/*rank*/], H5S_t *space = NULL; /* dataspace to modify */ int u; /* local counting variable */ - FUNC_ENTER(H5Sset_extent_simple, FAIL); + FUNC_ENTER_API(H5Sset_extent_simple, FAIL); H5TRACE4("e","iIs*[a1]h*[a1]h",space_id,rank,dims,max); /* Check args */ @@ -1404,7 +1404,7 @@ herr_t H5S_set_extent_simple (H5S_t *space, unsigned rank, const hsize_t *dims, const hsize_t *max) { - FUNC_ENTER(H5S_set_extent_simple, FAIL); + FUNC_ENTER_NOAPI(H5S_set_extent_simple, FAIL); /* Check args */ assert(rank<=H5S_MAX_RANK); @@ -1500,7 +1500,7 @@ H5S_find (const H5S_t *mem_space, const H5S_t *file_space, unsigned flags) htri_t opt; /* Flag whether a selection is optimizable */ size_t i; /* Index variable */ - FUNC_ENTER (H5S_find, NULL); + FUNC_ENTER_NOAPI(H5S_find, NULL); /* Check args */ assert (mem_space && (H5S_SIMPLE==mem_space->extent.type || @@ -1654,7 +1654,7 @@ H5S_extend (H5S_t *space, const hsize_t *size) int ret_value=0; unsigned u; - FUNC_ENTER (H5S_extend, FAIL); + FUNC_ENTER_NOAPI(H5S_extend, FAIL); /* Check args */ assert (space && H5S_SIMPLE==space->extent.type); @@ -1720,7 +1720,7 @@ H5Screate_simple(int rank, const hsize_t dims[/*rank*/], H5S_t *space = NULL; int i; - FUNC_ENTER(H5Screate_simple, FAIL); + FUNC_ENTER_API(H5Screate_simple, FAIL); H5TRACE3("i","Is*[a0]h*[a0]h",rank,dims,maxdims); /* Check arguments */ @@ -1801,7 +1801,7 @@ H5S_get_simple_extent_type(const H5S_t *space) { H5S_class_t ret_value = H5S_NO_CLASS; - FUNC_ENTER(H5S_get_simple_extent_type, H5S_NO_CLASS); + FUNC_ENTER_NOAPI(H5S_get_simple_extent_type, H5S_NO_CLASS); assert(space); @@ -1835,7 +1835,7 @@ H5Sget_simple_extent_type(hid_t sid) H5S_class_t ret_value = H5S_NO_CLASS; H5S_t *space = NULL; - FUNC_ENTER(H5Sget_simple_extent_type, H5S_NO_CLASS); + FUNC_ENTER_API(H5Sget_simple_extent_type, H5S_NO_CLASS); H5TRACE1("Sc","i",sid); /* Check arguments */ @@ -1868,7 +1868,7 @@ H5Sset_extent_none(hid_t space_id) { H5S_t *space = NULL; /* dataspace to modify */ - FUNC_ENTER(H5Sset_extent_none, FAIL); + FUNC_ENTER_API(H5Sset_extent_none, FAIL); H5TRACE1("e","i",space_id); /* Check args */ @@ -1906,7 +1906,7 @@ H5Soffset_simple(hid_t space_id, const hssize_t *offset) { H5S_t *space = NULL; /* dataspace to modify */ - FUNC_ENTER(H5Soffset_simple, FAIL); + FUNC_ENTER_API(H5Soffset_simple, FAIL); H5TRACE2("e","i*Hs",space_id,offset); /* Check args */ @@ -1953,7 +1953,7 @@ H5S_set_extent( H5S_t *space, const hsize_t *size ) herr_t ret_value=SUCCEED; unsigned u; - FUNC_ENTER( H5S_set_extent, FAIL ); + FUNC_ENTER_NOAPI( H5S_set_extent, FAIL ); /* Check args */ assert( space && H5S_SIMPLE==space->extent.type ); @@ -1996,7 +1996,7 @@ H5S_debug(H5F_t *f, const void *_mesg, FILE *stream, int indent, int fwidth) { const H5S_t *mesg = (const H5S_t*)_mesg; - FUNC_ENTER(H5S_debug, FAIL); + FUNC_ENTER_NOAPI(H5S_debug, FAIL); switch (mesg->extent.type) { case H5S_SCALAR: diff --git a/src/H5Sall.c b/src/H5Sall.c index 52ecad8..9a4d80d 100644 --- a/src/H5Sall.c +++ b/src/H5Sall.c @@ -78,7 +78,7 @@ const H5S_mconv_t H5S_ALL_MCONV[1] = {{ static herr_t H5S_all_init (const H5S_t *space, size_t UNUSED elmt_size, H5S_sel_iter_t *sel_iter) { - FUNC_ENTER (H5S_all_init, FAIL); + FUNC_ENTER_NOAPI(H5S_all_init, FAIL); /* Check args */ assert (space && H5S_SEL_ALL==space->select.type); @@ -113,7 +113,7 @@ H5S_all_init (const H5S_t *space, size_t UNUSED elmt_size, H5S_sel_iter_t *sel_i static hsize_t H5S_all_favail (const H5S_t * UNUSED space, const H5S_sel_iter_t *sel_iter, hsize_t max) { - FUNC_ENTER (H5S_all_favail, 0); + FUNC_ENTER_NOAPI(H5S_all_favail, 0); /* Check args */ assert (space && H5S_SEL_ALL==space->select.type); @@ -159,7 +159,7 @@ H5S_all_fgath (H5F_t *f, const struct H5O_layout_t *layout, hsize_t actual_bytes; /* The actual number of bytes to read */ hsize_t buf_off; /* Dataset offset for copying memory */ - FUNC_ENTER (H5S_all_fgath, 0); + FUNC_ENTER_NOAPI(H5S_all_fgath, 0); /* Check args */ assert (f); @@ -220,7 +220,7 @@ H5S_all_fscat (H5F_t *f, const struct H5O_layout_t *layout, hsize_t actual_bytes; /* The actual number of bytes to write */ hsize_t buf_off; /* Dataset offset for copying memory */ - FUNC_ENTER (H5S_all_fscat, FAIL); + FUNC_ENTER_NOAPI(H5S_all_fscat, FAIL); /* Check args */ assert (f); @@ -280,7 +280,7 @@ H5S_all_mgath (const void *_buf, size_t elmt_size, const uint8_t *buf=(const uint8_t*)_buf; /* Get local copies for address arithmetic */ hsize_t actual_bytes; /* The actual number of bytes to read */ - FUNC_ENTER (H5S_all_mgath, 0); + FUNC_ENTER_NOAPI(H5S_all_mgath, 0); /* Check args */ assert (buf); @@ -331,7 +331,7 @@ H5S_all_mscat (const void *tconv_buf, size_t elmt_size, uint8_t *buf=(uint8_t *)_buf; hsize_t actual_bytes; /* The actual number of bytes to write */ - FUNC_ENTER (H5S_all_mscat, FAIL); + FUNC_ENTER_NOAPI(H5S_all_mscat, FAIL); /* Check args */ assert (tconv_buf); @@ -379,7 +379,7 @@ H5S_all_opt_possible( const H5S_t *mem_space, const H5S_t *file_space, const uns htri_t c1,c2; /* Flags whether a selection is optimizable */ htri_t ret_value=TRUE; - FUNC_ENTER(H5S_all_opt_possible, FAIL); + FUNC_ENTER_NOAPI(H5S_all_opt_possible, FAIL); /* Check args */ assert(mem_space); @@ -449,7 +449,7 @@ H5S_all_read(H5F_t *f, const H5O_layout_t *layout, H5P_genplist_t *dc_plist, unsigned u; /* Index variable */ herr_t ret_value=SUCCEED; - FUNC_ENTER(H5S_all_read, FAIL); + FUNC_ENTER_NOAPI(H5S_all_read, FAIL); /* Get information about memory and file */ for (u=0; u<mem_space->extent.u.simple.rank; u++) { @@ -569,7 +569,7 @@ H5S_all_write(H5F_t *f, const struct H5O_layout_t *layout, H5P_genplist_t *dc_pl unsigned u; /* Index variable */ herr_t ret_value=SUCCEED; - FUNC_ENTER(H5S_all_write, FAIL); + FUNC_ENTER_NOAPI(H5S_all_write, FAIL); /* Get information about memory and file */ for (u=0; u<mem_space->extent.u.simple.rank; u++) { @@ -669,7 +669,7 @@ done: herr_t H5S_all_release (H5S_t * UNUSED space) { - FUNC_ENTER (H5S_all_release, FAIL); + FUNC_ENTER_NOAPI(H5S_all_release, FAIL); /* Check args */ assert (space); @@ -702,7 +702,7 @@ H5S_all_npoints (const H5S_t *space) unsigned u; /* Counters */ hsize_t ret_value; - FUNC_ENTER (H5S_all_npoints, 0); + FUNC_ENTER_NOAPI(H5S_all_npoints, 0); /* Check args */ assert (space); @@ -738,7 +738,7 @@ H5S_all_select_serialize (const H5S_t *space, uint8_t *buf) { herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_all_select_serialize, FAIL); + FUNC_ENTER_NOAPI(H5S_all_select_serialize, FAIL); assert(space); @@ -779,7 +779,7 @@ H5S_all_select_deserialize (H5S_t *space, const uint8_t UNUSED *buf) { herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_all_select_deserialize, FAIL); + FUNC_ENTER_NOAPI(H5S_all_select_deserialize, FAIL); assert(space); @@ -825,7 +825,7 @@ H5S_all_bounds(H5S_t *space, hsize_t *start, hsize_t *end) int i; /* index variable */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5S_all_bounds, FAIL); + FUNC_ENTER_NOAPI(H5S_all_bounds, FAIL); assert(space); assert(start); @@ -866,7 +866,7 @@ H5S_select_all (H5S_t *space) { herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5S_select_all, FAIL); + FUNC_ENTER_NOAPI(H5S_select_all, FAIL); /* Check args */ assert(space); @@ -906,7 +906,7 @@ herr_t H5Sselect_all (hid_t spaceid) H5S_t *space = NULL; /* Dataspace to modify selection of */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Sselect_all, FAIL); + FUNC_ENTER_API(H5Sselect_all, FAIL); /* Check args */ if (H5I_DATASPACE != H5I_get_type(spaceid) || NULL == (space=H5I_object(spaceid))) { @@ -970,7 +970,7 @@ H5S_all_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t op H5T_t *dt; /* Datatype structure */ herr_t ret_value=0; /* return value */ - FUNC_ENTER (H5S_all_select_iterate, 0); + FUNC_ENTER_NOAPI(H5S_all_select_iterate, 0); assert(buf); assert(space); @@ -1047,7 +1047,7 @@ H5S_all_select_fill(const void *fill, size_t fill_size, const H5S_t *space, void hssize_t nelemts; /* Number of elements in dataspace */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5S_all_select_fill, FAIL); + FUNC_ENTER_NOAPI(H5S_all_select_fill, FAIL); /* Check args */ assert(fill); diff --git a/src/H5Shyper.c b/src/H5Shyper.c index 5130343..1d92137 100644 --- a/src/H5Shyper.c +++ b/src/H5Shyper.c @@ -154,7 +154,7 @@ H5S_hyper_init (const H5S_t *space, size_t elmt_size, H5S_sel_iter_t *sel_iter) H5S_hyper_span_info_t *spans; /* Pointer to hyperslab span info node */ unsigned u; /* Index variable */ - FUNC_ENTER (H5S_hyper_init, FAIL); + FUNC_ENTER_NOAPI(H5S_hyper_init, FAIL); /* Check args */ assert(space && H5S_SEL_HYPERSLABS==space->select.type); @@ -226,7 +226,7 @@ H5S_hyper_init (const H5S_t *space, size_t elmt_size, H5S_sel_iter_t *sel_iter) herr_t H5S_hyper_sel_iter_release (H5S_sel_iter_t *sel_iter) { - FUNC_ENTER (H5S_hyper_sel_iter_release, FAIL); + FUNC_ENTER_NOAPI(H5S_hyper_sel_iter_release, FAIL); /* Check args */ assert (sel_iter); @@ -266,7 +266,7 @@ static hsize_t H5S_hyper_favail (const H5S_t * UNUSED space, const H5S_sel_iter_t *sel_iter, hsize_t max) { - FUNC_ENTER (H5S_hyper_favail, 0); + FUNC_ENTER_NOAPI(H5S_hyper_favail, 0); /* Check args */ assert (space && H5S_SEL_HYPERSLABS==space->select.type); @@ -1369,7 +1369,7 @@ H5S_hyper_fgath (H5F_t *f, const struct H5O_layout_t *layout, hsize_t num_read=0; /* number of elements read into buffer */ herr_t ret_value=SUCCEED; - FUNC_ENTER (H5S_hyper_fgath, 0); + FUNC_ENTER_NOAPI(H5S_hyper_fgath, 0); /* Check args */ assert (f); @@ -2388,7 +2388,7 @@ H5S_hyper_fscat (H5F_t *f, const struct H5O_layout_t *layout, hsize_t num_written=0; /* number of elements read into buffer */ herr_t ret_value=SUCCEED; - FUNC_ENTER (H5S_hyper_fscat, 0); + FUNC_ENTER_NOAPI(H5S_hyper_fscat, 0); /* Check args */ assert (f); @@ -3218,7 +3218,7 @@ H5S_hyper_mgath (const void *_buf, size_t elmt_size, { hsize_t num_read; /* number of elements read into buffer */ - FUNC_ENTER (H5S_hyper_mgath, 0); + FUNC_ENTER_NOAPI(H5S_hyper_mgath, 0); /* Check args */ assert (elmt_size>0); @@ -4044,7 +4044,7 @@ H5S_hyper_mscat (const void *_tconv_buf, size_t elmt_size, { hsize_t num_written; /* number of elements written into buffer */ - FUNC_ENTER (H5S_hyper_mscat, 0); + FUNC_ENTER_NOAPI(H5S_hyper_mscat, 0); /* Check args */ assert (elmt_size>0); @@ -4088,7 +4088,7 @@ H5S_hyper_mscat (const void *_tconv_buf, size_t elmt_size, hsize_t H5S_hyper_npoints (const H5S_t *space) { - FUNC_ENTER (H5S_hyper_npoints, 0); + FUNC_ENTER_NOAPI(H5S_hyper_npoints, 0); /* Check args */ assert (space); @@ -4661,7 +4661,7 @@ H5S_hyper_copy (H5S_t *dst, const H5S_t *src) unsigned u; /* Counters */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5S_hyper_copy, FAIL); + FUNC_ENTER_NOAPI(H5S_hyper_copy, FAIL); assert(src); assert(dst); @@ -4802,7 +4802,7 @@ H5S_hyper_select_valid (const H5S_t *space) unsigned u; /* Counter */ htri_t ret_value=TRUE; /* return value */ - FUNC_ENTER (H5S_hyper_select_valid, FAIL); + FUNC_ENTER_NOAPI(H5S_hyper_select_valid, FAIL); assert(space); @@ -4866,7 +4866,7 @@ H5S_hyper_span_nblocks (H5S_hyper_span_info_t *spans) H5S_hyper_span_t *span; /* Hyperslab span */ hssize_t ret_value=FAIL; - FUNC_ENTER (H5S_hyper_span_nblocks, FAIL); + FUNC_ENTER_NOAPI(H5S_hyper_span_nblocks, FAIL); /* Count the number of elements in the span tree */ if(spans==NULL) @@ -4920,7 +4920,7 @@ H5S_hyper_select_serial_size (const H5S_t *space) hssize_t block_count; /* block counter for regular hyperslabs */ hssize_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_hyper_select_serial_size, FAIL); + FUNC_ENTER_NOAPI(H5S_hyper_select_serial_size, FAIL); assert(space); @@ -5063,7 +5063,7 @@ H5S_hyper_select_serialize (const H5S_t *space, uint8_t *buf) int done; /* Whether we are done with the iteration */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_hyper_select_serialize, FAIL); + FUNC_ENTER_NOAPI(H5S_hyper_select_serialize, FAIL); assert(space); @@ -5220,7 +5220,7 @@ H5S_hyper_select_deserialize (H5S_t *space, const uint8_t *buf) unsigned i,j; /* local counting variables */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_hyper_select_deserialize, FAIL); + FUNC_ENTER_NOAPI(H5S_hyper_select_deserialize, FAIL); /* Check args */ assert(space); @@ -5317,7 +5317,7 @@ H5S_hyper_span_blocklist(H5S_hyper_span_info_t *spans, hssize_t start[], hssize_ hsize_t u; /* Index variable */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5S_hyper_span_blocklist, FAIL); + FUNC_ENTER_NOAPI(H5S_hyper_span_blocklist, FAIL); /* Sanity checks */ assert(spans); @@ -5479,7 +5479,7 @@ H5S_hyper_bounds(H5S_t *space, hsize_t *start, hsize_t *end) { herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5S_hyper_bounds, FAIL); + FUNC_ENTER_NOAPI(H5S_hyper_bounds, FAIL); assert(space); assert(start); @@ -5540,7 +5540,7 @@ H5S_hyper_select_contiguous(const H5S_t *space) large_contiguous; /* Flag for large contiguous block */ htri_t ret_value=FALSE; /* return value */ - FUNC_ENTER (H5S_hyper_select_contiguous, FAIL); + FUNC_ENTER_NOAPI(H5S_hyper_select_contiguous, FAIL); assert(space); @@ -5712,7 +5712,7 @@ H5S_hyper_select_single(const H5S_t *space) unsigned u; /* index variable */ htri_t ret_value=FALSE; /* return value */ - FUNC_ENTER (H5S_hyper_select_single, FAIL); + FUNC_ENTER_NOAPI(H5S_hyper_select_single, FAIL); assert(space); @@ -5789,7 +5789,7 @@ H5S_hyper_select_regular(const H5S_t *space) { htri_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_hyper_select_regular, FAIL); + FUNC_ENTER_NOAPI(H5S_hyper_select_regular, FAIL); /* Check args */ assert(space); @@ -6225,7 +6225,7 @@ H5S_hyper_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t H5T_t *dt; /* Datatype structure */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_hyper_select_iterate, FAIL); + FUNC_ENTER_NOAPI(H5S_hyper_select_iterate, FAIL); assert(buf); assert(space); @@ -6300,7 +6300,7 @@ H5S_hyper_release (H5S_t *space) { herr_t ret_value=SUCCEED; - FUNC_ENTER (H5S_hyper_release, FAIL); + FUNC_ENTER_NOAPI(H5S_hyper_release, FAIL); /* Check args */ assert (space && H5S_SEL_HYPERSLABS==space->select.type); @@ -6702,7 +6702,7 @@ H5S_hyper_select_fill(const void *fill, size_t fill_size, const H5S_t *space, vo { herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5S_hyper_select_fill, FAIL); + FUNC_ENTER_NOAPI(H5S_hyper_select_fill, FAIL); /* Check args */ assert(fill); @@ -8153,7 +8153,7 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op, H5S_hyper_dim_t *diminfo; /* per-dimension info for the selection */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_select_hyperslab, FAIL); + FUNC_ENTER_NOAPI(H5S_select_hyperslab, FAIL); /* Check args */ assert(space); @@ -8387,7 +8387,7 @@ H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hssize_t start[], { H5S_t *space = NULL; /* Dataspace to modify selection of */ - FUNC_ENTER (H5Sselect_hyperslab, FAIL); + FUNC_ENTER_API(H5Sselect_hyperslab, FAIL); H5TRACE6("e","iSs*Hs*h*h*h",space_id,op,start,stride,count,block); /* Check args */ @@ -8681,7 +8681,7 @@ H5S_select_hyperslab (H5S_t *space, H5S_seloper_t op, H5S_hyper_dim_t *diminfo; /* per-dimension info for the selection */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_select_hyperslab, FAIL); + FUNC_ENTER_NOAPI (H5S_select_hyperslab, FAIL); /* Check args */ assert(space); @@ -8913,7 +8913,7 @@ H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hssize_t start[], { H5S_t *space = NULL; /* Dataspace to modify selection of */ - FUNC_ENTER (H5Sselect_hyperslab, FAIL); + FUNC_ENTER_API(H5Sselect_hyperslab, FAIL); H5TRACE6("e","iSs*Hs*h*h*h",space_id,op,start,stride,count,block); /* Check args */ @@ -8971,7 +8971,7 @@ H5Scombine_hyperslab(hid_t space_id, H5S_seloper_t op, const hssize_t start[], H5S_t *new_space = NULL; /* New dataspace created */ hid_t ret_value = FAIL; - FUNC_ENTER (H5Scombine_hyperslab, FAIL); + FUNC_ENTER_API(H5Scombine_hyperslab, FAIL); H5TRACE6("i","iSs*Hs*h*h*h",space_id,op,start,stride,count,block); /* Check args */ @@ -9081,7 +9081,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 = FAIL; - FUNC_ENTER (H5Scombine_select, FAIL); + FUNC_ENTER_API(H5Scombine_select, FAIL); H5TRACE3("i","iSsi",space1_id,op,space2_id); /* Check args */ @@ -9195,7 +9195,7 @@ H5Sselect_select(hid_t space1_id, H5S_seloper_t op, hid_t space2_id) H5S_t *space2; /* Second Dataspace */ hid_t ret_value = FAIL; - FUNC_ENTER (H5Sselect_select, FAIL); + FUNC_ENTER_API(H5Sselect_select, FAIL); H5TRACE3("e","iSsi",space1_id,op,space2_id); /* Check args */ diff --git a/src/H5Smpio.c b/src/H5Smpio.c index cb49b8f..22d38a8 100644 --- a/src/H5Smpio.c +++ b/src/H5Smpio.c @@ -706,7 +706,7 @@ H5S_mpio_spaces_read(H5F_t *f, const H5O_layout_t *layout, { herr_t ret_value = FAIL; - FUNC_ENTER (H5S_mpio_spaces_read, FAIL); + FUNC_ENTER_NOAPI(H5S_mpio_spaces_read, FAIL); ret_value = H5S_mpio_spaces_xfer(f, layout, dc_plist, elmt_size, file_space, mem_space, dxpl_id, @@ -744,7 +744,7 @@ H5S_mpio_spaces_write(H5F_t *f, const H5O_layout_t *layout, { herr_t ret_value = FAIL; - FUNC_ENTER (H5S_mpio_spaces_write, FAIL); + FUNC_ENTER_NOAPI(H5S_mpio_spaces_write, FAIL); ret_value = H5S_mpio_spaces_xfer(f, layout, dc_plist, elmt_size, file_space, mem_space, dxpl_id, @@ -776,7 +776,7 @@ H5S_mpio_opt_possible( const H5S_t *mem_space, const H5S_t *file_space, const un htri_t c1,c2; /* Flags whether a selection is optimizable */ htri_t ret_value=TRUE; - FUNC_ENTER(H5S_all_opt_possible, FAIL); + FUNC_ENTER_NOAPI(H5S_all_opt_possible, FAIL); /* Check args */ assert(mem_space); diff --git a/src/H5Snone.c b/src/H5Snone.c index c440eea..11ad5f5 100644 --- a/src/H5Snone.c +++ b/src/H5Snone.c @@ -47,7 +47,7 @@ H5S_none_select_serialize (const H5S_t *space, uint8_t *buf) { herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_none_select_serialize, FAIL); + FUNC_ENTER_NOAPI(H5S_none_select_serialize, FAIL); assert(space); @@ -87,7 +87,7 @@ H5S_none_select_deserialize (H5S_t *space, const uint8_t UNUSED *buf) { herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_none_select_deserialize, FAIL); + FUNC_ENTER_NOAPI(H5S_none_select_deserialize, FAIL); assert(space); @@ -122,7 +122,7 @@ herr_t H5S_select_none (H5S_t *space) { herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5S_select_none, FAIL); + FUNC_ENTER_NOAPI(H5S_select_none, FAIL); /* Check args */ assert(space); @@ -163,7 +163,7 @@ herr_t H5Sselect_none (hid_t spaceid) H5S_t *space = NULL; /* Dataspace to modify selection of */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Sselect_none, FAIL); + FUNC_ENTER_API(H5Sselect_none, FAIL); /* Check args */ if (H5I_DATASPACE != H5I_get_type(spaceid) || @@ -211,7 +211,7 @@ H5S_none_select_iterate(void * UNUSED buf, hid_t UNUSED type_id, H5S_t * UNUSED { herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5S_none_select_iterate, FAIL); + FUNC_ENTER_NOAPI(H5S_none_select_iterate, FAIL); assert(buf); assert(space); diff --git a/src/H5Spoint.c b/src/H5Spoint.c index 5f56ebb..9dcfc4c 100644 --- a/src/H5Spoint.c +++ b/src/H5Spoint.c @@ -82,7 +82,7 @@ const H5S_mconv_t H5S_POINT_MCONV[1] = {{ static herr_t H5S_point_init (const H5S_t *space, size_t UNUSED elmt_size, H5S_sel_iter_t *sel_iter) { - FUNC_ENTER (H5S_point_init, FAIL); + FUNC_ENTER_NOAPI(H5S_point_init, FAIL); /* Check args */ assert (space && H5S_SEL_POINTS==space->select.type); @@ -124,7 +124,7 @@ herr_t H5S_point_add (H5S_t *space, H5S_seloper_t op, size_t num_elem, const hss unsigned i; /* Counter */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_point_add, FAIL); + FUNC_ENTER_NOAPI(H5S_point_add, FAIL); assert(space); assert(num_elem>0); @@ -203,7 +203,7 @@ static hsize_t H5S_point_favail (const H5S_t * UNUSED space, const H5S_sel_iter_t *sel_iter, hsize_t max) { - FUNC_ENTER (H5S_point_favail, 0); + FUNC_ENTER_NOAPI(H5S_point_favail, 0); /* Check args */ assert (space && H5S_SEL_POINTS==space->select.type); @@ -257,7 +257,7 @@ H5S_point_fgath (H5F_t *f, const struct H5O_layout_t *layout, unsigned u; /*counters */ hsize_t num_read; /* number of elements read into buffer */ - FUNC_ENTER (H5S_point_fgath, 0); + FUNC_ENTER_NOAPI(H5S_point_fgath, 0); /* Check args */ assert (f); @@ -347,7 +347,7 @@ H5S_point_fscat (H5F_t *f, const struct H5O_layout_t *layout, unsigned u; /*counters */ hsize_t num_written; /* number of elements written from buffer */ - FUNC_ENTER (H5S_point_fscat, FAIL); + FUNC_ENTER_NOAPI(H5S_point_fscat, FAIL); /* Check args */ assert (f); @@ -434,7 +434,7 @@ H5S_point_mgath (const void *_buf, size_t elmt_size, int i; /*counters */ hsize_t num_gath; /* number of elements gathered */ - FUNC_ENTER (H5S_point_mgath, 0); + FUNC_ENTER_NOAPI(H5S_point_mgath, 0); /* Check args */ assert (buf); @@ -504,7 +504,7 @@ H5S_point_mscat (const void *_tconv_buf, size_t elmt_size, int i; /*counters */ hsize_t num_scat; /* Number of elements scattered */ - FUNC_ENTER (H5S_point_mscat, FAIL); + FUNC_ENTER_NOAPI(H5S_point_mscat, FAIL); /* Check args */ assert (tconv_buf); @@ -564,7 +564,8 @@ herr_t H5S_point_release (H5S_t *space) { H5S_pnt_node_t *curr, *next; /* Point selection nodes */ - FUNC_ENTER (H5S_point_release, FAIL); + + FUNC_ENTER_NOAPI(H5S_point_release, FAIL); /* Check args */ assert (space); @@ -608,7 +609,7 @@ H5S_point_release (H5S_t *space) hsize_t H5S_point_npoints (const H5S_t *space) { - FUNC_ENTER (H5S_point_npoints, 0); + FUNC_ENTER_NOAPI(H5S_point_npoints, 0); /* Check args */ assert (space); @@ -641,7 +642,7 @@ H5S_point_copy (H5S_t *dst, const H5S_t *src) H5S_pnt_node_t *curr, *new_node, *new_head; /* Point information nodes */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5S_point_copy, FAIL); + FUNC_ENTER_NOAPI(H5S_point_copy, FAIL); assert(src); assert(dst); @@ -706,7 +707,7 @@ H5S_point_select_valid (const H5S_t *space) unsigned u; /* Counter */ htri_t ret_value=TRUE; /* return value */ - FUNC_ENTER (H5S_point_select_valid, FAIL); + FUNC_ENTER_NOAPI(H5S_point_select_valid, FAIL); assert(space); @@ -755,7 +756,7 @@ H5S_point_select_serial_size (const H5S_t *space) H5S_pnt_node_t *curr; /* Point information nodes */ hssize_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_point_select_serial_size, FAIL); + FUNC_ENTER_NOAPI(H5S_point_select_serial_size, FAIL); assert(space); @@ -804,7 +805,7 @@ H5S_point_select_serialize (const H5S_t *space, uint8_t *buf) unsigned u; /* local counting variable */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_point_select_serialize, FAIL); + FUNC_ENTER_NOAPI(H5S_point_select_serialize, FAIL); assert(space); @@ -874,7 +875,7 @@ H5S_point_select_deserialize (H5S_t *space, const uint8_t *buf) unsigned i,j; /* local counting variables */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_point_select_deserialize, FAIL); + FUNC_ENTER_NOAPI(H5S_point_select_deserialize, FAIL); /* Check args */ assert(space); @@ -943,7 +944,7 @@ H5S_point_bounds(H5S_t *space, hsize_t *start, hsize_t *end) int i; /* index variable */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5S_point_bounds, FAIL); + FUNC_ENTER_NOAPI(H5S_point_bounds, FAIL); assert(space); assert(start); @@ -994,7 +995,7 @@ H5S_point_select_contiguous(const H5S_t *space) { htri_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_point_select_contiguous, FAIL); + FUNC_ENTER_NOAPI(H5S_point_select_contiguous, FAIL); assert(space); @@ -1031,7 +1032,7 @@ H5S_point_select_single(const H5S_t *space) { htri_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_point_select_single, FAIL); + FUNC_ENTER_NOAPI(H5S_point_select_single, FAIL); assert(space); @@ -1071,7 +1072,7 @@ H5S_point_select_regular(const H5S_t *space) { htri_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_point_select_regular, FAIL); + FUNC_ENTER_NOAPI(H5S_point_select_regular, FAIL); /* Check args */ assert(space); @@ -1121,7 +1122,7 @@ herr_t H5S_select_elements (H5S_t *space, H5S_seloper_t op, size_t num_elem, { herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5S_select_elements, FAIL); + FUNC_ENTER_NOAPI(H5S_select_elements, FAIL); /* Check args */ assert(space); @@ -1194,7 +1195,7 @@ herr_t H5Sselect_elements (hid_t spaceid, H5S_seloper_t op, size_t num_elem, H5S_t *space = NULL; /* Dataspace to modify selection of */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5Sselect_elements, FAIL); + FUNC_ENTER_API(H5Sselect_elements, FAIL); /* Check args */ if (H5I_DATASPACE != H5I_get_type(spaceid) || @@ -1267,7 +1268,7 @@ H5S_point_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t unsigned u; /* Local index variable */ herr_t ret_value=0; /* return value */ - FUNC_ENTER (H5S_point_select_iterate, 0); + FUNC_ENTER_NOAPI(H5S_point_select_iterate, 0); assert(buf); assert(space); @@ -1345,7 +1346,7 @@ H5S_point_select_fill(const void *fill, size_t fill_size, const H5S_t *space, vo int i; /* Index variable */ herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5S_point_select_fill, FAIL); + FUNC_ENTER_NOAPI(H5S_point_select_fill, FAIL); /* Check args */ assert(fill); diff --git a/src/H5Sselect.c b/src/H5Sselect.c index 6b80064..c4a6bdb 100644 --- a/src/H5Sselect.c +++ b/src/H5Sselect.c @@ -57,7 +57,7 @@ H5S_select_copy (H5S_t *dst, const H5S_t *src) { herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5S_select_copy, FAIL); + FUNC_ENTER_NOAPI(H5S_select_copy, FAIL); /* Check args */ assert(dst); @@ -138,7 +138,7 @@ H5S_select_release (H5S_t *space) { herr_t ret_value=SUCCEED; /* return value */ - FUNC_ENTER (H5S_select_release, FAIL); + FUNC_ENTER_NOAPI(H5S_select_release, FAIL); /* Check args */ assert (space); @@ -194,7 +194,7 @@ H5Sget_select_npoints(hid_t spaceid) H5S_t *space = NULL; /* Dataspace to modify selection of */ hssize_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Sget_select_npoints, 0); + FUNC_ENTER_API(H5Sget_select_npoints, 0); H5TRACE1("Hs","i",spaceid); /* Check args */ @@ -230,7 +230,7 @@ H5S_get_select_npoints (const H5S_t *space) { hssize_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_get_select_npoints, FAIL); + FUNC_ENTER_NOAPI(H5S_get_select_npoints, FAIL); assert(space); @@ -282,7 +282,7 @@ H5S_sel_iter_release (const H5S_t *space, H5S_sel_iter_t *sel_iter) { herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER (H5S_sel_iter_release, FAIL); + FUNC_ENTER_NOAPI(H5S_sel_iter_release, FAIL); /* Check args */ assert (sel_iter); @@ -335,7 +335,7 @@ H5Sselect_valid(hid_t spaceid) H5S_t *space = NULL; /* Dataspace to modify selection of */ htri_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Sselect_valid, 0); + FUNC_ENTER_API(H5Sselect_valid, 0); H5TRACE1("b","i",spaceid); /* Check args */ @@ -374,7 +374,7 @@ H5S_select_valid (const H5S_t *space) { htri_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_select_valid, FAIL); + FUNC_ENTER_NOAPI(H5S_select_valid, FAIL); assert(space); @@ -425,7 +425,7 @@ H5S_select_serial_size (const H5S_t *space) { hssize_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_select_serial_size, FAIL); + FUNC_ENTER_NOAPI(H5S_select_serial_size, FAIL); assert(space); @@ -483,7 +483,7 @@ H5S_select_serialize (const H5S_t *space, uint8_t *buf) { herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_select_serialize, FAIL); + FUNC_ENTER_NOAPI(H5S_select_serialize, FAIL); assert(space); @@ -541,7 +541,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 (H5S_select_deserialize, FAIL); + FUNC_ENTER_NOAPI(H5S_select_deserialize, FAIL); assert(space); @@ -635,7 +635,7 @@ H5Sget_select_hyper_nblocks(hid_t spaceid) H5S_t *space = NULL; /* Dataspace to modify selection of */ hssize_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Sget_select_hyper_nblocks, FAIL); + FUNC_ENTER_API(H5Sget_select_hyper_nblocks, FAIL); H5TRACE1("Hs","i",spaceid); /* Check args */ @@ -707,7 +707,7 @@ H5Sget_select_elem_npoints(hid_t spaceid) H5S_t *space = NULL; /* Dataspace to modify selection of */ hssize_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Sget_select_elem_npoints, FAIL); + FUNC_ENTER_API(H5Sget_select_elem_npoints, FAIL); H5TRACE1("Hs","i",spaceid); /* Check args */ @@ -903,7 +903,7 @@ H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, hsize_t numbloc H5S_t *space = NULL; /* Dataspace to modify selection of */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Sget_select_hyper_blocklist, FAIL); + FUNC_ENTER_API(H5Sget_select_hyper_blocklist, FAIL); H5TRACE4("e","ihh*h",spaceid,startblock,numblocks,buf); /* Check args */ @@ -1026,7 +1026,7 @@ H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, hsize_t numpoint H5S_t *space = NULL; /* Dataspace to modify selection of */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Sget_select_elem_pointlist, FAIL); + FUNC_ENTER_API(H5Sget_select_elem_pointlist, FAIL); H5TRACE4("e","ihh*h",spaceid,startpoint,numpoints,buf); /* Check args */ @@ -1148,7 +1148,7 @@ H5Sget_select_bounds(hid_t spaceid, hsize_t *start, hsize_t *end) H5S_t *space = NULL; /* Dataspace to modify selection of */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5Sget_select_bounds, FAIL); + FUNC_ENTER_API(H5Sget_select_bounds, FAIL); H5TRACE3("e","i*h*h",spaceid,start,end); /* Check args */ @@ -1188,7 +1188,7 @@ H5S_select_contiguous(const H5S_t *space) { htri_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_select_contiguous, FAIL); + FUNC_ENTER_NOAPI(H5S_select_contiguous, FAIL); assert(space); @@ -1252,7 +1252,7 @@ H5S_select_iterate(void *buf, hid_t type_id, H5S_t *space, H5D_operator_t op, { herr_t ret_value=FAIL; - FUNC_ENTER(H5S_select_iterate, FAIL); + FUNC_ENTER_NOAPI(H5S_select_iterate, FAIL); /* Check args */ assert(buf); @@ -1306,7 +1306,7 @@ H5Sget_select_type(hid_t space_id) { H5S_t *space = NULL; /* dataspace to modify */ - FUNC_ENTER(H5Sget_select_type, H5S_SEL_ERROR); + FUNC_ENTER_API(H5Sget_select_type, H5S_SEL_ERROR); H5TRACE1("St","i",space_id); /* Check args */ @@ -1340,7 +1340,7 @@ H5S_select_single(const H5S_t *space) { htri_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_select_single, FAIL); + FUNC_ENTER_NOAPI(H5S_select_single, FAIL); /* Check args */ assert(space); @@ -1400,7 +1400,7 @@ H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2) unsigned u; /* Index variable */ htri_t ret_value=TRUE; /* return value */ - FUNC_ENTER (H5S_select_shape_same, FAIL); + FUNC_ENTER_NOAPI(H5S_select_shape_same, FAIL); /* Check args */ assert(space1); @@ -1507,7 +1507,7 @@ H5S_select_regular(const H5S_t *space) { htri_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_select_regular, FAIL); + FUNC_ENTER_NOAPI(H5S_select_regular, FAIL); /* Check args */ assert(space); @@ -1570,7 +1570,7 @@ H5S_select_fill(void *_fill, size_t fill_size, const H5S_t *space, void *buf) void *fill=_fill; /* Alias for fill-value buffer */ herr_t ret_value=FAIL; /* return value */ - FUNC_ENTER (H5S_select_fill, FAIL); + FUNC_ENTER_NOAPI(H5S_select_fill, FAIL); /* Check args */ assert(fill_size>0); @@ -231,7 +231,7 @@ static H5T_t * H5T_vlen_create(H5T_t *base); herr_t H5T_init(void) { - FUNC_ENTER(H5T_init, FAIL); + FUNC_ENTER_NOAPI(H5T_init, FAIL); /* FUNC_ENTER() does all the work */ FUNC_LEAVE(SUCCEED); } @@ -2137,7 +2137,7 @@ H5Tcreate(H5T_class_t type, size_t size) H5T_t *dt = NULL; hid_t ret_value = FAIL; - FUNC_ENTER(H5Tcreate, FAIL); + FUNC_ENTER_API(H5Tcreate, FAIL); H5TRACE2("i","Ttz",type,size); /* check args */ @@ -2179,7 +2179,7 @@ H5Topen(hid_t loc_id, const char *name) H5T_t *type = NULL; hid_t ret_value = FAIL; - FUNC_ENTER (H5Topen, FAIL); + FUNC_ENTER_API(H5Topen, FAIL); H5TRACE2("i","is",loc_id,name); /* Check args */ @@ -2228,7 +2228,7 @@ H5Tcommit(hid_t loc_id, const char *name, hid_t type_id) H5G_entry_t *loc = NULL; H5T_t *type = NULL; - FUNC_ENTER (H5Tcommit, FAIL); + FUNC_ENTER_API(H5Tcommit, FAIL); H5TRACE3("e","isi",loc_id,name,type_id); /* Check arguments */ @@ -2274,7 +2274,7 @@ H5Tcommitted(hid_t type_id) { H5T_t *type = NULL; - FUNC_ENTER (H5Tcommitted, FAIL); + FUNC_ENTER_API(H5Tcommitted, FAIL); H5TRACE1("b","i",type_id); /* Check arguments */ @@ -2319,7 +2319,7 @@ H5Tcopy(hid_t type_id) H5D_t *dset = NULL; hid_t ret_value = FAIL; - FUNC_ENTER(H5Tcopy, FAIL); + FUNC_ENTER_API(H5Tcopy, FAIL); H5TRACE1("i","i",type_id); switch (H5I_get_type (type_id)) { @@ -2374,7 +2374,7 @@ H5Tclose(hid_t type_id) { H5T_t *dt = NULL; - FUNC_ENTER(H5Tclose, FAIL); + FUNC_ENTER_API(H5Tclose, FAIL); H5TRACE1("e","i",type_id); /* Check args */ @@ -2420,7 +2420,7 @@ H5Tequal(hid_t type1_id, hid_t type2_id) const H5T_t *dt2 = NULL; htri_t ret_value = FAIL; - FUNC_ENTER(H5Tequal, FAIL); + FUNC_ENTER_API(H5Tequal, FAIL); H5TRACE2("b","ii",type1_id,type2_id); /* check args */ @@ -2465,7 +2465,7 @@ H5Tlock(hid_t type_id) { H5T_t *dt = NULL; - FUNC_ENTER(H5Tlock, FAIL); + FUNC_ENTER_API(H5Tlock, FAIL); H5TRACE1("e","i",type_id); /* Check args */ @@ -2508,7 +2508,7 @@ H5Tget_class(hid_t type_id) { H5T_t *dt = NULL; - FUNC_ENTER(H5Tget_class, H5T_NO_CLASS); + FUNC_ENTER_API(H5Tget_class, H5T_NO_CLASS); H5TRACE1("Tt","i",type_id); /* Check args */ @@ -2544,7 +2544,7 @@ H5T_get_class(const H5T_t *dt) { H5T_class_t ret_value; - FUNC_ENTER(H5T_get_class, H5T_NO_CLASS); + FUNC_ENTER_NOAPI(H5T_get_class, H5T_NO_CLASS); assert(dt); @@ -2578,7 +2578,7 @@ H5Tdetect_class(hid_t type, H5T_class_t cls) { H5T_t *dt = NULL; - FUNC_ENTER (H5Tdetect_class, FAIL); + FUNC_ENTER_API(H5Tdetect_class, FAIL); H5TRACE2("b","iTt",type,cls); /* Check args */ @@ -2614,7 +2614,7 @@ H5T_detect_class (H5T_t *dt, H5T_class_t cls) { int i; - FUNC_ENTER (H5T_detect_class, FAIL); + FUNC_ENTER_NOAPI(H5T_detect_class, FAIL); assert(dt); assert(cls>H5T_NO_CLASS && cls<H5T_NCLASSES); @@ -2674,7 +2674,7 @@ H5Tget_size(hid_t type_id) H5T_t *dt = NULL; size_t size; - FUNC_ENTER(H5Tget_size, 0); + FUNC_ENTER_API(H5Tget_size, 0); H5TRACE1("z","i",type_id); /* Check args */ @@ -2721,7 +2721,7 @@ H5Tset_size(hid_t type_id, size_t size) { H5T_t *dt = NULL; - FUNC_ENTER(H5Tset_size, FAIL); + FUNC_ENTER_API(H5Tset_size, FAIL); H5TRACE2("e","iz",type_id,size); /* Check args */ @@ -2781,7 +2781,7 @@ H5Tget_order(hid_t type_id) H5T_t *dt = NULL; H5T_order_t order; - FUNC_ENTER(H5Tget_order, H5T_ORDER_ERROR); + FUNC_ENTER_API(H5Tget_order, H5T_ORDER_ERROR); H5TRACE1("To","i",type_id); /* Check args */ @@ -2825,7 +2825,7 @@ H5Tset_order(hid_t type_id, H5T_order_t order) { H5T_t *dt = NULL; - FUNC_ENTER(H5Tset_order, FAIL); + FUNC_ENTER_API(H5Tset_order, FAIL); H5TRACE2("e","iTo",type_id,order); /* Check args */ @@ -2884,7 +2884,7 @@ H5Tget_precision(hid_t type_id) H5T_t *dt = NULL; size_t prec; - FUNC_ENTER(H5Tget_precision, 0); + FUNC_ENTER_API(H5Tget_precision, 0); H5TRACE1("z","i",type_id); /* Check args */ @@ -2940,7 +2940,7 @@ H5Tset_precision(hid_t type_id, size_t prec) { H5T_t *dt = NULL; - FUNC_ENTER(H5Tset_precision, FAIL); + FUNC_ENTER_API(H5Tset_precision, FAIL); H5TRACE2("e","iz",type_id,prec); /* Check args */ @@ -3010,7 +3010,7 @@ H5Tget_offset(hid_t type_id) H5T_t *dt = NULL; int offset; - FUNC_ENTER(H5Tget_offset, -1); + FUNC_ENTER_API(H5Tget_offset, -1); H5TRACE1("Is","i",type_id); /* Check args */ @@ -3076,7 +3076,7 @@ H5Tset_offset(hid_t type_id, size_t offset) { H5T_t *dt = NULL; - FUNC_ENTER(H5Tset_offset, FAIL); + FUNC_ENTER_API(H5Tset_offset, FAIL); H5TRACE2("e","iz",type_id,offset); /* Check args */ @@ -3129,7 +3129,7 @@ H5Tget_pad(hid_t type_id, H5T_pad_t *lsb/*out*/, H5T_pad_t *msb/*out*/) { H5T_t *dt = NULL; - FUNC_ENTER(H5Tget_pad, FAIL); + FUNC_ENTER_API(H5Tget_pad, FAIL); H5TRACE3("e","ixx",type_id,lsb,msb); /* Check args */ @@ -3173,7 +3173,7 @@ H5Tset_pad(hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb) { H5T_t *dt = NULL; - FUNC_ENTER(H5Tset_pad, FAIL); + FUNC_ENTER_API(H5Tset_pad, FAIL); H5TRACE3("e","iTpTp",type_id,lsb,msb); /* Check args */ @@ -3229,7 +3229,7 @@ H5Tget_sign(hid_t type_id) H5T_t *dt = NULL; H5T_sign_t sign; - FUNC_ENTER(H5Tget_sign, H5T_SGN_ERROR); + FUNC_ENTER_API(H5Tget_sign, H5T_SGN_ERROR); H5TRACE1("Ts","i",type_id); /* Check args */ @@ -3272,7 +3272,7 @@ H5Tset_sign(hid_t type_id, H5T_sign_t sign) { H5T_t *dt = NULL; - FUNC_ENTER(H5Tset_sign, FAIL); + FUNC_ENTER_API(H5Tset_sign, FAIL); H5TRACE2("e","iTs",type_id,sign); /* Check args */ @@ -3332,7 +3332,7 @@ H5Tget_fields(hid_t type_id, size_t *spos/*out*/, { H5T_t *dt = NULL; - FUNC_ENTER(H5Tget_fields, FAIL); + FUNC_ENTER_API(H5Tget_fields, FAIL); H5TRACE6("e","ixxxxx",type_id,spos,epos,esize,mpos,msize); /* Check args */ @@ -3385,7 +3385,7 @@ H5Tset_fields(hid_t type_id, size_t spos, size_t epos, size_t esize, { H5T_t *dt = NULL; - FUNC_ENTER(H5Tset_fields, FAIL); + FUNC_ENTER_API(H5Tset_fields, FAIL); H5TRACE6("e","izzzzz",type_id,spos,epos,esize,mpos,msize); /* Check args */ @@ -3463,7 +3463,7 @@ H5Tget_ebias(hid_t type_id) H5T_t *dt = NULL; size_t ebias; - FUNC_ENTER(H5Tget_ebias, 0); + FUNC_ENTER_API(H5Tget_ebias, 0); H5TRACE1("z","i",type_id); /* Check args */ @@ -3505,7 +3505,7 @@ H5Tset_ebias(hid_t type_id, size_t ebias) { H5T_t *dt = NULL; - FUNC_ENTER(H5Tset_ebias, FAIL); + FUNC_ENTER_API(H5Tset_ebias, FAIL); H5TRACE2("e","iz",type_id,ebias); /* Check args */ @@ -3554,7 +3554,7 @@ H5Tget_norm(hid_t type_id) H5T_t *dt = NULL; H5T_norm_t norm; - FUNC_ENTER(H5Tget_norm, H5T_NORM_ERROR); + FUNC_ENTER_API(H5Tget_norm, H5T_NORM_ERROR); H5TRACE1("Tn","i",type_id); /* Check args */ @@ -3598,7 +3598,7 @@ H5Tset_norm(hid_t type_id, H5T_norm_t norm) { H5T_t *dt = NULL; - FUNC_ENTER(H5Tset_norm, FAIL); + FUNC_ENTER_API(H5Tset_norm, FAIL); H5TRACE2("e","iTn",type_id,norm); /* Check args */ @@ -3651,7 +3651,7 @@ H5Tget_inpad(hid_t type_id) H5T_t *dt = NULL; H5T_pad_t pad; - FUNC_ENTER(H5Tget_inpad, H5T_PAD_ERROR); + FUNC_ENTER_API(H5Tget_inpad, H5T_PAD_ERROR); H5TRACE1("Tp","i",type_id); /* Check args */ @@ -3697,7 +3697,7 @@ H5Tset_inpad(hid_t type_id, H5T_pad_t pad) { H5T_t *dt = NULL; - FUNC_ENTER(H5Tset_inpad, FAIL); + FUNC_ENTER_API(H5Tset_inpad, FAIL); H5TRACE2("e","iTp",type_id,pad); /* Check args */ @@ -3750,7 +3750,7 @@ H5Tget_cset(hid_t type_id) H5T_t *dt = NULL; H5T_cset_t cset; - FUNC_ENTER(H5Tget_cset, H5T_CSET_ERROR); + FUNC_ENTER_API(H5Tget_cset, H5T_CSET_ERROR); H5TRACE1("Tc","i",type_id); /* Check args */ @@ -3804,7 +3804,7 @@ H5Tset_cset(hid_t type_id, H5T_cset_t cset) { H5T_t *dt = NULL; - FUNC_ENTER(H5Tset_cset, FAIL); + FUNC_ENTER_API(H5Tset_cset, FAIL); H5TRACE2("e","iTc",type_id,cset); /* Check args */ @@ -3868,7 +3868,7 @@ H5Tget_strpad(hid_t type_id) H5T_t *dt = NULL; H5T_str_t strpad; - FUNC_ENTER(H5Tget_strpad, H5T_STR_ERROR); + FUNC_ENTER_API(H5Tget_strpad, H5T_STR_ERROR); H5TRACE1("Tz","i",type_id); /* Check args */ @@ -3932,7 +3932,7 @@ H5Tset_strpad(hid_t type_id, H5T_str_t strpad) { H5T_t *dt = NULL; - FUNC_ENTER(H5Tset_strpad, FAIL); + FUNC_ENTER_API(H5Tset_strpad, FAIL); H5TRACE2("e","iTz",type_id,strpad); /* Check args */ @@ -3994,7 +3994,7 @@ H5Tget_nmembers(hid_t type_id) H5T_t *dt = NULL; int ret_value = FAIL; - FUNC_ENTER(H5Tget_num_members, FAIL); + FUNC_ENTER_API(H5Tget_num_members, FAIL); H5TRACE1("Is","i",type_id); /* Check args */ @@ -4043,7 +4043,7 @@ H5Tget_member_name(hid_t type_id, int membno) H5T_t *dt = NULL; char *ret_value = NULL; - FUNC_ENTER(H5Tget_member_name, NULL); + FUNC_ENTER_API(H5Tget_member_name, NULL); /* Check args */ if (H5I_DATATYPE != H5I_get_type(type_id) || @@ -4103,7 +4103,7 @@ H5Tget_member_index(hid_t type_id, const char *name) int ret_value = FAIL; int nmembs, i; - FUNC_ENTER(H5Tget_member_index, FAIL); + FUNC_ENTER_API(H5Tget_member_index, FAIL); H5TRACE2("Is","is",type_id,name); /* Check arguments */ @@ -4163,7 +4163,7 @@ H5Tget_member_offset(hid_t type_id, int membno) H5T_t *dt = NULL; size_t offset = 0; - FUNC_ENTER(H5Tget_member_offset, 0); + FUNC_ENTER_API(H5Tget_member_offset, 0); H5TRACE2("z","iIs",type_id,membno); /* Check args */ @@ -4205,7 +4205,7 @@ H5Tget_member_class(hid_t type_id, int membno) H5T_t *dt = NULL; H5T_class_t ret_value = H5T_NO_CLASS; - FUNC_ENTER(H5Tget_member_class, H5T_NO_CLASS); + FUNC_ENTER_API(H5Tget_member_class, H5T_NO_CLASS); H5TRACE2("Tt","iIs",type_id,membno); /* Check args */ @@ -4252,7 +4252,7 @@ H5Tget_member_type(hid_t type_id, int membno) H5T_t *dt = NULL, *memb_dt = NULL; hid_t memb_type_id; - FUNC_ENTER(H5Tget_member_type, FAIL); + FUNC_ENTER_API(H5Tget_member_type, FAIL); H5TRACE2("i","iIs",type_id,membno); /* Check args */ @@ -4311,7 +4311,7 @@ H5Tinsert(hid_t parent_id, const char *name, size_t offset, hid_t member_id) H5T_t *parent = NULL; /*the compound parent data type */ H5T_t *member = NULL; /*the atomic member type */ - FUNC_ENTER(H5Tinsert, FAIL); + FUNC_ENTER_API(H5Tinsert, FAIL); H5TRACE4("e","iszi",parent_id,name,offset,member_id); /* Check args */ @@ -4361,7 +4361,7 @@ H5Tpack(hid_t type_id) { H5T_t *dt = NULL; - FUNC_ENTER(H5Tpack, FAIL); + FUNC_ENTER_API(H5Tpack, FAIL); H5TRACE1("e","i",type_id); /* Check args */ @@ -4408,7 +4408,7 @@ H5Tenum_create(hid_t parent_id) H5T_t *dt = NULL; /*new enumeration data type */ hid_t ret_value = FAIL; /*return value */ - FUNC_ENTER(H5Tenum_create, FAIL); + FUNC_ENTER_API(H5Tenum_create, FAIL); H5TRACE1("i","i",parent_id); /* Check args */ @@ -4464,7 +4464,7 @@ H5Tenum_insert(hid_t type, const char *name, void *value) { H5T_t *dt=NULL; - FUNC_ENTER(H5Tenum_insert, FAIL); + FUNC_ENTER_API(H5Tenum_insert, FAIL); H5TRACE3("e","isx",type,name,value); /* Check args */ @@ -4516,7 +4516,7 @@ H5Tget_super(hid_t type) H5T_t *dt=NULL, *super=NULL; hid_t ret_value=FAIL; - FUNC_ENTER(H5Tget_super, FAIL); + FUNC_ENTER_API(H5Tget_super, FAIL); H5TRACE1("i","i",type); if (H5I_DATATYPE!=H5I_get_type(type) || @@ -4562,7 +4562,7 @@ H5Tget_member_value(hid_t type, int membno, void *value/*out*/) { H5T_t *dt=NULL; - FUNC_ENTER(H5Tget_member_value, FAIL); + FUNC_ENTER_API(H5Tget_member_value, FAIL); H5TRACE3("i","iIsx",type,membno,value); if (H5I_DATATYPE!=H5I_get_type(type) || @@ -4613,7 +4613,7 @@ H5Tenum_nameof(hid_t type, void *value, char *name/*out*/, size_t size) { H5T_t *dt = NULL; - FUNC_ENTER(H5Tenum_nameof, FAIL); + FUNC_ENTER_API(H5Tenum_nameof, FAIL); H5TRACE4("e","ixxz",type,value,name,size); /* Check args */ @@ -4663,7 +4663,7 @@ H5Tenum_valueof(hid_t type, const char *name, void *value/*out*/) { H5T_t *dt = NULL; - FUNC_ENTER(H5Tenum_valueof, FAIL); + FUNC_ENTER_API(H5Tenum_valueof, FAIL); H5TRACE3("e","isx",type,name,value); /* Check args */ @@ -4769,7 +4769,7 @@ H5Tvlen_create(hid_t base_id) H5T_t *dt = NULL; /*new data type */ hid_t ret_value = FAIL; /*return value */ - FUNC_ENTER(H5Tvlen_create, FAIL); + FUNC_ENTER_API(H5Tvlen_create, FAIL); H5TRACE1("i","i",base_id); /* Check args */ @@ -4807,7 +4807,7 @@ H5Tset_tag(hid_t type_id, const char *tag) { H5T_t *dt=NULL; - FUNC_ENTER(H5Tset_tag, FAIL); + FUNC_ENTER_API(H5Tset_tag, FAIL); H5TRACE2("e","is",type_id,tag); /* Check args */ @@ -4853,7 +4853,7 @@ H5Tget_tag(hid_t type_id) H5T_t *dt=NULL; char *ret_value=NULL; - FUNC_ENTER(H5Tget_tag, NULL); + FUNC_ENTER_API(H5Tget_tag, NULL); /* Check args */ if (H5I_DATATYPE != H5I_get_type(type_id) || NULL == (dt = H5I_object(type_id))) @@ -5067,7 +5067,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(H5Tregister, FAIL); + FUNC_ENTER_API(H5Tregister, FAIL); H5TRACE5("e","Tesiix",pers,name,src_id,dst_id,func); /* Check args */ @@ -5118,7 +5118,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(H5T_unregister, FAIL); + FUNC_ENTER_NOAPI(H5T_unregister, FAIL); /* Remove matching entries from the soft list */ if (H5T_PERS_DONTCARE==pers || H5T_PERS_SOFT==pers) { @@ -5199,7 +5199,7 @@ H5Tunregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id, { H5T_t *src=NULL, *dst=NULL; /*data type descriptors */ - FUNC_ENTER(H5Tunregister, FAIL); + FUNC_ENTER_API(H5Tunregister, FAIL); H5TRACE5("e","Tesiix",pers,name,src_id,dst_id,func); /* Check arguments */ @@ -5246,7 +5246,7 @@ H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata) H5T_t *src = NULL, *dst = NULL; H5T_path_t *path = NULL; - FUNC_ENTER(H5Tfind, NULL); + FUNC_ENTER_API(H5Tfind, NULL); H5TRACE3("x","iix",src_id,dst_id,pcdata); /* Check args */ @@ -5307,7 +5307,7 @@ H5Tconvert(hid_t src_id, hid_t dst_id, hsize_t nelmts, void *buf, H5T_path_t *tpath=NULL; /*type conversion info */ H5T_t *src=NULL, *dst=NULL; /*unatomized types */ - FUNC_ENTER (H5Tconvert, FAIL); + FUNC_ENTER_API(H5Tconvert, FAIL); H5TRACE6("e","iihxxi",src_id,dst_id,nelmts,buf,background,plist_id); /* Check args */ @@ -5355,7 +5355,7 @@ H5Tconvert(hid_t src_id, hid_t dst_id, hsize_t nelmts, void *buf, H5T_overflow_t H5Tget_overflow(void) { - FUNC_ENTER(H5Tget_overflow, NULL); + FUNC_ENTER_API(H5Tget_overflow, NULL); H5TRACE0("x",""); if (NULL==H5T_overflow_g) { @@ -5388,9 +5388,11 @@ H5Tget_overflow(void) herr_t H5Tset_overflow(H5T_overflow_t func) { - FUNC_ENTER(H5Tset_overflow, FAIL); + FUNC_ENTER_API(H5Tset_overflow, FAIL); H5TRACE1("e","x",func); + H5T_overflow_g = func; + FUNC_LEAVE(SUCCEED); } @@ -5424,7 +5426,7 @@ H5T_create(H5T_class_t type, size_t size) H5T_t *dt = NULL; hid_t subtype; - FUNC_ENTER(H5T_create, NULL); + FUNC_ENTER_NOAPI(H5T_create, NULL); assert(size > 0); @@ -5517,7 +5519,7 @@ H5T_isa(H5G_entry_t *ent) { htri_t exists; - FUNC_ENTER(H5T_isa, FAIL); + FUNC_ENTER_NOAPI(H5T_isa, FAIL); assert(ent); if ((exists=H5O_exists(ent, H5O_DTYPE, 0))<0) { @@ -5551,7 +5553,8 @@ H5T_open (H5G_entry_t *loc, const char *name) H5T_t *dt = NULL; H5G_entry_t ent; - FUNC_ENTER (H5T_open, NULL); + FUNC_ENTER_NOAPI(H5T_open, NULL); + assert (loc); assert (name && *name); @@ -5592,7 +5595,8 @@ H5T_open_oid (H5G_entry_t *ent) { H5T_t *dt = NULL; - FUNC_ENTER (H5T_open_oid, NULL); + FUNC_ENTER_NOAPI(H5T_open_oid, NULL); + assert (ent); if (H5O_open (ent)<0) { @@ -5653,7 +5657,7 @@ H5T_copy(const H5T_t *old_dt, H5T_copy_t method) int i; char *s; - FUNC_ENTER(H5T_copy, NULL); + FUNC_ENTER_NOAPI(H5T_copy, NULL); /* check args */ assert(old_dt); @@ -5843,7 +5847,7 @@ H5T_commit (H5G_entry_t *loc, const char *name, H5T_t *type) herr_t ret_value = FAIL; H5F_t *file = NULL; - FUNC_ENTER (H5T_commit, FAIL); + FUNC_ENTER_NOAPI(H5T_commit, FAIL); /* * Check arguments. We cannot commit an immutable type because H5Tclose() @@ -5920,7 +5924,7 @@ H5T_commit (H5G_entry_t *loc, const char *name, H5T_t *type) herr_t H5T_lock (H5T_t *dt, hbool_t immutable) { - FUNC_ENTER (H5T_lock, FAIL); + FUNC_ENTER_NOAPI(H5T_lock, FAIL); assert (dt); switch (dt->state) { @@ -5966,7 +5970,8 @@ H5T_close(H5T_t *dt) int i; H5T_t *parent = dt->parent; - FUNC_ENTER(H5T_close, FAIL); + FUNC_ENTER_NOAPI(H5T_close, FAIL); + assert(dt); /* @@ -6048,9 +6053,10 @@ H5T_is_atomic(const H5T_t *dt) { htri_t ret_value = FAIL; - FUNC_ENTER(H5T_is_atomic, FAIL); + FUNC_ENTER_NOAPI(H5T_is_atomic, FAIL); assert(dt); + if (H5T_COMPOUND!=dt->type && H5T_ENUM!=dt->type && H5T_VLEN!=dt->type && H5T_OPAQUE!=dt->type && H5T_ARRAY!=dt->type) { ret_value = TRUE; } else { @@ -6096,7 +6102,7 @@ H5T_set_size(H5T_t *dt, size_t size) { size_t prec, offset; - FUNC_ENTER(H5T_set_size, FAIL); + FUNC_ENTER_NOAPI(H5T_set_size, FAIL); /* Check args */ assert(dt); @@ -6236,7 +6242,8 @@ H5T_set_size(H5T_t *dt, size_t size) size_t H5T_get_size(const H5T_t *dt) { - FUNC_ENTER(H5T_get_size, 0); + /* Use FUNC_ENTER_NOINIT here to avoid performance issues */ + FUNC_ENTER_NOINIT(H5T_get_size); /* check args */ assert(dt); @@ -6279,7 +6286,7 @@ H5T_set_precision(H5T_t *dt, size_t prec) { size_t offset, size; - FUNC_ENTER(H5T_set_precision, FAIL); + FUNC_ENTER_NOAPI(H5T_set_precision, FAIL); /* Check args */ assert(dt); @@ -6394,7 +6401,7 @@ H5T_set_precision(H5T_t *dt, size_t prec) herr_t H5T_set_offset(H5T_t *dt, size_t offset) { - FUNC_ENTER(H5T_set_offset, FAIL); + FUNC_ENTER_NOAPI(H5T_set_offset, FAIL); /* Check args */ assert(dt); @@ -6449,7 +6456,7 @@ H5T_insert(H5T_t *parent, const char *name, size_t offset, const H5T_t *member) int idx, i; size_t total_size; - FUNC_ENTER(H5T_insert, FAIL); + FUNC_ENTER_NOAPI(H5T_insert, FAIL); /* check args */ assert(parent && H5T_COMPOUND == parent->type); @@ -6542,7 +6549,7 @@ H5T_pack(H5T_t *dt) int i; size_t offset; - FUNC_ENTER(H5T_pack, FAIL); + FUNC_ENTER_NOAPI(H5T_pack, FAIL); assert(dt); @@ -6598,7 +6605,7 @@ H5T_sort_value(H5T_t *dt, int *map) hbool_t swapped; uint8_t tbuf[32]; - FUNC_ENTER(H5T_sort_value, FAIL); + FUNC_ENTER_NOAPI(H5T_sort_value, FAIL); /* Check args */ assert(dt); @@ -6707,7 +6714,7 @@ H5T_sort_name(H5T_t *dt, int *map) hbool_t swapped; uint8_t tbuf[32]; - FUNC_ENTER(H5T_sort_name, FAIL); + FUNC_ENTER_NOAPI(H5T_sort_name, FAIL); /* Check args */ assert(dt); @@ -6814,7 +6821,8 @@ H5T_enum_insert(H5T_t *dt, const char *name, void *value) char **names=NULL; uint8_t *values=NULL; - FUNC_ENTER(H5T_enum_insert, FAIL); + FUNC_ENTER_NOAPI(H5T_enum_insert, FAIL); + assert(dt); assert(name && *name); assert(value); @@ -6889,7 +6897,7 @@ H5T_enum_nameof(H5T_t *dt, void *value, char *name/*out*/, size_t size) int lt, md, rt; /*indices for binary search */ int cmp; /*comparison result */ - FUNC_ENTER(H5T_enum_nameof, NULL); + FUNC_ENTER_NOAPI(H5T_enum_nameof, NULL); /* Check args */ assert(dt && H5T_ENUM==dt->type); @@ -6958,7 +6966,7 @@ H5T_enum_valueof(H5T_t *dt, const char *name, void *value/*out*/) int lt, md, rt; /*indices for binary search */ int cmp; /*comparison result */ - FUNC_ENTER(H5T_enum_nameof, FAIL); + FUNC_ENTER_NOAPI(H5T_enum_nameof, FAIL); /* Check args */ assert(dt && H5T_ENUM==dt->type); @@ -7023,7 +7031,7 @@ H5T_cmp(const H5T_t *dt1, const H5T_t *dt2) hbool_t swapped; size_t base_size; - FUNC_ENTER(H5T_cmp, 0); + FUNC_ENTER_NOAPI(H5T_cmp, 0); /* the easy case */ if (dt1 == dt2) HGOTO_DONE(0); @@ -7433,7 +7441,8 @@ H5T_path_find(const H5T_t *src, const H5T_t *dst, const char *name, int i; /*counter */ int nprint=0; /*lines of output printed */ - FUNC_ENTER(H5T_path_find, NULL); + FUNC_ENTER_NOAPI(H5T_path_find, NULL); + assert((!src && !dst) || (src && dst)); /* @@ -7730,7 +7739,7 @@ H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id, hsize_t nelmts, H5_timer_t timer; #endif - FUNC_ENTER(H5T_convert, FAIL); + FUNC_ENTER_NOAPI(H5T_convert, FAIL); #ifdef H5T_DEBUG if (H5DEBUG(T)) H5_timer_begin(&timer); @@ -7774,7 +7783,8 @@ H5T_entof (H5T_t *dt) { H5G_entry_t *ret_value = NULL; - FUNC_ENTER (H5T_entof, NULL); + FUNC_ENTER_NOAPI(H5T_entof, NULL); + assert (dt); switch (dt->state) { @@ -7814,7 +7824,8 @@ H5T_is_immutable(H5T_t *dt) { htri_t ret_value = FALSE; - FUNC_ENTER(H5T_is_immutable, FAIL); + FUNC_ENTER_NOAPI(H5T_is_immutable, FAIL); + assert(dt); if(dt->state == H5T_STATE_IMMUTABLE) @@ -7849,7 +7860,7 @@ H5T_get_ref_type(const H5T_t *dt) { H5R_type_t ret_value = H5R_BADTYPE; - FUNC_ENTER(H5T_get_ref_type, H5R_BADTYPE); + FUNC_ENTER_NOAPI(H5T_get_ref_type, H5R_BADTYPE); assert(dt); @@ -7896,7 +7907,7 @@ H5Tarray_create(hid_t base_id, int ndims, const hsize_t dim[/* ndims */], int i; /* local index variable */ hid_t ret_value = FAIL; /* return value */ - FUNC_ENTER(H5Tarray_create, FAIL); + FUNC_ENTER_API(H5Tarray_create, FAIL); H5TRACE4("i","iIs*h*Is",base_id,ndims,dim,perm); /* Check args */ @@ -7950,7 +7961,7 @@ H5T_array_create(H5T_t *base, int ndims, const hsize_t dim[/* ndims */], H5T_t *ret_value = NULL; /*new array data type */ int i; /* local index variable */ - FUNC_ENTER(H5T_array_create, NULL); + FUNC_ENTER_NOAPI(H5T_array_create, NULL); assert(base); assert(ndims>0 && ndims<=H5S_MAX_RANK); @@ -8014,7 +8025,7 @@ H5Tget_array_ndims(hid_t type_id) H5T_t *dt = NULL; /* pointer to array data type */ int ret_value = FAIL; /* return value */ - FUNC_ENTER(H5Tget_array_ndims, FAIL); + FUNC_ENTER_API(H5Tget_array_ndims, FAIL); H5TRACE1("Is","i",type_id); /* Check args */ @@ -8052,7 +8063,7 @@ H5Tget_array_dims(hid_t type_id, hsize_t dims[], int perm[]) herr_t ret_value = SUCCEED; /* return value */ int i; /* Local index variable */ - FUNC_ENTER(H5Tget_array_dims, FAIL); + FUNC_ENTER_API(H5Tget_array_dims, FAIL); H5TRACE3("e","i*h*Is",type_id,dims,perm); /* Check args */ @@ -8162,7 +8173,7 @@ H5T_debug(const H5T_t *dt, FILE *stream) size_t k, base_size; uint64_t tmp; - FUNC_ENTER(H5T_debug, FAIL); + FUNC_ENTER_NOAPI(H5T_debug, FAIL); /* Check args */ assert(dt); @@ -172,7 +172,7 @@ H5TB_dmake(H5TB_cmp_t cmp, int arg, unsigned fast_compare) { H5TB_TREE *tree; - FUNC_ENTER (H5TB_dmake, NULL); + FUNC_ENTER_NOAPI(H5TB_dmake, NULL); if (NULL == (tree = H5MM_malloc(sizeof(H5TB_TREE)))) HRETURN_ERROR (H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed"); @@ -216,7 +216,7 @@ H5TB_dfind(H5TB_TREE * tree, void * key, H5TB_NODE ** pp) { H5TB_NODE *ret_value=NULL; - FUNC_ENTER (H5TB_dfind, NULL); + FUNC_ENTER_NOAPI(H5TB_dfind, NULL); assert(tree); @@ -265,7 +265,7 @@ H5TB_find(H5TB_NODE * root, void * key, int cmp = 1; int side; - FUNC_ENTER (H5TB_find, NULL); + FUNC_ENTER_NOAPI(H5TB_find, NULL); if(ptr) { @@ -313,7 +313,7 @@ H5TB_find(H5TB_NODE * root, void * key, H5TB_NODE * H5TB_dless(H5TB_TREE * tree, void * key, H5TB_NODE ** pp) { - FUNC_ENTER(H5TB_dless,NULL); + FUNC_ENTER_NOAPI(H5TB_dless,NULL); assert(tree); @@ -355,7 +355,7 @@ H5TB_less(H5TB_NODE * root, void * key, H5TB_cmp_t compar, int arg, H5TB_NODE ** int cmp = 1; int side; - FUNC_ENTER(H5TB_less,NULL); + FUNC_ENTER_NOAPI(H5TB_less,NULL); /* Try to find an exact match */ if (ptr) { @@ -415,7 +415,7 @@ H5TB_index(H5TB_NODE * root, unsigned indx) { H5TB_NODE *ptr = root; - FUNC_ENTER(H5TB_index,NULL); + FUNC_ENTER_NOAPI(H5TB_index,NULL); if (NULL != ptr) { /* Termination condition is if the index equals the number of children on @@ -468,7 +468,7 @@ H5TB_dins(H5TB_TREE * tree, void * item, void * key) { H5TB_NODE *ret_node; /* the node to return */ - FUNC_ENTER(H5TB_dins,NULL); + FUNC_ENTER_NOAPI(H5TB_dins,NULL); assert(tree); @@ -510,7 +510,7 @@ H5TB_ins(H5TB_NODE ** root, void * item, void * key, H5TB_cmp_t compar, int arg) int cmp; H5TB_NODE *ptr, *parent; - FUNC_ENTER(H5TB_ins,NULL); + FUNC_ENTER_NOAPI(H5TB_ins,NULL); assert(root); assert(item); @@ -589,7 +589,7 @@ H5TB_rem(H5TB_NODE ** root, H5TB_NODE * node, void * *kp) int side; /* `leaf' is `side' child of `par' */ void * data; /* Saved pointer to data item of deleted node */ - FUNC_ENTER(H5TB_rem, NULL); + FUNC_ENTER_NOAPI(H5TB_rem, NULL); if (NULL == root || NULL == node) HRETURN_ERROR (H5E_ARGS, H5E_BADVALUE, NULL, "bad arguments to delete"); @@ -737,7 +737,7 @@ H5TB_rem(H5TB_NODE ** root, H5TB_NODE * node, void * *kp) H5TB_NODE * H5TB_first(H5TB_NODE * root) { - FUNC_ENTER(H5TB_first,NULL); + FUNC_ENTER_NOAPI(H5TB_first,NULL); FUNC_LEAVE(H5TB_end(root, LEFT)); } /* end H5TB_first() */ @@ -766,7 +766,7 @@ H5TB_first(H5TB_NODE * root) H5TB_NODE * H5TB_last(H5TB_NODE * root) { - FUNC_ENTER(H5TB_last,NULL); + FUNC_ENTER_NOAPI(H5TB_last,NULL); FUNC_LEAVE(H5TB_end(root, RIGHT)); } /* end H5TB_last() */ @@ -794,7 +794,7 @@ H5TB_last(H5TB_NODE * root) H5TB_NODE * H5TB_next(H5TB_NODE * node) { - FUNC_ENTER(H5TB_next,NULL); + FUNC_ENTER_NOAPI(H5TB_next,NULL); FUNC_LEAVE(H5TB_nbr(node, RIGHT)); } /* end H5TB_next() */ @@ -822,7 +822,7 @@ H5TB_next(H5TB_NODE * node) H5TB_NODE * H5TB_prev(H5TB_NODE * node) { - FUNC_ENTER(H5TB_prev,NULL); + FUNC_ENTER_NOAPI(H5TB_prev,NULL); FUNC_LEAVE (H5TB_nbr(node, LEFT)); } /* end H5TB_prev() */ @@ -856,7 +856,7 @@ H5TB_prev(H5TB_NODE * node) H5TB_TREE * H5TB_dfree(H5TB_TREE * tree, void(*fd) (void * /* item */), void(*fk) (void * /* key */)) { - FUNC_ENTER(H5TB_dfree,NULL); + FUNC_ENTER_NOAPI(H5TB_dfree,NULL); if (tree == NULL) HRETURN(NULL); @@ -901,7 +901,7 @@ H5TB_free(H5TB_NODE ** root, void(*fd) (void * /* item */), void(*fk) (void * /* { H5TB_NODE *par, *node = *root; - FUNC_ENTER(H5TB_free,NULL); + FUNC_ENTER_NOAPI(H5TB_free,NULL); /* While nodes left to be free()d */ while (NULL != *root) { @@ -960,7 +960,7 @@ H5TB_free(H5TB_NODE ** root, void(*fd) (void * /* item */), void(*fk) (void * /* long H5TB_count(H5TB_TREE * tree) { - FUNC_ENTER(H5TB_count,FAIL); + FUNC_ENTER_NOAPI(H5TB_count,FAIL); FUNC_LEAVE((tree==NULL) ? FAIL : (long)tree->count ); } /* end H5TB_count() */ @@ -991,7 +991,7 @@ H5TB_count(H5TB_TREE * tree) herr_t H5TB_dump(H5TB_TREE *tree, void (*key_dump)(void *,void *), int method) { - FUNC_ENTER(H5TB_dump,FAIL); + FUNC_ENTER_NOAPI(H5TB_dump,FAIL); printf("H5TB-tree dump %p:\n",tree); printf("capacity = %ld\n\n",(long)tree->count); diff --git a/src/H5Tbit.c b/src/H5Tbit.c index a89e2e8..0813f46 100644 --- a/src/H5Tbit.c +++ b/src/H5Tbit.c @@ -171,7 +171,8 @@ H5T_bit_get_d (uint8_t *buf, size_t offset, size_t size) hsize_t val=0; size_t i, hs; - FUNC_ENTER (H5T_bit_get_d, 0); + FUNC_ENTER_NOAPI(H5T_bit_get_d, 0); + assert (8*sizeof(val)>=size); H5T_bit_copy ((uint8_t*)&val, 0, buf, offset, size); diff --git a/src/H5Tconv.c b/src/H5Tconv.c index 56c05b2..1c23fc3 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -427,7 +427,7 @@ H5T_conv_noop(hid_t UNUSED src_id, hid_t UNUSED dst_id, H5T_cdata_t *cdata, size_t UNUSED bkg_stride, void UNUSED *buf, void UNUSED *background, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_noop, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_noop, FAIL); switch (cdata->command) { case H5T_CONV_INIT: @@ -478,7 +478,7 @@ H5T_conv_order_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, H5T_t *dst = NULL; hsize_t i; - FUNC_ENTER(H5T_conv_order_opt, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_order_opt, FAIL); switch (cdata->command) { case H5T_CONV_INIT: @@ -874,7 +874,7 @@ H5T_conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, hsize_t i; size_t j, md; - FUNC_ENTER(H5T_conv_order, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_order, FAIL); switch (cdata->command) { case H5T_CONV_INIT: @@ -986,7 +986,7 @@ H5T_conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t msb_pad_offset; /*offset for dest MSB padding */ size_t i; - FUNC_ENTER(H5T_conv_b_b, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_b_b, FAIL); switch(cdata->command) { case H5T_CONV_INIT: @@ -1358,7 +1358,7 @@ H5T_conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, int i; /*counters */ H5T_conv_struct_t *priv = (H5T_conv_struct_t *)(cdata->priv); - FUNC_ENTER (H5T_conv_struct, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_struct, FAIL); switch (cdata->command) { case H5T_CONV_INIT: @@ -1603,7 +1603,7 @@ H5T_conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, int i; /*counters */ H5T_conv_struct_t *priv = NULL; /*private data */ - FUNC_ENTER (H5T_conv_struct_opt, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_struct_opt, FAIL); switch (cdata->command) { case H5T_CONV_INIT: @@ -1991,7 +1991,8 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, hsize_t i; /*counters */ H5T_enum_struct_t *priv = (H5T_enum_struct_t*)(cdata->priv); - FUNC_ENTER(H5T_conv_enum, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_enum, FAIL); + switch (cdata->command) { case H5T_CONV_INIT: /* @@ -2182,7 +2183,7 @@ H5T_conv_vlen(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, int direction; /*direction of traversal */ hsize_t elmtno; /*element number counter */ - FUNC_ENTER (H5T_conv_vlen, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_vlen, FAIL); switch (cdata->command) { case H5T_CONV_INIT: @@ -2411,7 +2412,7 @@ H5T_conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, void *bkg_buf=NULL; /*temporary background buffer */ size_t bkg_buf_size=0; /*size of background buffer in bytes */ - FUNC_ENTER (H5T_conv_array, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_array, FAIL); switch (cdata->command) { case H5T_CONV_INIT: @@ -2577,7 +2578,7 @@ H5T_conv_i_i (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, ssize_t sfirst; /*a signed version of `first' */ size_t i; - FUNC_ENTER (H5T_conv_i_i, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_i_i, FAIL); switch (cdata->command) { case H5T_CONV_INIT: @@ -2926,7 +2927,7 @@ H5T_conv_f_f (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t i; /*miscellaneous counters */ hsize_t implied; /*destination implied bits */ - FUNC_ENTER (H5T_conv_f_f, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_f_f, FAIL); switch (cdata->command) { case H5T_CONV_INIT: @@ -3354,7 +3355,7 @@ H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, uint8_t *dbuf=NULL; /*temp buf for overlap convers. */ herr_t ret_value=FAIL; /*return value */ - FUNC_ENTER(H5T_conv_s_s, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_s_s, FAIL); switch (cdata->command) { case H5T_CONV_INIT: @@ -3586,9 +3587,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_schar_uchar, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_schar_uchar, FAIL); + H5T_CONV_su(SCHAR, UCHAR, signed char, unsigned char); + FUNC_LEAVE(SUCCEED); } @@ -3615,10 +3618,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_uchar_schar, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_uchar_schar, FAIL); + H5T_CONV_us(UCHAR, SCHAR, unsigned char, signed char, SCHAR_MAX); + FUNC_LEAVE(SUCCEED); } @@ -3645,9 +3650,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_schar_short, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_schar_short, FAIL); + H5T_CONV_sS(SCHAR, SHORT, signed char, short); + FUNC_LEAVE(SUCCEED); } @@ -3674,9 +3681,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_schar_ushort, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_schar_ushort, FAIL); + H5T_CONV_sU(SCHAR, USHORT, signed char, unsigned short); + FUNC_LEAVE(SUCCEED); } @@ -3703,10 +3712,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_uchar_short, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_uchar_short, FAIL); + H5T_CONV_uS(UCHAR, SHORT, unsigned char, short, SHRT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -3733,9 +3744,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_uchar_ushort, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_uchar_ushort, FAIL); + H5T_CONV_uU(UCHAR, USHORT, unsigned char, unsigned short); + FUNC_LEAVE(SUCCEED); } @@ -3761,9 +3774,11 @@ H5T_conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_schar_int, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_schar_int, FAIL); + H5T_CONV_sS(SCHAR, INT, signed char, int); + FUNC_LEAVE(SUCCEED); } @@ -3789,9 +3804,11 @@ H5T_conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_schar_uint, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_schar_uint, FAIL); + H5T_CONV_sU(SCHAR, UINT, signed char, unsigned); + FUNC_LEAVE(SUCCEED); } @@ -3817,10 +3834,12 @@ H5T_conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_uchar_int, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_uchar_int, FAIL); + H5T_CONV_uS(UCHAR, INT, unsigned char, int, INT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -3846,9 +3865,11 @@ H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_uchar_uint, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_uchar_uint, FAIL); + H5T_CONV_uU(UCHAR, UINT, unsigned char, unsigned); + FUNC_LEAVE(SUCCEED); } @@ -3874,9 +3895,11 @@ H5T_conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_schar_long, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_schar_long, FAIL); + H5T_CONV_sS(SCHAR, LONG, signed char, long); + FUNC_LEAVE(SUCCEED); } @@ -3903,9 +3926,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_schar_ulong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_schar_ulong, FAIL); + H5T_CONV_sU(SCHAR, ULONG, signed char, unsigned long); + FUNC_LEAVE(SUCCEED); } @@ -3931,10 +3956,12 @@ H5T_conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_uchar_long, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_uchar_long, FAIL); + H5T_CONV_uS(UCHAR, LONG, unsigned char, long, LONG_MAX); + FUNC_LEAVE(SUCCEED); } @@ -3961,9 +3988,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_uchar_ulong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_uchar_ulong, FAIL); + H5T_CONV_uU(UCHAR, ULONG, unsigned char, unsigned long); + FUNC_LEAVE(SUCCEED); } @@ -3990,9 +4019,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_schar_llong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_schar_llong, FAIL); + H5T_CONV_sS(SCHAR, LLONG, signed char, long_long); + FUNC_LEAVE(SUCCEED); } @@ -4019,9 +4050,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_schar_ullong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_schar_ullong, FAIL); + H5T_CONV_sU(SCHAR, ULLONG, signed char, unsigned long_long); + FUNC_LEAVE(SUCCEED); } @@ -4048,10 +4081,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_uchar_llong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_uchar_llong, FAIL); + H5T_CONV_uS(UCHAR, LLONG, unsigned char, long_long, LLONG_MAX); + FUNC_LEAVE(SUCCEED); } @@ -4078,9 +4113,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_uchar_ullong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_uchar_ullong, FAIL); + H5T_CONV_uU(UCHAR, ULLONG, unsigned char, unsigned long_long); + FUNC_LEAVE(SUCCEED); } @@ -4107,10 +4144,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_short_schar, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_short_schar, FAIL); + H5T_CONV_Ss(SHORT, SCHAR, short, signed char, SCHAR_MIN, SCHAR_MAX); + FUNC_LEAVE(SUCCEED); } @@ -4137,10 +4176,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_short_uchar, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_short_uchar, FAIL); + H5T_CONV_Su(SHORT, UCHAR, short, unsigned char, UCHAR_MAX); + FUNC_LEAVE(SUCCEED); } @@ -4167,10 +4208,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ushort_schar, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ushort_schar, FAIL); + H5T_CONV_Us(USHORT, SCHAR, unsigned short, signed char, SCHAR_MAX); + FUNC_LEAVE(SUCCEED); } @@ -4197,10 +4240,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ushort_uchar, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ushort_uchar, FAIL); + H5T_CONV_Uu(USHORT, UCHAR, unsigned short, unsigned char, UCHAR_MAX); + FUNC_LEAVE(SUCCEED); } @@ -4227,9 +4272,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_short_ushort, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_short_ushort, FAIL); + H5T_CONV_su(SHORT, USHORT, short, unsigned short); + FUNC_LEAVE(SUCCEED); } @@ -4256,10 +4303,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ushort_short, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ushort_short, FAIL); + H5T_CONV_us(USHORT, SHORT, unsigned short, short, SHRT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -4286,9 +4335,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_short_int, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_short_int, FAIL); + H5T_CONV_sS(SHORT, INT, short, int); + FUNC_LEAVE(SUCCEED); } @@ -4315,9 +4366,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_short_uint, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_short_uint, FAIL); + H5T_CONV_sU(SHORT, UINT, short, unsigned); + FUNC_LEAVE(SUCCEED); } @@ -4344,10 +4397,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ushort_int, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ushort_int, FAIL); + H5T_CONV_uS(USHORT, INT, unsigned short, int, INT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -4374,9 +4429,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ushort_uint, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ushort_uint, FAIL); + H5T_CONV_uU(USHORT, UINT, unsigned short, unsigned); + FUNC_LEAVE(SUCCEED); } @@ -4403,9 +4460,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_short_long, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_short_long, FAIL); + H5T_CONV_sS(SHORT, LONG, short, long); + FUNC_LEAVE(SUCCEED); } @@ -4432,9 +4491,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_short_ulong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_short_ulong, FAIL); + H5T_CONV_sU(SHORT, ULONG, short, unsigned long); + FUNC_LEAVE(SUCCEED); } @@ -4461,10 +4522,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ushort_long, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ushort_long, FAIL); + H5T_CONV_uS(USHORT, LONG, unsigned short, long, LONG_MAX); + FUNC_LEAVE(SUCCEED); } @@ -4491,9 +4554,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ushort_ulong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ushort_ulong, FAIL); + H5T_CONV_uU(USHORT, ULONG, unsigned short, unsigned long); + FUNC_LEAVE(SUCCEED); } @@ -4520,9 +4585,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_short_llong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_short_llong, FAIL); + H5T_CONV_sS(SHORT, LLONG, short, long_long); + FUNC_LEAVE(SUCCEED); } @@ -4549,9 +4616,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_short_ullong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_short_ullong, FAIL); + H5T_CONV_sU(SHORT, ULLONG, short, unsigned long_long); + FUNC_LEAVE(SUCCEED); } @@ -4578,10 +4647,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ushort_llong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ushort_llong, FAIL); + H5T_CONV_uS(USHORT, LLONG, unsigned short, long_long, LLONG_MAX); + FUNC_LEAVE(SUCCEED); } @@ -4608,9 +4679,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ushort_ullong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ushort_ullong, FAIL); + H5T_CONV_uU(USHORT, ULLONG, unsigned short, unsigned long_long); + FUNC_LEAVE(SUCCEED); } @@ -4637,10 +4710,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_int_schar, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_int_schar, FAIL); + H5T_CONV_Ss(INT, SCHAR, int, signed char, SCHAR_MIN, SCHAR_MAX); + FUNC_LEAVE(SUCCEED); } @@ -4667,10 +4742,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_int_uchar, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_int_uchar, FAIL); + H5T_CONV_Su(INT, UCHAR, int, unsigned char, UCHAR_MAX); + FUNC_LEAVE(SUCCEED); } @@ -4697,10 +4774,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_uint_schar, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_uint_schar, FAIL); + H5T_CONV_Us(UINT, SCHAR, unsigned, signed char, SCHAR_MAX); + FUNC_LEAVE(SUCCEED); } @@ -4727,10 +4806,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_uint_uchar, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_uint_uchar, FAIL); + H5T_CONV_Uu(UINT, UCHAR, unsigned, unsigned char, UCHAR_MAX); + FUNC_LEAVE(SUCCEED); } @@ -4757,10 +4838,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_int_short, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_int_short, FAIL); + H5T_CONV_Ss(INT, SHORT, int, short, SHRT_MIN, SHRT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -4787,10 +4870,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_int_ushort, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_int_ushort, FAIL); + H5T_CONV_Su(INT, USHORT, int, unsigned short, USHRT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -4817,10 +4902,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_uint_short, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_uint_short, FAIL); + H5T_CONV_Us(UINT, SHORT, unsigned, short, SHRT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -4847,10 +4934,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_uint_ushort, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_uint_ushort, FAIL); + H5T_CONV_Uu(UINT, USHORT, unsigned, unsigned short, USHRT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -4876,9 +4965,11 @@ H5T_conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_int_uint, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_int_uint, FAIL); + H5T_CONV_su(INT, UINT, int, unsigned); + FUNC_LEAVE(SUCCEED); } @@ -4904,10 +4995,12 @@ H5T_conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_uint_int, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_uint_int, FAIL); + H5T_CONV_us(UINT, INT, unsigned, int, INT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -4933,9 +5026,11 @@ H5T_conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_int_long, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_int_long, FAIL); + H5T_CONV_sS(INT, LONG, int, long); + FUNC_LEAVE(SUCCEED); } @@ -4961,9 +5056,11 @@ H5T_conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_int_ulong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_int_ulong, FAIL); + H5T_CONV_sU(INT, LONG, int, unsigned long); + FUNC_LEAVE(SUCCEED); } @@ -4989,10 +5086,12 @@ H5T_conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_uint_long, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_uint_long, FAIL); + H5T_CONV_uS(UINT, LONG, unsigned, long, LONG_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5018,9 +5117,11 @@ H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_uint_ulong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_uint_ulong, FAIL); + H5T_CONV_uU(UINT, ULONG, unsigned, unsigned long); + FUNC_LEAVE(SUCCEED); } @@ -5046,9 +5147,11 @@ H5T_conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_int_llong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_int_llong, FAIL); + H5T_CONV_sS(INT, LLONG, int, long_long); + FUNC_LEAVE(SUCCEED); } @@ -5074,9 +5177,11 @@ H5T_conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_int_ullong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_int_ullong, FAIL); + H5T_CONV_sU(INT, ULLONG, int, unsigned long_long); + FUNC_LEAVE(SUCCEED); } @@ -5102,10 +5207,12 @@ H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_uint_llong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_uint_llong, FAIL); + H5T_CONV_uS(UINT, LLONG, unsigned, long_long, LLONG_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5132,9 +5239,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_uint_ullong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_uint_ullong, FAIL); + H5T_CONV_uU(UINT, ULLONG, unsigned, unsigned long_long); + FUNC_LEAVE(SUCCEED); } @@ -5160,10 +5269,12 @@ H5T_conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_long_schar, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_long_schar, FAIL); + H5T_CONV_Ss(LONG, SCHAR, long, signed char, SCHAR_MIN, SCHAR_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5189,10 +5300,12 @@ H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_long_uchar, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_long_uchar, FAIL); + H5T_CONV_Su(LONG, UCHAR, long, unsigned char, UCHAR_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5219,10 +5332,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ulong_schar, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ulong_schar, FAIL); + H5T_CONV_Us(ULONG, SCHAR, unsigned long, signed char, SCHAR_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5249,10 +5364,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ulong_uchar, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ulong_uchar, FAIL); + H5T_CONV_Uu(ULONG, UCHAR, unsigned long, unsigned char, UCHAR_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5278,10 +5395,12 @@ H5T_conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_long_short, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_long_short, FAIL); + H5T_CONV_Ss(LONG, SHORT, long, short, SHRT_MIN, SHRT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5308,10 +5427,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_long_ushort, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_long_ushort, FAIL); + H5T_CONV_Su(LONG, USHORT, long, unsigned short, USHRT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5337,10 +5458,12 @@ H5T_conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ulong_short, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ulong_short, FAIL); + H5T_CONV_Us(ULONG, SHORT, unsigned long, short, SHRT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5367,10 +5490,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ulong_ushort, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ulong_ushort, FAIL); + H5T_CONV_Uu(ULONG, USHORT, unsigned long, unsigned short, USHRT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5396,10 +5521,12 @@ H5T_conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_long_int, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_long_int, FAIL); + H5T_CONV_Ss(LONG, INT, long, int, INT_MIN, INT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5425,10 +5552,12 @@ H5T_conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_long_uint, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_long_uint, FAIL); + H5T_CONV_Su(LONG, UINT, long, unsigned, UINT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5454,10 +5583,12 @@ H5T_conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ulong_int, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ulong_int, FAIL); + H5T_CONV_Us(ULONG, INT, unsigned long, int, INT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5483,10 +5614,12 @@ H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ulong_uint, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ulong_uint, FAIL); + H5T_CONV_Uu(ULONG, UINT, unsigned long, unsigned, UINT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5512,9 +5645,11 @@ H5T_conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_long_ulong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_long_ulong, FAIL); + H5T_CONV_su(LONG, ULONG, long, unsigned long); + FUNC_LEAVE(SUCCEED); } @@ -5540,10 +5675,12 @@ H5T_conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ulong_long, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ulong_long, FAIL); + H5T_CONV_us(ULONG, LONG, unsigned long, long, LONG_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5569,9 +5706,11 @@ H5T_conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_long_llong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_long_llong, FAIL); + H5T_CONV_sS(LONG, LLONG, long, long_long); + FUNC_LEAVE(SUCCEED); } @@ -5598,9 +5737,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_long_ullong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_long_ullong, FAIL); + H5T_CONV_sU(LONG, ULLONG, long, unsigned long_long); + FUNC_LEAVE(SUCCEED); } @@ -5627,10 +5768,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_long_llong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_long_llong, FAIL); + H5T_CONV_uS(ULONG, LLONG, unsigned long, long_long, LLONG_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5657,9 +5800,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ulong_ullong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ulong_ullong, FAIL); + H5T_CONV_uU(ULONG, ULLONG, unsigned long, unsigned long_long); + FUNC_LEAVE(SUCCEED); } @@ -5686,10 +5831,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_llong_schar, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_llong_schar, FAIL); + H5T_CONV_Ss(LLONG, SCHAR, long_long, signed char, SCHAR_MIN, SCHAR_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5716,10 +5863,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_llong_uchar, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_llong_uchar, FAIL); + H5T_CONV_Su(LLONG, UCHAR, long_long, unsigned char, UCHAR_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5746,10 +5895,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ullong_schar, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ullong_schar, FAIL); + H5T_CONV_Us(ULLONG, SCHAR, unsigned long_long, signed char, SCHAR_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5776,10 +5927,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ullong_uchar, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ullong_uchar, FAIL); + H5T_CONV_Uu(ULLONG, UCHAR, unsigned long_long, unsigned char, UCHAR_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5806,10 +5959,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_llong_short, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_llong_short, FAIL); + H5T_CONV_Ss(LLONG, SHORT, long_long, short, SHRT_MIN, SHRT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5836,10 +5991,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_llong_ushort, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_llong_ushort, FAIL); + H5T_CONV_Su(LLONG, USHORT, long_long, unsigned short, USHRT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5866,10 +6023,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ullong_short, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ullong_short, FAIL); + H5T_CONV_Us(ULLONG, SHORT, unsigned long_long, short, SHRT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5896,10 +6055,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ullong_ushort, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ullong_ushort, FAIL); + H5T_CONV_Uu(ULLONG, USHORT, unsigned long_long, unsigned short, USHRT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5925,10 +6086,12 @@ H5T_conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_llong_int, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_llong_int, FAIL); + H5T_CONV_Ss(LLONG, INT, long_long, int, INT_MIN, INT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5954,10 +6117,12 @@ H5T_conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_llong_uint, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_llong_uint, FAIL); + H5T_CONV_Su(LLONG, UINT, long_long, unsigned, UINT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -5983,10 +6148,12 @@ H5T_conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ullong_int, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ullong_int, FAIL); + H5T_CONV_Us(ULLONG, INT, unsigned long_long, int, INT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -6013,10 +6180,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ullong_uint, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ullong_uint, FAIL); + H5T_CONV_Uu(ULLONG, UINT, unsigned long_long, unsigned, UINT_MAX); + FUNC_LEAVE(SUCCEED); } @@ -6042,10 +6211,12 @@ H5T_conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t UNUSED bkg_stride, void *buf, void UNUSED *bkg, hid_t UNUSED dset_xfer_plist) { - FUNC_ENTER(H5T_conv_llong_long, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_llong_long, FAIL); + H5T_CONV_Ss(LLONG, LONG, long_long, long, LONG_MIN, LONG_MAX); + FUNC_LEAVE(SUCCEED); } @@ -6072,10 +6243,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_llong_ulong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_llong_ulong, FAIL); + H5T_CONV_Su(LLONG, ULONG, long_long, unsigned long, ULONG_MAX); + FUNC_LEAVE(SUCCEED); } @@ -6102,10 +6275,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ullong_long, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ullong_long, FAIL); + H5T_CONV_Us(ULLONG, LONG, unsigned long_long, long, LONG_MAX); + FUNC_LEAVE(SUCCEED); } @@ -6132,10 +6307,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ullong_ulong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ullong_ulong, FAIL); + H5T_CONV_Uu(ULLONG, ULONG, unsigned long_long, unsigned long, ULONG_MAX); + FUNC_LEAVE(SUCCEED); } @@ -6162,9 +6339,11 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_llong_ullong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_llong_ullong, FAIL); + H5T_CONV_su(LLONG, ULLONG, long_long, unsigned long_long); + FUNC_LEAVE(SUCCEED); } @@ -6191,10 +6370,12 @@ 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 dset_xfer_plist) { - FUNC_ENTER(H5T_conv_ullong_llong, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_ullong_llong, FAIL); + H5T_CONV_us(ULLONG, LLONG, unsigned long_long, long_long, LLONG_MAX); + FUNC_LEAVE(SUCCEED); } @@ -6231,7 +6412,7 @@ H5T_conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hbool_t src_mv, dst_mv; /*align data? */ double aligned; /*aligned data */ - FUNC_ENTER (H5T_conv_float_double, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_float_double, FAIL); switch (cdata->command) { case H5T_CONV_INIT: @@ -6354,7 +6535,7 @@ H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hbool_t src_mv, dst_mv; /*align data? */ double aligned; /*aligned data */ - FUNC_ENTER (H5T_conv_double_float, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_double_float, FAIL); switch (cdata->command) { case H5T_CONV_INIT: @@ -6486,7 +6667,7 @@ H5T_conv_i32le_f64le (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, unsigned exponent; /*exponent */ int i; /*counter */ - FUNC_ENTER (H5T_conv_i32le_f64le, FAIL); + FUNC_ENTER_NOAPI(H5T_conv_i32le_f64le, FAIL); switch (cdata->command) { case H5T_CONV_INIT: diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c index 32cad50..24a9a1e 100644 --- a/src/H5Tvlen.c +++ b/src/H5Tvlen.c @@ -149,7 +149,7 @@ hssize_t H5T_vlen_seq_mem_getlen(H5F_t UNUSED *f, void *vl_addr) hvl_t *vl=(hvl_t *)vl_addr; /* Pointer to the user's hvl_t information */ hssize_t ret_value = FAIL; /*return value */ - FUNC_ENTER (H5T_vlen_seq_mem_getlen, FAIL); + FUNC_ENTER_NOAPI(H5T_vlen_seq_mem_getlen, FAIL); /* check parameters */ assert(vl); @@ -178,7 +178,7 @@ herr_t H5T_vlen_seq_mem_read(H5F_t UNUSED *f, void *vl_addr, void *buf, size_t l { hvl_t *vl=(hvl_t *)vl_addr; /* Pointer to the user's hvl_t information */ - FUNC_ENTER (H5T_vlen_seq_mem_read, FAIL); + FUNC_ENTER_NOAPI(H5T_vlen_seq_mem_read, FAIL); /* check parameters */ assert(vl && vl->p); @@ -212,7 +212,7 @@ herr_t H5T_vlen_seq_mem_write(hid_t plist_id, H5F_t UNUSED *f, void *vl_addr, vo size_t len; H5P_genplist_t *plist; /* Property list */ - FUNC_ENTER (H5T_vlen_seq_mem_write, FAIL); + FUNC_ENTER_NOAPI(H5T_vlen_seq_mem_write, FAIL); /* check parameters */ assert(vl); @@ -277,7 +277,7 @@ hssize_t H5T_vlen_str_mem_getlen(H5F_t UNUSED *f, void *vl_addr) char *s=*(char **)vl_addr; /* Pointer to the user's hvl_t information */ hssize_t ret_value = FAIL; /*return value */ - FUNC_ENTER (H5T_vlen_str_mem_getlen, FAIL); + FUNC_ENTER_NOAPI(H5T_vlen_str_mem_getlen, FAIL); /* check parameters */ assert(s); @@ -306,7 +306,7 @@ herr_t H5T_vlen_str_mem_read(H5F_t UNUSED *f, void *vl_addr, void *buf, size_t l { char *s=*(char **)vl_addr; /* Pointer to the user's hvl_t information */ - FUNC_ENTER (H5T_vlen_str_mem_read, FAIL); + FUNC_ENTER_NOAPI(H5T_vlen_str_mem_read, FAIL); /* check parameters */ assert(s); @@ -340,7 +340,7 @@ herr_t H5T_vlen_str_mem_write(hid_t plist_id, H5F_t UNUSED *f, void *vl_addr, vo size_t len; H5P_genplist_t *plist; /* Property list */ - FUNC_ENTER (H5T_vlen_str_mem_write, FAIL); + FUNC_ENTER_NOAPI(H5T_vlen_str_mem_write, FAIL); /* check parameters */ assert(buf); @@ -396,7 +396,7 @@ hssize_t H5T_vlen_disk_getlen(H5F_t UNUSED *f, void *vl_addr) uint8_t *vl=(uint8_t *)vl_addr; /* Pointer to the disk VL information */ hssize_t ret_value = FAIL; /*return value */ - FUNC_ENTER (H5T_vlen_disk_getlen, FAIL); + FUNC_ENTER_NOAPI(H5T_vlen_disk_getlen, FAIL); /* check parameters */ assert(vl); @@ -427,7 +427,7 @@ herr_t H5T_vlen_disk_read(H5F_t *f, void *vl_addr, void *buf, size_t UNUSED len) H5HG_t hobjid; uint32_t seq_len; - FUNC_ENTER (H5T_vlen_disk_read, FAIL); + FUNC_ENTER_NOAPI(H5T_vlen_disk_read, FAIL); /* check parameters */ assert(vl); @@ -472,7 +472,7 @@ herr_t H5T_vlen_disk_write(hid_t UNUSED plist_id, H5F_t *f, void *vl_addr, void H5HG_t hobjid; size_t len; - FUNC_ENTER (H5T_vlen_disk_write, FAIL); + FUNC_ENTER_NOAPI(H5T_vlen_disk_write, FAIL); /* check parameters */ assert(vl); @@ -645,7 +645,7 @@ H5T_vlen_reclaim(void *elem, hid_t type_id, hsize_t UNUSED ndim, hssize_t UNUSED H5P_genplist_t *plist; /* Property list */ herr_t ret_value = FAIL; - FUNC_ENTER(H5T_vlen_reclaim, FAIL); + FUNC_ENTER_NOAPI(H5T_vlen_reclaim, FAIL); assert(elem); assert(H5I_DATATYPE == H5I_get_type(type_id)); @@ -709,7 +709,7 @@ H5T_vlen_mark(H5T_t *dt, H5F_t *f, H5T_vlen_loc_t loc) int accum_change=0; /* Amount of change in the offset of the fields */ size_t old_size; /* Previous size of a field */ - FUNC_ENTER(H5T_vlen_mark, FAIL); + FUNC_ENTER_NOAPI(H5T_vlen_mark, FAIL); assert(dt); assert(loc>H5T_VLEN_BADLOC && loc<H5T_VLEN_MAXLOC); @@ -41,7 +41,7 @@ herr_t H5V_stride_optimize1(unsigned *np/*in,out*/, hsize_t *elmt_size/*in,out*/, hsize_t *size, hssize_t *stride1) { - FUNC_ENTER(H5V_stride_optimize1, FAIL); + FUNC_ENTER_NOAPI(H5V_stride_optimize1, FAIL); /* * This has to be true because if we optimize the dimensionality down to @@ -90,7 +90,7 @@ herr_t H5V_stride_optimize2(unsigned *np/*in,out*/, hsize_t *elmt_size/*in,out*/, hsize_t *size, hssize_t *stride1, hssize_t *stride2) { - FUNC_ENTER(H5V_stride_optimize2, FAIL); + FUNC_ENTER_NOAPI(H5V_stride_optimize2, FAIL); /* * This has to be true because if we optimize the dimensionality down to @@ -243,7 +243,7 @@ H5V_hyper_stride(unsigned n, const hsize_t *size, hsize_t tmp; int i; /*counter */ - FUNC_ENTER(H5V_hyper_stride, (HDabort(), 0)); + FUNC_ENTER_NOAPI(H5V_hyper_stride, (HDabort(), 0)); assert(n <= H5V_HYPER_NDIMS); assert(size); @@ -446,7 +446,7 @@ H5V_hyper_fill(unsigned n, const hsize_t *_size, unsigned u; #endif - FUNC_ENTER(H5V_hyper_fill, FAIL); + FUNC_ENTER_NOAPI(H5V_hyper_fill, FAIL); /* check args */ assert(n > 0 && n <= H5V_HYPER_NDIMS); @@ -534,7 +534,7 @@ H5V_hyper_copy(unsigned n, const hsize_t *_size, unsigned u; #endif - FUNC_ENTER(H5V_hyper_copy, FAIL); + FUNC_ENTER_NOAPI(H5V_hyper_copy, FAIL); /* check args */ assert(n > 0 && n <= H5V_HYPER_NDIMS); @@ -700,7 +700,7 @@ H5V_stride_fill(unsigned n, hsize_t elmt_size, const hsize_t *size, int j; /*counter */ hbool_t carry; /*subtraction carray value */ - FUNC_ENTER(H5V_stride_fill, FAIL); + FUNC_ENTER_NOAPI(H5V_stride_fill, FAIL); assert (elmt_size < SIZET_MAX); H5V_vector_cpy(n, idx, size); @@ -757,7 +757,7 @@ H5V_stride_copy(unsigned n, hsize_t elmt_size, const hsize_t *size, int j; /*counters */ hbool_t carry; /*carray for subtraction*/ - FUNC_ENTER(H5V_stride_copy, FAIL); + FUNC_ENTER_NOAPI(H5V_stride_copy, FAIL); assert (elmt_size<SIZET_MAX); if (n) { @@ -828,7 +828,8 @@ H5V_stride_copy2(hsize_t nelmts, hsize_t elmt_size, int j; hbool_t carry; - FUNC_ENTER(H5V_stride_copy2, FAIL); + FUNC_ENTER_NOAPI(H5V_stride_copy2, FAIL); + assert (elmt_size < SIZET_MAX); H5V_vector_cpy(dst_n, dst_idx, dst_size); @@ -879,7 +880,8 @@ 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(H5V_array_fill, FAIL); + FUNC_ENTER_NOAPI(H5V_array_fill, FAIL); + assert (dst); assert (src); assert (size < SIZET_MAX && size > 0); @@ -937,7 +939,7 @@ H5V_array_offset(unsigned n, const hsize_t *total_size, const hssize_t *offset) hsize_t acc; /*accumulator */ int i; /*counter */ - FUNC_ENTER(H5V_array_offset, (HDabort(), 0)); + FUNC_ENTER_NOAPI(H5V_array_offset, (HDabort(), 0)); assert(n <= H5V_HYPER_NDIMS); assert(total_size); @@ -152,7 +152,7 @@ H5Z_term_interface (void) herr_t H5Zregister(H5Z_filter_t id, const char *comment, H5Z_func_t func) { - FUNC_ENTER (H5Zregister, FAIL); + FUNC_ENTER_API(H5Zregister, FAIL); H5TRACE3("e","Zfsx",id,comment,func); /* Check args */ @@ -199,7 +199,7 @@ H5Z_register (H5Z_filter_t id, const char *comment, H5Z_func_t func) { size_t i; - FUNC_ENTER (H5Z_register, FAIL); + FUNC_ENTER_NOAPI(H5Z_register, FAIL); assert (id>=0 && id<=H5Z_FILTER_MAX); @@ -257,7 +257,8 @@ H5Z_append(H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags, { size_t idx, i; - FUNC_ENTER(H5Z_append, FAIL); + FUNC_ENTER_NOAPI(H5Z_append, FAIL); + assert(pline); assert(filter>=0 && filter<=H5Z_FILTER_MAX); assert(0==(flags & ~((unsigned)H5Z_FLAG_DEFMASK))); @@ -331,7 +332,7 @@ H5Z_find(H5Z_filter_t id) { size_t i; - FUNC_ENTER(H5Z_find, NULL); + FUNC_ENTER_NOAPI(H5Z_find, NULL); for (i=0; i<H5Z_table_used_g; i++) { if (H5Z_table_g[i].id == id) { @@ -383,7 +384,7 @@ H5Z_pipeline(H5F_t UNUSED *f, const H5O_pline_t *pline, unsigned flags, H5_timer_t timer; #endif - FUNC_ENTER(H5Z_pipeline, FAIL); + FUNC_ENTER_NOAPI(H5Z_pipeline, FAIL); assert(f); assert(0==(flags & ~((unsigned)H5Z_FLAG_INVMASK))); diff --git a/src/H5Zdeflate.c b/src/H5Zdeflate.c index 5b7035f..57cabb3 100644 --- a/src/H5Zdeflate.c +++ b/src/H5Zdeflate.c @@ -57,7 +57,7 @@ H5Z_filter_deflate (unsigned UNUSED flags, size_t cd_nelmts, int status; #endif - FUNC_ENTER (H5Z_filter_deflate, 0); + FUNC_ENTER_NOAPI(H5Z_filter_deflate, 0); /* Check arguments */ if (cd_nelmts!=1 || cd_values[0]>9) { diff --git a/src/H5detect.c b/src/H5detect.c index 1c650ea..fc61dd6 100644 --- a/src/H5detect.c +++ b/src/H5detect.c @@ -431,7 +431,7 @@ H5TN_init_interface(void)\n\ {\n\ H5T_t *dt = NULL;\n\ \n\ - FUNC_ENTER (H5TN_init_interface, FAIL);\n"); + FUNC_ENTER_NOAPI(H5TN_init_interface, FAIL);\n"); for (i = 0; i < nd; i++) { diff --git a/src/H5private.h b/src/H5private.h index a849fe0..a7ad701 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -958,6 +958,10 @@ __DLL__ void H5_trace(hbool_t returning, const char *func, const char *type, * * Robb Matzke, 17 Jun 1998 * Added auto variable RTYPE which is initialized by the tracing macros. + * + * Quincey Koziol, 28 May 2002 + * Split FUNC_ENTER macro into FUNC_ENTER_API, FUNC_ENTER_NOAPI and + * FUNC_ENTER_NOINIT. *------------------------------------------------------------------------- */ @@ -1033,11 +1037,14 @@ extern hbool_t H5_libinit_g; /* Has the library been initialized? */ #endif /* H5_HAVE_THREADSAFE */ -#define FUNC_ENTER_COMMON(func_name) \ +#define FUNC_ENTER_COMMON(func_name,asrt) \ CONSTR (FUNC, #func_name); \ PABLO_SAVE (ID_ ## func_name) \ H5TRACE_DECL; \ \ + /* Check API status */ \ + assert(asrt); \ + \ /* Start tracing */ \ PABLO_TRACE_ON (PABLO_MASK, pablo_func_id); \ \ @@ -1048,21 +1055,54 @@ extern hbool_t H5_libinit_g; /* Has the library been initialized? */ H5_API_UNSET_CANCEL \ H5_API_LOCK -#define FUNC_ENTER(func_name,err) { \ - FUNC_ENTER_COMMON(func_name); \ - FUNC_ENTER_API_INIT(func_name,INTERFACE_INIT,err) +/* Use this macro for all "normal" API functions */ +#define FUNC_ENTER_API(func_name,err) { \ + FUNC_ENTER_COMMON(func_name,H5_IS_API(FUNC)); \ + FUNC_ENTER_API_COMMON(func_name,INTERFACE_INIT,err) \ + \ + /* Clear thread error stack entering public functions */ \ + H5E_clear(); \ + { + +/* + * 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_COMMON(func_name,H5_IS_API(FUNC)); \ + FUNC_ENTER_API_COMMON(func_name,INTERFACE_INIT,err) \ + { +/* + * Use this macro for API functions that shouldn't perform _any_ initialization + * of the library or an interface, just perform tracing, etc. Examples + * are: H5close, H5check_version, H5Eget_major, H5Eget_minor. + */ +#define FUNC_ENTER_API_NOINIT(func_name) { \ + FUNC_ENTER_COMMON(func_name,H5_IS_API(FUNC)); \ + { + +/* Use this macro for all "normal" non-API functions */ #define FUNC_ENTER_NOAPI(func_name,err) { \ - FUNC_ENTER_COMMON(func_name); \ - FUNC_ENTER_NOAPI_INIT(func_name,INTERFACE_INIT,err) + FUNC_ENTER_COMMON(func_name,!H5_IS_API(FUNC)); \ + FUNC_ENTER_NOAPI_INIT(func_name,INTERFACE_INIT,err) \ + { +/* + * Use this macro for non-API functions which fall into two 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_NOINIT(func_name) { \ - FUNC_ENTER_COMMON(func_name); \ + FUNC_ENTER_COMMON(func_name,!H5_IS_API(FUNC)); \ { -#define FUNC_ENTER_API_INIT(func_name,interface_init_func,err) \ +#define FUNC_ENTER_API_COMMON(func_name,interface_init_func,err) \ /* Initialize the library */ \ - if (H5_IS_API(FUNC) && !(H5_INIT_GLOBAL)) { \ + if (!(H5_INIT_GLOBAL)) { \ H5_INIT_GLOBAL = TRUE; \ if (H5_init_library()<0) { \ HRETURN_ERROR (H5E_FUNC, H5E_CANTINIT, err, \ @@ -1079,13 +1119,7 @@ extern hbool_t H5_libinit_g; /* Has the library been initialized? */ HRETURN_ERROR (H5E_FUNC, H5E_CANTINIT, err, \ "interface initialization failed"); \ } \ - } \ - \ - /* Clear thread error stack entering public functions */ \ - if (H5_IS_API(FUNC) && H5E_clearable_g) { \ - H5E_clear (); \ - } \ - { + } #define FUNC_ENTER_NOAPI_INIT(func_name,interface_init_func,err) \ /* Initialize this interface or bust */ \ @@ -1097,8 +1131,7 @@ extern hbool_t H5_libinit_g; /* Has the library been initialized? */ HRETURN_ERROR (H5E_FUNC, H5E_CANTINIT, err, \ "interface initialization failed"); \ } \ - } \ - { + } /*------------------------------------------------------------------------- * Purpose: Register function exit for code profiling. This should be |