summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-01-10 20:26:02 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-01-10 20:26:02 (GMT)
commitf8da76cb9f96d4b233ac9dcb896f9df74e803f38 (patch)
treeb23e28d99b9391163e25d84daabb09906998078f
parent71ca572047b5d73b200eb761bc1234f3b6c4783d (diff)
downloadhdf5-f8da76cb9f96d4b233ac9dcb896f9df74e803f38.zip
hdf5-f8da76cb9f96d4b233ac9dcb896f9df74e803f38.tar.gz
hdf5-f8da76cb9f96d4b233ac9dcb896f9df74e803f38.tar.bz2
[svn-r6266] Purpose:
Code cleanup/new feature. Description: Split FUNC_LEAVE into API and non-API specific versions. This allows a solution to compiling this branch with C++, as well as reducing the size of the binaries produced. Platforms tested: FreeBSD 4.7 (sleipnir) w/serial, parallel (including MPE) & thread-safe
-rw-r--r--src/H5.c17
-rw-r--r--src/H5A.c52
-rw-r--r--src/H5AC.c24
-rw-r--r--src/H5B.c34
-rw-r--r--src/H5D.c98
-rw-r--r--src/H5Dcompact.c4
-rw-r--r--src/H5Dcontig.c10
-rw-r--r--src/H5Distore.c64
-rw-r--r--src/H5Dseq.c8
-rw-r--r--src/H5E.c28
-rw-r--r--src/H5Eprivate.h37
-rw-r--r--src/H5F.c102
-rw-r--r--src/H5FD.c88
-rw-r--r--src/H5FDcore.c28
-rw-r--r--src/H5FDfamily.c38
-rw-r--r--src/H5FDgass.c24
-rw-r--r--src/H5FDlog.c36
-rw-r--r--src/H5FDmpio.c50
-rw-r--r--src/H5FDmpiposix.c36
-rw-r--r--src/H5FDsec2.c26
-rw-r--r--src/H5FDsrb.c26
-rw-r--r--src/H5FDstream.c32
-rw-r--r--src/H5FL.c60
-rw-r--r--src/H5FO.c10
-rw-r--r--src/H5FP.c10
-rw-r--r--src/H5FPclient.c18
-rw-r--r--src/H5FPserver.c54
-rw-r--r--src/H5Farray.c4
-rw-r--r--src/H5Fcompact.c4
-rw-r--r--src/H5Fcontig.c10
-rw-r--r--src/H5Fistore.c64
-rw-r--r--src/H5Fseq.c8
-rw-r--r--src/H5G.c102
-rw-r--r--src/H5Gent.c16
-rw-r--r--src/H5Gnode.c34
-rw-r--r--src/H5Gstab.c10
-rw-r--r--src/H5HG.c20
-rw-r--r--src/H5HL.c20
-rw-r--r--src/H5I.c38
-rw-r--r--src/H5MF.c6
-rw-r--r--src/H5MM.c8
-rw-r--r--src/H5MPprivate.h30
-rw-r--r--src/H5O.c54
-rw-r--r--src/H5Oattr.c12
-rw-r--r--src/H5Ocont.c6
-rw-r--r--src/H5Odtype.c22
-rw-r--r--src/H5Oefl.c18
-rw-r--r--src/H5Ofill.c30
-rw-r--r--src/H5Olayout.c16
-rw-r--r--src/H5Omtime.c20
-rw-r--r--src/H5Oname.c12
-rw-r--r--src/H5Opline.c14
-rw-r--r--src/H5Oplist.c10
-rw-r--r--src/H5Osdspace.c14
-rw-r--r--src/H5Oshared.c8
-rw-r--r--src/H5Ostab.c14
-rw-r--r--src/H5P.c154
-rw-r--r--src/H5Pdcpl.c42
-rw-r--r--src/H5Pdxpl.c30
-rw-r--r--src/H5Pfapl.c64
-rw-r--r--src/H5Pfcpl.c22
-rw-r--r--src/H5R.c24
-rw-r--r--src/H5RS.c18
-rw-r--r--src/H5S.c72
-rw-r--r--src/H5ST.c34
-rw-r--r--src/H5Sall.c32
-rw-r--r--src/H5Shyper.c116
-rw-r--r--src/H5Smpio.c18
-rw-r--r--src/H5Snone.c32
-rw-r--r--src/H5Spoint.c48
-rw-r--r--src/H5Sselect.c32
-rw-r--r--src/H5T.c236
-rw-r--r--src/H5TB.c62
-rw-r--r--src/H5Tbit.c6
-rw-r--r--src/H5Tconv.c214
-rw-r--r--src/H5Tvlen.c26
-rw-r--r--src/H5V.c24
-rw-r--r--src/H5Vprivate.h10
-rw-r--r--src/H5Z.c18
-rw-r--r--src/H5Zdeflate.c2
-rw-r--r--src/H5Zshuffle.c2
-rw-r--r--src/H5detect.c4
-rw-r--r--src/H5private.h47
-rw-r--r--src/Makefile.in4
84 files changed, 1505 insertions, 1526 deletions
diff --git a/src/H5.c b/src/H5.c
index 8a3e558..0b5c333 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -152,7 +152,7 @@ H5_init_library(void)
H5_debug_mask(HDgetenv("HDF5_DEBUG"));
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -296,7 +296,8 @@ H5dont_atexit(void)
dont_atexit_g = TRUE;
done:
- FUNC_LEAVE(ret_value);}
+ FUNC_LEAVE_API(ret_value);
+}
/*-------------------------------------------------------------------------
@@ -332,7 +333,7 @@ H5garbage_collect(void)
H5FL_garbage_coll();
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5garbage_collect() */
@@ -379,7 +380,7 @@ H5set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_lim,
H5FL_set_free_list_limits(reg_global_lim, reg_list_lim, arr_global_lim, arr_list_lim, blk_global_lim, blk_list_lim);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5set_free_list_limits() */
@@ -512,7 +513,7 @@ H5get_libversion(unsigned *majnum, unsigned *minnum, unsigned *relnum)
if (relnum) *relnum = H5_VERS_RELEASE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -622,7 +623,7 @@ H5check_version(unsigned majnum, unsigned minnum, unsigned relnum)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -652,7 +653,7 @@ H5open(void)
H5TRACE0("e","");
/* all work is done by FUNC_ENTER() */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -683,7 +684,7 @@ H5close(void)
H5_term_library();
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_API(SUCCEED);
}
diff --git a/src/H5A.c b/src/H5A.c
index ab180d2..5818a68 100644
--- a/src/H5A.c
+++ b/src/H5A.c
@@ -71,7 +71,7 @@ H5A_init_interface(void)
HGOTO_ERROR(H5E_INTERNAL, H5E_CANTINIT, FAIL, "unable to initialize interface");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -107,7 +107,7 @@ H5A_term_interface(void)
n = 1;
}
}
- FUNC_LEAVE(n);
+ FUNC_LEAVE_NOAPI(n);
}
@@ -179,7 +179,7 @@ H5Acreate(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id,
HGOTO_ERROR (H5E_ATTR, H5E_CANTINIT, FAIL, "unable to create attribute");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Acreate() */
@@ -291,7 +291,7 @@ done:
H5A_close(attr);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5A_create() */
@@ -348,7 +348,7 @@ H5A_get_index(H5G_entry_t *ent, const char *name)
HGOTO_ERROR(H5E_ATTR, H5E_NOTFOUND, FAIL, "attribute not found");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5A_get_index() */
@@ -405,7 +405,7 @@ H5Aopen_name(hid_t loc_id, const char *name)
HGOTO_ERROR (H5E_ATTR, H5E_CANTINIT, FAIL, "unable to open attribute");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Aopen_name() */
@@ -456,7 +456,7 @@ H5Aopen_idx(hid_t loc_id, unsigned idx)
HGOTO_ERROR (H5E_ATTR, H5E_CANTINIT, FAIL, "unable to open attribute");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Aopen_idx() */
@@ -520,7 +520,7 @@ done:
if(attr) H5A_close(attr);
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5A_open() */
@@ -565,7 +565,7 @@ H5Awrite(hid_t attr_id, hid_t type_id, const void *buf)
HGOTO_ERROR(H5E_ATTR, H5E_WRITEERROR, FAIL, "unable to write attribute");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Awrite() */
@@ -668,7 +668,7 @@ done:
if (bkg_buf)
H5MM_xfree(bkg_buf);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5A_write() */
@@ -713,7 +713,7 @@ H5Aread(hid_t attr_id, hid_t type_id, void *buf)
HGOTO_ERROR(H5E_ATTR, H5E_READERROR, FAIL, "unable to read attribute");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Aread() */
@@ -807,7 +807,7 @@ done:
if (bkg_buf)
H5MM_xfree(bkg_buf);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5A_read() */
@@ -852,7 +852,7 @@ H5Aget_space(hid_t attr_id)
HGOTO_ERROR (H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register dataspace atom");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Aget_space() */
@@ -919,7 +919,7 @@ done:
H5T_close(dst);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Aget_type() */
@@ -981,7 +981,7 @@ H5Aget_name(hid_t attr_id, size_t buf_size, char *buf)
ret_value = (ssize_t)nbytes;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Aget_type() */
@@ -1021,7 +1021,7 @@ H5Aget_storage_size(hid_t attr_id)
ret_value = H5A_get_storage_size(attr);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1056,7 +1056,7 @@ H5A_get_storage_size(H5A_t *attr)
ret_value = attr->data_size;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1115,7 +1115,7 @@ H5Aget_num_attrs(hid_t loc_id)
ret_value=H5O_count(ent, H5O_ATTR);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Aget_num_attrs() */
@@ -1156,7 +1156,7 @@ H5Arename(hid_t loc_id, const char *old_name, const char *new_name)
ret_value = H5A_rename(ent, old_name, new_name);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1230,7 +1230,7 @@ H5A_rename(H5G_entry_t *ent, const char *old_name, const char *new_name)
H5A_close(found_attr);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1321,7 +1321,7 @@ H5Aiterate(hid_t loc_id, unsigned *attr_num, H5A_operator_t op, void *op_data)
*attr_num = (unsigned)idx;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Aiterate() */
@@ -1393,7 +1393,7 @@ H5Adelete(hid_t loc_id, const char *name)
HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute header message");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Adelete() */
@@ -1430,7 +1430,7 @@ H5Aclose(hid_t attr_id)
H5I_dec_ref (attr_id);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Aclose() */
@@ -1494,7 +1494,7 @@ done:
H5A_close(new_attr);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1556,7 +1556,7 @@ H5A_close(H5A_t *attr)
H5MM_xfree(attr);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1590,5 +1590,5 @@ H5A_entof(H5A_t *attr)
ret_value=&(attr->ent);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5AC.c b/src/H5AC.c
index fa4f1cb..6da9b0b 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -121,7 +121,7 @@ H5AC_init_interface(void)
#endif /* H5_HAVE_PARALLEL */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5AC_init_interface() */
@@ -170,7 +170,7 @@ H5AC_term_interface(void)
interface_initialize_g = 0;
} /* end if */
- FUNC_LEAVE(n);
+ FUNC_LEAVE_NOAPI(n);
} /* end H5AC_term_interface() */
@@ -233,7 +233,7 @@ done:
} /* end if */
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -286,7 +286,7 @@ H5AC_dest(H5F_t *f)
f->shared->cache = cache = H5FL_FREE(H5AC_t,cache);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -436,7 +436,7 @@ H5AC_find_f(H5F_t *f, const H5AC_class_t *type, haddr_t addr,
ret_value=thing;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -488,7 +488,7 @@ H5AC_compare(const void *_a, const void *_b)
ret_value=1;
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
#endif
@@ -640,7 +640,7 @@ done:
map = H5FL_ARR_FREE(int,map);
#endif /* H5AC_SORT_BY_ADDR */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -722,7 +722,7 @@ H5AC_set(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *thing)
#endif /* H5AC_DEBUG */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -819,7 +819,7 @@ H5AC_rename(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr,
cache->slot[old_idx]= NULL;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -953,7 +953,7 @@ H5AC_protect(H5F_t *f, const H5AC_class_t *type, haddr_t addr,
ret_value=thing;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1053,7 +1053,7 @@ H5AC_unprotect(H5F_t *f, const H5AC_class_t *type, haddr_t addr, void *thing)
cache->nprots -= 1;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1141,5 +1141,5 @@ H5AC_debug(H5F_t UNUSED *f)
#endif
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5B.c b/src/H5B.c
index a0386b0..45d5dbd 100644
--- a/src/H5B.c
+++ b/src/H5B.c
@@ -271,7 +271,7 @@ done:
}
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -380,7 +380,7 @@ done:
H5FL_BLK_FREE(native_block,bt->native);
H5FL_FREE(H5B_t,bt);
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -487,7 +487,7 @@ H5B_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5B_t *bt)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -575,7 +575,7 @@ done:
if (bt && H5AC_unprotect(f, H5AC_BT, addr, bt) < 0 && ret_value>=0)
HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release node");
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -733,7 +733,7 @@ done:
if (new_bt && H5AC_unprotect(f, H5AC_BT, *new_addr_p, new_bt) < 0 && ret_value>=0)
HDONE_ERROR(H5E_BTREE, H5E_PROTECT, FAIL, "unable to release B-tree node");
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -766,7 +766,7 @@ H5B_decode_key(H5F_t *f, H5B_t *bt, int idx)
HGOTO_ERROR(H5E_BTREE, H5E_CANTDECODE, FAIL, "unable to decode key");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -801,7 +801,7 @@ H5B_decode_keys(H5F_t *f, H5B_t *bt, int idx)
HGOTO_ERROR(H5E_BTREE, H5E_CANTDECODE, FAIL, "unable to decode key");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -958,7 +958,7 @@ H5B_insert(H5F_t *f, const H5B_class_t *type, haddr_t addr,
#endif
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1056,7 +1056,7 @@ H5B_insert_child(H5F_t *f, const H5B_class_t *type, H5B_t *bt,
bt->nchildren += 1;
bt->ndirty = bt->nchildren;
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
@@ -1390,7 +1390,7 @@ done:
HDONE_ERROR(H5E_BTREE, H5E_PROTECT, H5B_INS_ERROR, "unable to release node(s)");
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1498,7 +1498,7 @@ done:
H5FL_ARR_FREE(haddr_t,child);
if(key!=NULL)
H5MM_xfree(key);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1763,7 +1763,7 @@ done:
if (bt && H5AC_unprotect(f, H5AC_BT, addr, bt)<0 && ret_value>=0)
HDONE_ERROR(H5E_BTREE, H5E_PROTECT, H5B_INS_ERROR, "unable to release node");
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1825,7 +1825,7 @@ H5B_remove(H5F_t *f, const H5B_class_t *type, haddr_t addr, void *udata)
H5B_assert(f, addr, type, udata);
#endif
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1886,7 +1886,7 @@ H5B_nodesize(H5F_t *f, const H5B_class_t *type,
ret_value=size;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1973,7 +1973,7 @@ done:
} /* end if */
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5B_copy */
@@ -2070,7 +2070,7 @@ H5B_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent, int fwidth,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2192,6 +2192,6 @@ H5B_assert(H5F_t *f, haddr_t addr, const H5B_class_t *type, void *udata)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
#endif /* H5B_DEBUG */
diff --git a/src/H5D.c b/src/H5D.c
index bc12d41..1037f4b 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -129,7 +129,7 @@ H5D_init(void)
/* FUNC_ENTER() does all the work */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -381,7 +381,7 @@ H5D_init_interface(void)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't retrieve fill value");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -418,7 +418,7 @@ H5D_term_interface(void)
n = 1; /*H5I*/
}
}
- FUNC_LEAVE(n);
+ FUNC_LEAVE_NOAPI(n);
}
@@ -491,7 +491,7 @@ H5D_crt_copy(hid_t new_plist_id, hid_t old_plist_id, void UNUSED *copy_data)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set pipeline");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -544,7 +544,7 @@ H5D_crt_close(hid_t dcpl_id, void UNUSED *close_data)
H5O_reset(H5O_PLINE, &pline);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5D_crt_close() */
@@ -606,7 +606,7 @@ H5D_xfer_create(hid_t dxpl_id, void UNUSED *create_data)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5D_xfer_create() */
@@ -640,7 +640,7 @@ H5D_xfer_copy(hid_t new_plist_id, hid_t UNUSED old_plist_id,
HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't copy property list");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -690,7 +690,7 @@ H5D_xfer_close(hid_t dxpl_id, void UNUSED *close_data)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5D_xfer_close() */
@@ -780,7 +780,7 @@ done:
H5D_close(new_dset);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -829,7 +829,7 @@ H5Dopen(hid_t loc_id, const char *name)
HGOTO_ERROR(H5E_DATASET, H5E_CANTREGISTER, FAIL, "can't register dataset");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -876,7 +876,7 @@ H5Dclose(hid_t dset_id)
HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't free");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -928,7 +928,7 @@ done:
H5S_close(space);
} /* end if */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -964,7 +964,7 @@ herr_t H5Dget_space_status(hid_t dset_id, H5D_space_status_t *allocation)
HGOTO_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL, "unable to get space status");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1029,7 +1029,7 @@ static herr_t H5D_get_space_status(H5D_t *dset, H5D_space_status_t *allocation)
} /* end else */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1093,7 +1093,7 @@ done:
H5T_close (copied_type);
} /* end if */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1167,7 +1167,7 @@ done:
H5Pclose(new_dcpl_id);
} /* end if */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1263,7 +1263,7 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read data");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1354,7 +1354,7 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
HGOTO_ERROR(H5E_DATASET, H5E_WRITEERROR, FAIL, "can't write data");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1394,7 +1394,7 @@ H5Dextend(hid_t dset_id, const hsize_t *size)
HGOTO_ERROR (H5E_DATASET, H5E_CANTINIT, FAIL, "unable to extend dataset");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1469,7 +1469,7 @@ done:
} /* end if */
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1681,7 +1681,7 @@ done:
if(H5O_unprotect(ent,oh)<0)
HDONE_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to unprotect dataset object header");
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1979,7 +1979,7 @@ done:
H5FL_FREE(H5D_t,new_dset);
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2028,7 +2028,7 @@ H5D_isa(H5G_entry_t *ent)
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2091,7 +2091,7 @@ H5D_open(H5G_entry_t *ent)
} /* end else */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2305,7 +2305,7 @@ done:
dataset->ent.file = NULL;
H5FL_FREE(H5D_t,dataset);
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2379,7 +2379,7 @@ H5D_close(H5D_t *dataset)
HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "couldn't free the type or creation property list, but the dataset was freed anyway.");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2796,7 +2796,7 @@ done:
H5FL_BLK_FREE(type_conv,tconv_buf);
if (bkg_buf && NULL==H5P_peek_voidp(dx_plist,H5D_XFER_BKGR_BUF_NAME))
H5FL_BLK_FREE(type_conv,bkg_buf);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5D_read() */
@@ -3221,7 +3221,7 @@ done:
if (bkg_buf && NULL==H5P_peek_voidp(dx_plist,H5D_XFER_BKGR_BUF_NAME))
H5FL_BLK_FREE(type_conv,bkg_buf);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5D_write() */
@@ -3280,7 +3280,7 @@ H5D_extend (H5D_t *dataset, const hsize_t *size)
} /* end if */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3306,7 +3306,7 @@ H5D_entof (H5D_t *dataset)
/* Use FUNC_ENTER_NOINIT here to avoid performance issues */
FUNC_ENTER_NOINIT(H5D_entof);
- FUNC_LEAVE( dataset ? &(dataset->ent) : NULL);
+ FUNC_LEAVE_NOAPI( dataset ? &(dataset->ent) : NULL);
}
@@ -3336,7 +3336,7 @@ H5D_typeof (H5D_t *dset)
assert (dset);
assert (dset->type);
- FUNC_LEAVE (dset->type);
+ FUNC_LEAVE_NOAPI(dset->type);
}
@@ -3365,7 +3365,7 @@ H5D_get_file (const H5D_t *dset)
assert (dset);
assert (dset->ent.file);
- FUNC_LEAVE (dset->ent.file);
+ FUNC_LEAVE_NOAPI(dset->ent.file);
}
@@ -3480,7 +3480,7 @@ H5D_alloc_storage (H5F_t *f, H5D_t *dset/*in,out*/, H5D_time_alloc_t time_alloc,
} /* end if */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5D_alloc_storage() */
@@ -3580,7 +3580,7 @@ H5D_init_storage(H5D_t *dset, hbool_t full_overwrite)
} /* end switch */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3621,7 +3621,7 @@ H5Dget_storage_size(hid_t dset_id)
ret_value = H5D_get_storage_size(dset);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -3678,7 +3678,7 @@ H5D_get_storage_size(H5D_t *dset)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3715,7 +3715,7 @@ H5Dget_offset(hid_t dset_id)
ret_value = H5D_get_offset(dset);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -3772,7 +3772,7 @@ H5D_get_offset(H5D_t *dset)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3860,7 +3860,7 @@ H5Diterate(void *buf, hid_t type_id, hid_t space_id, H5D_operator_t op,
ret_value=H5S_select_iterate(buf,type_id,space,op,operator_data);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Diterate() */
@@ -3906,7 +3906,7 @@ H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf)
ret_value=H5Diterate(buf,type_id,space_id,H5T_vlen_reclaim,&plist_id);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Dvlen_reclaim() */
@@ -3943,7 +3943,7 @@ H5D_vlen_get_buf_size_alloc(size_t size, void *info)
ret_value=vlen_bufsize->vl_tbuf;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5D_vlen_get_buf_size_alloc() */
@@ -4003,7 +4003,7 @@ H5D_vlen_get_buf_size(void UNUSED *elem, hid_t type_id, hsize_t UNUSED ndim, hss
HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL, "can't read point");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5D_vlen_get_buf_size() */
@@ -4107,7 +4107,7 @@ done:
if(vlen_bufsize.xfer_pid>0)
H5I_dec_ref(vlen_bufsize.xfer_pid);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Dvlen_get_buf_size() */
@@ -4196,7 +4196,7 @@ done:
H5FL_BLK_FREE(type_elem,tconv_buf);
if (bkg_buf)
H5FL_BLK_FREE(type_elem,bkg_buf);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5D_fill() */
@@ -4249,7 +4249,7 @@ H5Dfill(const void *fill, hid_t fill_type_id, void *buf, hid_t buf_type_id, hid_
HGOTO_ERROR(H5E_DATASET, H5E_CANTENCODE, FAIL, "filling selection failed");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Dfill() */
@@ -4292,7 +4292,7 @@ H5Dset_extent(hid_t dset_id, const hsize_t *size)
HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to set extend dataset");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -4398,7 +4398,7 @@ H5D_set_extent(H5D_t *dset, const hsize_t *size)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4456,7 +4456,7 @@ H5D_flush(H5F_t *f)
done:
if(id_list!=NULL)
H5MM_xfree(id_list);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5D_flush() */
@@ -4498,5 +4498,5 @@ H5Ddebug(hid_t dset_id, unsigned UNUSED flags)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
diff --git a/src/H5Dcompact.c b/src/H5Dcompact.c
index 0a21211..5d2ad62 100644
--- a/src/H5Dcompact.c
+++ b/src/H5Dcompact.c
@@ -66,7 +66,7 @@ H5F_compact_readv(H5F_t UNUSED *f, const H5O_layout_t *layout, size_t nseq,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5F_compact_readv() */
/*-------------------------------------------------------------------------
@@ -117,5 +117,5 @@ H5F_compact_writev(H5F_t UNUSED *f, H5O_layout_t *layout, size_t nseq,
layout->dirty = TRUE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5F_compact_writev */
diff --git a/src/H5Dcontig.c b/src/H5Dcontig.c
index a63a9ce..f3d7da3 100644
--- a/src/H5Dcontig.c
+++ b/src/H5Dcontig.c
@@ -232,7 +232,7 @@ done:
H5FL_BLK_FREE(zero_fill,buf);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -270,7 +270,7 @@ H5F_contig_read(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr,
HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "vector read failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5F_contig_read() */
@@ -307,7 +307,7 @@ H5F_contig_write(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr, size
HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "vector write failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5F_contig_write() */
@@ -729,7 +729,7 @@ H5F_contig_readv(H5F_t *f, hsize_t _max_data, H5FD_mem_t type, haddr_t _addr,
} /* end else */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5F_contig_readv() */
@@ -1199,6 +1199,6 @@ H5F_contig_writev(H5F_t *f, hsize_t _max_data, H5FD_mem_t type, haddr_t _addr,
} /* end else */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5F_contig_writev() */
diff --git a/src/H5Distore.c b/src/H5Distore.c
index f617092..5278554 100644
--- a/src/H5Distore.c
+++ b/src/H5Distore.c
@@ -235,7 +235,7 @@ H5F_istore_sizeof_rkey(H5F_t UNUSED *f, const void *_udata)
4 + /*filter mask */
udata->mesg.ndims*8; /*dimension indices */
- FUNC_LEAVE(nbytes);
+ FUNC_LEAVE_NOAPI(nbytes);
}
@@ -277,7 +277,7 @@ H5F_istore_decode_key(H5F_t UNUSED *f, H5B_t *bt, uint8_t *raw, void *_key)
UINT64DECODE(raw, key->offset[i]);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -319,7 +319,7 @@ H5F_istore_encode_key(H5F_t UNUSED *f, H5B_t *bt, uint8_t *raw, void *_key)
UINT64ENCODE(raw, key->offset[i]);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -361,7 +361,7 @@ H5F_istore_debug_key (FILE *stream, int indent, int fwidth,
HDfputs ("}\n", stream);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -406,7 +406,7 @@ H5F_istore_cmp2(H5F_t UNUSED *f, void *_lt_key, void *_udata,
ret_value = H5V_vector_cmp_s(udata->mesg.ndims, lt_key->offset, rt_key->offset);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -464,7 +464,7 @@ H5F_istore_cmp3(H5F_t UNUSED *f, void *_lt_key, void *_udata,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -541,7 +541,7 @@ H5F_istore_new_node(H5F_t *f, H5B_ins_t op,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -604,7 +604,7 @@ H5F_istore_found(H5F_t UNUSED *f, haddr_t addr, const void *_lt_key,
udata->key.offset[u] = lt_key->offset[u];
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -744,7 +744,7 @@ H5F_istore_insert(H5F_t *f, haddr_t addr, void *_lt_key,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -779,7 +779,7 @@ H5F_istore_iter_allocated (H5F_t UNUSED *f, void *_lt_key, haddr_t UNUSED addr,
bt_udata->total_storage += lt_key->nbytes;
- FUNC_LEAVE(H5B_ITER_CONT);
+ FUNC_LEAVE_NOAPI(H5B_ITER_CONT);
} /* H5F_istore_iter_allocated() */
@@ -832,7 +832,7 @@ H5F_istore_iter_dump (H5F_t UNUSED *f, void *_lt_key, haddr_t UNUSED addr,
bt_udata->total_storage++;
}
- FUNC_LEAVE(H5B_ITER_CONT);
+ FUNC_LEAVE_NOAPI(H5B_ITER_CONT);
} /* H5F_istore_iter_dump() */
@@ -868,7 +868,7 @@ H5F_istore_init (H5F_t *f)
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -989,7 +989,7 @@ done:
if(ent->chunk)
ent->chunk = H5MM_xfree(ent->chunk);
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1058,7 +1058,7 @@ H5F_istore_preempt(H5F_t *f, H5F_rdcc_ent_t * ent, hbool_t flush)
H5FL_FREE(H5F_rdcc_ent_t, ent);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1104,7 +1104,7 @@ H5F_istore_flush (H5F_t *f, hbool_t preempt)
HGOTO_ERROR (H5E_IO, H5E_CANTFLUSH, FAIL, "unable to flush one or more raw data chunks");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1151,7 +1151,7 @@ H5F_istore_dest (H5F_t *f)
HDmemset (rdcc, 0, sizeof(H5F_rdcc_t));
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1269,7 +1269,7 @@ H5F_istore_prune (H5F_t *f, size_t size)
HGOTO_ERROR (H5E_IO, H5E_CANTFLUSH, FAIL, "unable to preempt one or more raw data cache entry");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1524,7 +1524,7 @@ H5F_istore_lock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
done:
if (!ret_value)
H5MM_xfree (chunk);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1625,7 +1625,7 @@ H5F_istore_unlock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
ent->locked = FALSE;
}
- FUNC_LEAVE (SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
@@ -1806,7 +1806,7 @@ H5F_istore_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1988,7 +1988,7 @@ H5F_istore_write(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
} /* end while */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2037,7 +2037,7 @@ H5F_istore_create(H5F_t *f, H5O_layout_t *layout /*out */ )
HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "can't create B-tree");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2077,7 +2077,7 @@ H5F_istore_allocated(H5F_t *f, unsigned ndims, haddr_t addr)
ret_value=udata.total_storage;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2116,7 +2116,7 @@ H5F_istore_dump_btree(H5F_t *f, FILE *stream, unsigned ndims, haddr_t addr)
HGOTO_ERROR(H5E_IO, H5E_CANTINIT, 0, "unable to iterate over chunk B-tree");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2181,7 +2181,7 @@ H5F_istore_stats (H5F_t *f, hbool_t headers)
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2215,7 +2215,7 @@ H5F_istore_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent,
H5B_debug (f, addr, stream, indent, fwidth, H5B_ISTORE, &udata);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2267,7 +2267,7 @@ H5F_istore_get_addr(H5F_t *f, const H5O_layout_t *layout,
ret_value=udata.addr;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5F_istore_get_addr() */
@@ -2537,7 +2537,7 @@ done:
if(chunk!=NULL)
H5MM_xfree(chunk);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2717,7 +2717,7 @@ H5F_istore_prune_by_extent(H5F_t *f, const H5O_layout_t *layout, const H5S_t * s
HGOTO_ERROR(H5E_IO, H5E_CANTINIT, 0, "unable to iterate over B-tree");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2777,7 +2777,7 @@ H5F_istore_prune_extent(H5F_t *f, void *_lt_key, haddr_t UNUSED addr,
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2816,7 +2816,7 @@ H5F_istore_remove(H5F_t *f, haddr_t addr, void *_lt_key /*in,out */ ,
*rt_key_changed = FALSE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2995,6 +2995,6 @@ done:
if(space_chunk)
H5S_close(space_chunk);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Dseq.c b/src/H5Dseq.c
index 9592725..15cb668 100644
--- a/src/H5Dseq.c
+++ b/src/H5Dseq.c
@@ -78,7 +78,7 @@ H5F_seq_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "vector read failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5F_seq_read() */
@@ -124,7 +124,7 @@ H5F_seq_write(H5F_t *f, hid_t dxpl_id, H5O_layout_t *layout,
HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "vector write failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5F_seq_write() */
@@ -511,7 +511,7 @@ H5F_seq_readv(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
} /* end switch() */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5F_seq_readv() */
@@ -897,6 +897,6 @@ H5F_seq_writev(H5F_t *f, hid_t dxpl_id, H5O_layout_t *layout,
} /* end switch() */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5F_seq_writev() */
diff --git a/src/H5E.c b/src/H5E.c
index 8b9ab13..5d664e6 100644
--- a/src/H5E.c
+++ b/src/H5E.c
@@ -262,7 +262,7 @@ H5E_get_stack(void)
ret_value=estack;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
#endif /* H5_HAVE_THREADSAFE */
@@ -292,7 +292,7 @@ H5E_init_interface (void)
H5E_auto_data_g = stderr;
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
@@ -334,7 +334,7 @@ H5Eset_auto(H5E_auto_t func, void *client_data)
H5E_auto_data_g = client_data;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -366,7 +366,7 @@ H5Eget_auto(H5E_auto_t *func, void **client_data)
if (client_data) *client_data = H5E_auto_data_g;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -395,7 +395,7 @@ H5Eclear(void)
/* FUNC_ENTER() does all the work */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -453,7 +453,7 @@ H5Eprint(FILE *stream)
ret_value = H5E_walk (H5E_WALK_DOWNWARD, H5E_walk_cb, (void*)stream);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -484,7 +484,7 @@ H5Ewalk(H5E_direction_t direction, H5E_walk_t func, void *client_data)
ret_value = H5E_walk (direction, func, client_data);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -549,7 +549,7 @@ H5E_walk_cb(int n, H5E_error_t *err_desc, void *client_data)
fprintf (stream, "%*sminor(%02d): %s\n",
indent*2, "", err_desc->min_num, min_str);
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
@@ -591,7 +591,7 @@ H5Eget_major (H5E_major_t n)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -633,7 +633,7 @@ H5Eget_minor (H5E_minor_t n)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -696,7 +696,7 @@ H5E_push(H5E_major_t maj_num, H5E_minor_t min_num, const char *function_name,
estack->nused++;
}
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
@@ -734,7 +734,7 @@ H5Epush(const char *file, const char *func, unsigned line, H5E_major_t maj,
ret_value = H5E_push(maj, min, func, file, line, str);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -763,7 +763,7 @@ H5E_clear(void)
if (estack) estack->nused = 0;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -821,6 +821,6 @@ H5E_walk (H5E_direction_t direction, H5E_walk_t func, void *client_data)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Eprivate.h b/src/H5Eprivate.h
index 52566e4..19925d7 100644
--- a/src/H5Eprivate.h
+++ b/src/H5Eprivate.h
@@ -31,7 +31,7 @@
#define HERROR(maj, min, str) H5E_push(maj, min, FUNC, __FILE__, __LINE__, str)
/*
- * HCOMMON_ERROR macro, used by HRETURN_ERROR and HGOTO_ERROR
+ * HCOMMON_ERROR macro, used by HDONE_ERROR and HGOTO_ERROR
* (Shouldn't need to be used outside this header file)
*/
#define HCOMMON_ERROR(maj, min, str) \
@@ -39,23 +39,6 @@
if (H5_IS_API(FUNC) && H5E_auto_g) \
(H5E_auto_g)(H5E_auto_data_g)
-/* Note: if this is still ifdef'ed out and its after the v1.6 release, then
- * we should be completely free of the necessity for this macro and it can
- * be removed. -QAK, 9/25/2002
- */
-#ifdef OLD_WAY
-/*
- * HRETURN_ERROR macro, used to facilitate error reporting between a
- * FUNC_ENTER() and a FUNC_LEAVE() within a function body. The arguments are
- * the major error number, the minor error number, a return value, and a
- * description of the error.
- */
-#define HRETURN_ERROR(maj, min, ret_val, str) { \
- HCOMMON_ERROR (maj, min, str); \
- HRETURN(ret_val); \
-}
-#endif /* OLD_WAY */
-
/*
* HDONE_ERROR macro, used to facilitate error reporting between a
* FUNC_ENTER() and a FUNC_LEAVE() within a function body, but _AFTER_ the
@@ -69,20 +52,6 @@
}
/*
- * HRETURN macro, used to facilitate returning from a function between a
- * FUNC_ENTER() and a FUNC_LEAVE() within a function body. The argument is
- * the return value.
- */
-#define HRETURN(ret_val) { \
- FINISH_MPE_LOG; \
- PABLO_TRACE_OFF (PABLO_MASK, pablo_func_id); \
- H5TRACE_RETURN(ret_val); \
- H5_API_UNLOCK \
- H5_API_SET_CANCEL \
- return (ret_val); \
-}
-
-/*
* HGOTO_ERROR macro, used to facilitate error reporting between a
* FUNC_ENTER() and a FUNC_LEAVE() within a function body. The arguments are
* the major error number, the minor error number, the return value, and an
@@ -154,10 +123,6 @@ extern int H5E_mpi_error_str_len;
HMPI_ERROR(mpierr); \
HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, retcode, str); \
}
-#define HMPI_RETURN_ERROR(retcode, str, mpierr){ \
- HMPI_ERROR(mpierr); \
- HRETURN_ERROR(H5E_INTERNAL, H5E_MPI, retcode, str); \
-}
#endif
#endif
diff --git a/src/H5F.c b/src/H5F.c
index b0920d2..29ce3ac 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -111,7 +111,7 @@ H5F_init(void)
/* FUNC_ENTER() does all the work */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -429,7 +429,7 @@ H5F_init_interface(void)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -470,7 +470,7 @@ H5F_term_interface(void)
n = 1; /*H5I*/
}
}
- FUNC_LEAVE(n);
+ FUNC_LEAVE_NOAPI(n);
}
@@ -525,7 +525,7 @@ H5F_acs_create(hid_t fapl_id, void UNUSED *copy_data)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -579,7 +579,7 @@ H5F_acs_close(hid_t fapl_id, void UNUSED *close_data)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -631,7 +631,7 @@ H5F_acs_copy(hid_t new_fapl_id, hid_t old_fapl_id, void UNUSED *copy_data)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -658,7 +658,7 @@ H5F_flush_all_cb(H5F_t *f, hid_t UNUSED fid, const void *_invalidate)
H5F_flush(f, H5F_SCOPE_LOCAL, invalidate, FALSE, FALSE);
- FUNC_LEAVE(0);
+ FUNC_LEAVE_NOAPI(0);
}
@@ -689,7 +689,7 @@ H5F_flush_all(hbool_t invalidate)
H5I_search(H5I_FILE,(H5I_search_func_t)H5F_flush_all_cb,(void*)&invalidate);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -722,7 +722,7 @@ H5F_close_all(void)
HGOTO_ERROR(H5E_FILE, H5E_CLOSEERROR, FAIL, "unable to close one or more files");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -806,7 +806,7 @@ H5Fget_create_plist(hid_t file_id)
HGOTO_ERROR(H5E_INTERNAL, H5E_CANTINIT, FAIL, "unable to copy file creation properties");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -893,7 +893,7 @@ H5Fget_access_plist(hid_t file_id)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -930,7 +930,7 @@ H5Fget_obj_count(hid_t file_id, unsigned types, unsigned *obj_id_count)
ret_value = H5F_get_obj_count(f, types, obj_id_count);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -962,7 +962,7 @@ H5F_get_obj_count(H5F_t *f, unsigned types, unsigned *obj_id_count)
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get counts of opened file IDs and object IDs in the file");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -998,7 +998,7 @@ H5Fget_obj_ids(hid_t file_id, unsigned types, hid_t *oid_list)
ret_value = H5F_get_obj_ids(f, types, oid_list);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1027,7 +1027,7 @@ H5F_get_obj_ids(H5F_t *f, unsigned types, hid_t *oid_list)
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get object IDs opened in the file");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1099,7 +1099,7 @@ done:
#endif /* LATER */
if(olist!=NULL)
H5MM_xfree(olist);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1169,7 +1169,7 @@ H5F_get_objects_cb(void *obj_ptr, hid_t obj_id, void *key)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1205,7 +1205,7 @@ herr_t H5Fget_vfd_handle(hid_t file_id, hid_t fapl, void** file_handle)
ret_value=H5F_get_vfd_handle(file, fapl, file_handle);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1237,7 +1237,7 @@ herr_t H5F_get_vfd_handle(H5F_t *file, hid_t fapl, void**file_handle)
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get file handle for file driver");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1269,7 +1269,7 @@ H5F_equal(void *_haystack, hid_t UNUSED id, const void *_needle)
retval = (0==H5FD_cmp(haystack->shared->lf, needle));
- FUNC_LEAVE(retval);
+ FUNC_LEAVE_NOAPI(retval);
}
@@ -1337,7 +1337,7 @@ H5F_locate_signature(H5FD_t *file)
ret_value=addr;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1387,7 +1387,7 @@ done:
if(H5FD_close(file)<0 && ret_value>=0)
HDONE_ERROR(H5E_IO, H5E_CANTCLOSEFILE, FAIL, "unable to close file");
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1508,7 +1508,7 @@ done:
H5FL_FREE(H5F_t,f);
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1622,7 +1622,7 @@ H5F_dest(H5F_t *f)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2081,7 +2081,7 @@ H5F_open(const char *name, unsigned flags, hid_t fcpl_id, hid_t fapl_id)
done:
if (!ret_value && file)
H5F_dest(file); /* Don't indicate error here, to leave the error stack with the correct error */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2194,7 +2194,7 @@ H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id,
done:
if (ret_value<0 && new_file)
H5F_close(new_file);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2270,7 +2270,7 @@ H5Fopen(const char *filename, unsigned flags, hid_t fapl_id)
done:
if (ret_value<0 && new_file)
H5F_close(new_file);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2354,7 +2354,7 @@ H5Fflush(hid_t object_id, H5F_scope_t scope)
HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "flush failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2640,7 +2640,7 @@ H5F_flush(H5F_t *f, H5F_scope_t scope, hbool_t invalidate,
ret_value= (nerrors ? FAIL : SUCCEED);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5F_flush() */
@@ -2843,7 +2843,7 @@ H5F_close(H5F_t *f)
HGOTO_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "problems closing file");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5F_close() */
@@ -2888,7 +2888,7 @@ H5Fclose(hid_t file_id)
HGOTO_ERROR (H5E_ATOM, H5E_CANTINIT, FAIL, "problems closing file");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -3006,7 +3006,7 @@ done:
if (ret_value<0 && mount_point)
H5G_close(mount_point);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3129,7 +3129,7 @@ done:
if(H5G_close(mounted)<0 && ret_value>=0)
HDONE_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "can't close group");
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3200,7 +3200,7 @@ H5F_mountpoint(H5G_entry_t *find/*in,out*/)
} while (!cmp);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3234,7 +3234,7 @@ H5F_has_mount(const H5F_t *file)
ret_value=FALSE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5F_has_mount() */
@@ -3268,7 +3268,7 @@ H5F_is_mount(const H5F_t *file)
ret_value=FALSE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5F_is_mount() */
@@ -3315,7 +3315,7 @@ H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id)
HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "unable to mount file");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -3360,7 +3360,7 @@ H5Funmount(hid_t loc_id, const char *name)
HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "unable to unmount file");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -3412,7 +3412,7 @@ H5Freopen(hid_t file_id)
done:
if (ret_value<0 && new_file)
H5F_close(new_file);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -3440,7 +3440,7 @@ H5F_get_intent(const H5F_t *f)
assert(f);
- FUNC_LEAVE(f->intent);
+ FUNC_LEAVE_NOAPI(f->intent);
}
@@ -3472,7 +3472,7 @@ H5F_sizeof_addr(const H5F_t *f)
assert(f);
assert(f->shared);
- FUNC_LEAVE(f->shared->sizeof_addr);
+ FUNC_LEAVE_NOAPI(f->shared->sizeof_addr);
}
@@ -3504,7 +3504,7 @@ H5F_sizeof_size(const H5F_t *f)
assert(f);
assert(f->shared);
- FUNC_LEAVE(f->shared->sizeof_size);
+ FUNC_LEAVE_NOAPI(f->shared->sizeof_size);
}
@@ -3537,7 +3537,7 @@ unsigned H5F_sym_leaf_k(const H5F_t *f)
assert(f);
assert(f->shared);
- FUNC_LEAVE(f->shared->sym_leaf_k);
+ FUNC_LEAVE_NOAPI(f->shared->sym_leaf_k);
}
@@ -3572,7 +3572,7 @@ H5F_Kvalue(const H5F_t *f, const H5B_class_t *type)
assert(f->shared);
assert(type);
- FUNC_LEAVE(f->shared->btree_k[type->id]);
+ FUNC_LEAVE_NOAPI(f->shared->btree_k[type->id]);
} /* end H5F_Kvalue() */
@@ -3602,7 +3602,7 @@ H5F_get_driver_id(const H5F_t *f)
assert(f->shared);
assert(f->shared->lf);
- FUNC_LEAVE(f->shared->lf->driver_id);
+ FUNC_LEAVE_NOAPI(f->shared->lf->driver_id);
}
@@ -3639,7 +3639,7 @@ H5F_get_fileno(const H5F_t *f, unsigned long *filenum)
HGOTO_ERROR(H5E_FILE, H5E_BADRANGE, FAIL, "can't retrieve fileno");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5F_get_fileno() */
@@ -3668,7 +3668,7 @@ H5F_get_base_addr(const H5F_t *f)
assert(f);
assert(f->shared);
- FUNC_LEAVE(f->shared->base_addr);
+ FUNC_LEAVE_NOAPI(f->shared->base_addr);
} /* end H5F_get_base_addr() */
@@ -3723,7 +3723,7 @@ H5F_block_read(H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size, hid_t dxpl_
HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "file read failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3782,7 +3782,7 @@ H5F_block_write(H5F_t *f, H5FD_mem_t type, haddr_t addr, size_t size,
HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3911,7 +3911,7 @@ H5F_addr_pack(H5F_t UNUSED *f, haddr_t *addr_p/*out*/,
*addr_p |= ((uint64_t)objno[1]) << (8*sizeof(long));
#endif
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
@@ -4026,5 +4026,5 @@ H5F_debug(H5F_t *f, haddr_t UNUSED addr, FILE * stream, int indent,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5FD.c b/src/H5FD.c
index 70098ce..3ba0739 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -91,7 +91,7 @@ H5FD_init_interface(void)
HDmemset(file_serial_no,0,sizeof(file_serial_no));
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -131,7 +131,7 @@ H5FD_term_interface(void)
n = 1; /*H5I*/
}
}
- FUNC_LEAVE(n);
+ FUNC_LEAVE_NOAPI(n);
}
@@ -160,7 +160,7 @@ H5FD_free_cls(H5FD_class_t *cls)
H5MM_xfree(cls);
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
@@ -229,7 +229,7 @@ done:
if(saved)
H5MM_xfree(saved);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -269,7 +269,7 @@ H5FDunregister(hid_t driver_id)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "unable to unregister file driver");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -330,7 +330,7 @@ H5FD_get_class(hid_t id)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -365,7 +365,7 @@ H5FD_sb_size(H5FD_t *file)
ret_value = (file->cls->sb_size)(file);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -403,7 +403,7 @@ H5FD_sb_encode(H5FD_t *file, char *name/*out*/, uint8_t *buf)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver sb_encode request failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -436,7 +436,7 @@ H5FD_sb_decode(H5FD_t *file, const char *name, const uint8_t *buf)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver sb_decode request failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -479,7 +479,7 @@ H5FD_fapl_get(H5FD_t *file)
ret_value = (file->cls->fapl_get)(file);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -531,7 +531,7 @@ H5FD_fapl_copy(hid_t driver_id, const void *old_fapl)
ret_value=new_fapl;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -572,7 +572,7 @@ H5FD_fapl_free(hid_t driver_id, void *fapl)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -624,7 +624,7 @@ H5FD_dxpl_copy(hid_t driver_id, const void *old_dxpl)
ret_value=new_dxpl;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -665,7 +665,7 @@ H5FD_dxpl_free(hid_t driver_id, void *dxpl)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -742,7 +742,7 @@ H5FDopen(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, NULL, "unable to open file");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -840,7 +840,7 @@ H5FD_open(const char *name, unsigned flags, hid_t fapl_id, haddr_t maxaddr)
done:
/* Can't cleanup 'file' information, since we don't know what type it is */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -879,7 +879,7 @@ H5FDclose(H5FD_t *file)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "unable to close file");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -965,7 +965,7 @@ H5FD_close(H5FD_t *file)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "close failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1004,7 +1004,7 @@ H5FDcmp(const H5FD_t *f1, const H5FD_t *f2)
ret_value = H5FD_cmp(f1, f2);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1054,7 +1054,7 @@ H5FD_cmp(const H5FD_t *f1, const H5FD_t *f2)
ret_value = (f1->cls->cmp)(f1, f2);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1088,7 +1088,7 @@ H5FDquery(const H5FD_t *f, unsigned long *flags/*out*/)
ret_value = H5FD_query(f, flags);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1125,7 +1125,7 @@ H5FD_query(const H5FD_t *f, unsigned long *flags/*out*/)
*flags=0;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1191,7 +1191,7 @@ H5FDalloc(H5FD_t *file, H5FD_mem_t type, hsize_t size)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, HADDR_UNDEF, "unable to allocate file memory");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1576,7 +1576,7 @@ H5FD_alloc(H5FD_t *file, H5FD_mem_t type, hsize_t size)
} /* end else */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1665,7 +1665,7 @@ H5FD_real_alloc(H5FD_t *file, H5FD_mem_t type, hsize_t size)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_real_alloc() */
@@ -1710,7 +1710,7 @@ H5FDfree(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "file deallocation request failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1944,7 +1944,7 @@ H5FD_free(H5FD_t *file, H5FD_mem_t type, haddr_t addr, hsize_t size)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1979,7 +1979,7 @@ H5FDrealloc(H5FD_t *file, H5FD_mem_t type, haddr_t old_addr, hsize_t old_size,
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, HADDR_UNDEF, "file reallocation request failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2059,7 +2059,7 @@ H5FD_realloc(H5FD_t *file, H5FD_mem_t type, haddr_t old_addr, hsize_t old_size,
ret_value=new_addr;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2097,7 +2097,7 @@ H5FDget_eoa(H5FD_t *file)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, HADDR_UNDEF, "file get eoa request failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2130,7 +2130,7 @@ H5FD_get_eoa(H5FD_t *file)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, HADDR_UNDEF, "driver get_eoa request failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2180,7 +2180,7 @@ H5FDset_eoa(H5FD_t *file, haddr_t addr)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "file set eoa request failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2215,7 +2215,7 @@ H5FD_set_eoa(H5FD_t *file, haddr_t addr)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver set_eoa request failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2262,7 +2262,7 @@ H5FDget_eof(H5FD_t *file)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, HADDR_UNDEF, "file get eof request failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2300,7 +2300,7 @@ H5FD_get_eof(H5FD_t *file)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2352,7 +2352,7 @@ H5FDread(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t size
HGOTO_ERROR(H5E_VFL, H5E_READERROR, FAIL, "file read request failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2531,7 +2531,7 @@ H5FD_read(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t siz
} /* end else */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2580,7 +2580,7 @@ H5FDwrite(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t siz
HGOTO_ERROR(H5E_VFL, H5E_WRITEERROR, FAIL, "file write request failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2822,7 +2822,7 @@ H5FD_write(H5FD_t *file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, size_t si
} /* end else */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2862,7 +2862,7 @@ H5FDflush(H5FD_t *file, unsigned closing)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "file flush request failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2908,7 +2908,7 @@ H5FD_flush(H5FD_t *file, unsigned closing)
HGOTO_ERROR(H5E_VFL, H5E_CANTINIT, FAIL, "driver flush request failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2942,7 +2942,7 @@ H5FD_get_fileno(const H5FD_t *file, unsigned long *filenum)
HDmemcpy(filenum,file->fileno,sizeof(file->fileno));
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5F_get_fileno() */
@@ -2973,7 +2973,7 @@ herr_t H5FDget_vfd_handle(H5FD_t *file, hid_t fapl, void** file_handle)
ret_value=H5FD_get_vfd_handle(file, fapl, file_handle);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -3002,5 +3002,5 @@ herr_t H5FD_get_vfd_handle(H5FD_t *file, hid_t fapl, void** file_handle)
HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get file handle for file driver");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5FDcore.c b/src/H5FDcore.c
index d062835..14ab106 100644
--- a/src/H5FDcore.c
+++ b/src/H5FDcore.c
@@ -157,7 +157,7 @@ H5FD_core_init(void)
ret_value=H5FD_CORE_g;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -204,7 +204,7 @@ H5Pset_fapl_core(hid_t fapl_id, size_t increment, hbool_t backing_store)
ret_value= H5P_set_driver(plist, H5FD_CORE, &fa);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -255,7 +255,7 @@ H5Pget_fapl_core(hid_t fapl_id, size_t *increment/*out*/,
*backing_store = fa->backing_store;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -294,7 +294,7 @@ H5FD_core_fapl_get(H5FD_t *_file)
ret_value=fa;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -363,7 +363,7 @@ H5FD_core_open(const char *name, unsigned UNUSED flags, hid_t fapl_id,
ret_value=(H5FD_t *)file;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -416,7 +416,7 @@ H5FD_core_flush(H5FD_t *_file, unsigned UNUSED closing)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -461,7 +461,7 @@ H5FD_core_close(H5FD_t *_file)
H5MM_xfree(file);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -510,7 +510,7 @@ H5FD_core_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
ret_value = HDstrcmp(f1->name, f2->name);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -545,7 +545,7 @@ H5FD_core_get_eoa(H5FD_t *_file)
ret_value=file->eoa;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -581,7 +581,7 @@ H5FD_core_set_eoa(H5FD_t *_file, haddr_t addr)
file->eoa = addr;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -618,7 +618,7 @@ H5FD_core_get_eof(H5FD_t *_file)
ret_value=MAX(file->eof, file->eoa);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -650,7 +650,7 @@ H5FD_core_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void** file_handle)
*file_handle = &(file->mem);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -717,7 +717,7 @@ H5FD_core_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, hadd
HDmemset(buf, 0, size);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -786,5 +786,5 @@ H5FD_core_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, had
file->dirty = TRUE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c
index f6ad440..831b60c 100644
--- a/src/H5FDfamily.c
+++ b/src/H5FDfamily.c
@@ -152,7 +152,7 @@ H5FD_family_init(void)
ret_value=H5FD_FAMILY_g;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -212,7 +212,7 @@ H5Pset_fapl_family(hid_t fapl_id, hsize_t memb_size, hid_t memb_fapl_id)
ret_value= H5P_set_driver(plist, H5FD_FAMILY, &fa);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -264,7 +264,7 @@ H5Pget_fapl_family(hid_t fapl_id, hsize_t *memb_size/*out*/,
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -311,7 +311,7 @@ done:
if(fa!=NULL)
H5MM_xfree(fa);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -364,7 +364,7 @@ done:
if(new_fa!=NULL)
H5MM_xfree(new_fa);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -396,7 +396,7 @@ H5FD_family_fapl_free(void *_fa)
H5MM_xfree(fa);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -447,7 +447,7 @@ done:
if(new_dx!=NULL)
H5MM_xfree(new_dx);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -479,7 +479,7 @@ H5FD_family_dxpl_free(void *_dx)
H5MM_xfree(dx);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -611,7 +611,7 @@ done:
H5MM_xfree(file->name);
H5MM_xfree(file);
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -664,7 +664,7 @@ H5FD_family_close(H5FD_t *_file)
H5MM_xfree(file);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -701,7 +701,7 @@ H5FD_family_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
ret_value= H5FDcmp(f1->memb[0], f2->memb[0]);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -739,7 +739,7 @@ H5FD_family_query(const H5FD_t UNUSED * _f, unsigned long *flags /* out */)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -773,7 +773,7 @@ H5FD_family_get_eoa(H5FD_t *_file)
ret_value=file->eoa;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -844,7 +844,7 @@ H5FD_family_set_eoa(H5FD_t *_file, haddr_t eoa)
file->eoa = eoa;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -899,7 +899,7 @@ H5FD_family_get_eof(H5FD_t *_file)
ret_value=MAX(eof, file->eoa);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -941,7 +941,7 @@ H5FD_family_get_handle(H5FD_t *_file, hid_t fapl, void** file_handle)
ret_value = H5FD_get_vfd_handle(file->memb[memb], fapl, file_handle);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1019,7 +1019,7 @@ H5FD_family_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, si
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1096,7 +1096,7 @@ H5FD_family_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, s
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1133,5 +1133,5 @@ H5FD_family_flush(H5FD_t *_file, unsigned closing)
HGOTO_ERROR(H5E_IO, H5E_BADVALUE, FAIL, "unable to flush member files");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5FDgass.c b/src/H5FDgass.c
index 4b42b27..0ea1668 100644
--- a/src/H5FDgass.c
+++ b/src/H5FDgass.c
@@ -196,7 +196,7 @@ H5FD_gass_init(void)
ret_value=H5FD_GASS_g;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -252,7 +252,7 @@ H5Pset_fapl_gass(hid_t fapl_id, GASS_Info info)
ret_value= H5P_set_driver(plist, H5FD_GASS, &fa);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -302,7 +302,7 @@ H5Pget_fapl_gass(hid_t fapl_id, GASS_Info *info/*out*/)
*info = fa->info;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -432,7 +432,7 @@ H5FD_gass_open(const char *name, unsigned flags, hid_t fapl_id,
ret_value=(H5FD_t*)file;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -469,7 +469,7 @@ H5FD_gass_close (H5FD_t *_file)
H5MM_xfree(file);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -505,7 +505,7 @@ H5FD_gass_query(const UNUSED H5FD_t *_f, unsigned long *flags /* out */)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -539,7 +539,7 @@ H5FD_gass_get_eoa(H5FD_t *_file)
ret_value=file->eoa;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -570,7 +570,7 @@ H5FD_gass_set_eoa(H5FD_t *_file, haddr_t addr)
file->eoa = addr;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -606,7 +606,7 @@ H5FD_gass_get_eof(H5FD_t *_file)
ret_value=MAX(file->eof, file->eoa);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -638,7 +638,7 @@ H5FD_gass_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void** file_handle)
*file_handle = &(file->fd);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -721,7 +721,7 @@ H5FD_gass_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t dxpl_id/*unused*/, h
file->op = OP_READ;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -800,7 +800,7 @@ H5FD_gass_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id/*unused*/, haddr_t
file->eof = file->pos;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
#endif /* H5_HAVE_GASS */
diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index f42da62..736695d 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -257,7 +257,7 @@ H5FD_log_init(void)
ret_value=H5FD_LOG_g;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
#ifdef H5_WANT_H5_V1_4_COMPAT
@@ -305,7 +305,7 @@ H5Pset_fapl_log(hid_t fapl_id, const char *logfile, int verbosity)
ret_value= H5P_set_driver(plist, H5FD_LOG, &fa);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
#else /* H5_WANT_H5_V1_4_COMPAT */
@@ -348,7 +348,7 @@ H5Pset_fapl_log(hid_t fapl_id, const char *logfile, unsigned flags, size_t buf_s
ret_value= H5P_set_driver(plist, H5FD_LOG, &fa);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
#endif /* H5_WANT_H5_V1_4_COMPAT */
@@ -384,7 +384,7 @@ H5FD_log_fapl_get(H5FD_t *_file)
ret_value= H5FD_log_fapl_copy(&(file->fa));
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_log_fapl_get() */
@@ -427,7 +427,7 @@ H5FD_log_fapl_copy(const void *_old_fa)
ret_value=new_fa;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_log_fapl_copy() */
@@ -461,7 +461,7 @@ H5FD_log_fapl_free(void *_fa)
H5MM_xfree(fa);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_log_fapl_free() */
@@ -578,7 +578,7 @@ done:
HDclose(fd);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_log_open() */
@@ -708,7 +708,7 @@ H5FD_log_close(H5FD_t *_file)
H5MM_xfree(file);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -764,7 +764,7 @@ H5FD_log_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
#endif
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -802,7 +802,7 @@ H5FD_log_query(const H5FD_t UNUSED * _f, unsigned long *flags /* out */)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -859,7 +859,7 @@ H5FD_log_alloc(H5FD_t *_file, H5FD_mem_t type, hsize_t size)
ret_value=addr;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5FD_log_alloc() */
@@ -893,7 +893,7 @@ H5FD_log_get_eoa(H5FD_t *_file)
ret_value=file->eoa;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -926,7 +926,7 @@ H5FD_log_set_eoa(H5FD_t *_file, haddr_t addr)
file->eoa = addr;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -962,7 +962,7 @@ H5FD_log_get_eof(H5FD_t *_file)
ret_value=MAX(file->eof, file->eoa);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -994,7 +994,7 @@ H5FD_log_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void** file_handle)
*file_handle = &(file->fd);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1105,7 +1105,7 @@ H5FD_log_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, haddr
file->op = OP_READ;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1277,7 +1277,7 @@ H5FD_log_write(H5FD_t *_file, H5FD_mem_t type, hid_t UNUSED dxpl_id, haddr_t add
file->eof = file->pos;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1317,5 +1317,5 @@ H5FD_log_flush(H5FD_t *_file, unsigned UNUSED closing)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 0a483f0..c49cec3 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -188,7 +188,7 @@ H5FD_mpio_init(void)
ret_value=H5FD_MPIO_g;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -273,7 +273,7 @@ H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info)
ret_value= H5P_set_driver(plist, H5FD_MPIO, &fa);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -333,7 +333,7 @@ H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm/*out*/, MPI_Info *info/*out*/)
*info = fa->info;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -388,7 +388,7 @@ H5Pset_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t xfer_mode)
ret_value= H5P_set_driver(plist, H5FD_MPIO, &dx);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -433,7 +433,7 @@ H5Pget_dxpl_mpio(hid_t dxpl_id, H5FD_mpio_xfer_t *xfer_mode/*out*/)
*xfer_mode = dx->xfer_mode;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -468,7 +468,7 @@ H5FD_mpio_communicator(H5FD_t *_file)
ret_value=file->comm;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -502,7 +502,7 @@ H5FD_mpio_mpi_rank(H5FD_t *_file)
ret_value=file->mpi_rank;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_mpio_mpi_rank() */
@@ -536,7 +536,7 @@ H5FD_mpio_mpi_size(H5FD_t *_file)
ret_value=file->mpi_size;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_mpio_mpi_size() */
@@ -590,7 +590,7 @@ H5FD_mpio_setup(hid_t dxpl_id, MPI_Datatype btype, MPI_Datatype ftype, unsigned
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't insert MPI-I/O property");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -634,7 +634,7 @@ H5FD_mpio_teardown(hid_t dxpl_id)
HGOTO_ERROR(H5E_PLIST, H5E_CANTDELETE, FAIL, "can't remove MPI-I/O property");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -687,7 +687,7 @@ H5FD_mpio_wait_for_left_neighbor(H5FD_t *_file)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -735,7 +735,7 @@ H5FD_mpio_signal_right_neighbor(H5FD_t *_file)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -780,7 +780,7 @@ H5FD_mpio_fapl_get(H5FD_t *_file)
ret_value=fa;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -965,7 +965,7 @@ done:
if (H5FD_mpio_Debug[(int)'t'])
fprintf(stdout, "Leaving H5FD_mpio_open\n" );
#endif
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1017,7 +1017,7 @@ done:
if (H5FD_mpio_Debug[(int)'t'])
fprintf(stdout, "Leaving H5FD_mpio_close\n");
#endif
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1062,7 +1062,7 @@ H5FD_mpio_query(const H5FD_t UNUSED *_file, unsigned long *flags /* out */)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1099,7 +1099,7 @@ H5FD_mpio_get_eoa(H5FD_t *_file)
ret_value=file->eoa;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1135,7 +1135,7 @@ H5FD_mpio_set_eoa(H5FD_t *_file, haddr_t addr)
file->eoa = addr;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1179,7 +1179,7 @@ H5FD_mpio_get_eof(H5FD_t *_file)
ret_value=file->eof;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1211,7 +1211,7 @@ H5FD_mpio_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void** file_handle)
*file_handle = &(file->f);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1468,7 +1468,7 @@ done:
fprintf(stdout, "Leaving H5FD_mpio_read\n" );
#endif
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1811,7 +1811,7 @@ done:
fprintf(stdout, "proc %d: Leaving H5FD_mpio_write with ret_value=%d\n",
file->mpi_rank, ret_value );
#endif
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1918,7 +1918,7 @@ done:
fprintf(stdout, "Leaving H5FD_mpio_flush\n" );
#endif
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1956,7 +1956,7 @@ H5FD_mpio_MPIOff_to_haddr(MPI_Offset mpi_off)
else
ret_value=(haddr_t)mpi_off;
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1999,6 +1999,6 @@ H5FD_mpio_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off/*out*/)
else
ret_value=SUCCEED;
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
#endif /* H5_HAVE_PARALLEL */
diff --git a/src/H5FDmpiposix.c b/src/H5FDmpiposix.c
index f1a2768..783beba 100644
--- a/src/H5FDmpiposix.c
+++ b/src/H5FDmpiposix.c
@@ -263,7 +263,7 @@ H5FD_mpiposix_init(void)
ret_value=H5FD_MPIPOSIX_g;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_mpiposix_init() */
@@ -315,7 +315,7 @@ H5Pset_fapl_mpiposix(hid_t fapl_id, MPI_Comm comm)
ret_value= H5P_set_driver(plist, H5FD_MPIPOSIX, &fa);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Pset_fapl_mpiposix() */
@@ -364,7 +364,7 @@ H5Pget_fapl_mpiposix(hid_t fapl_id, MPI_Comm *comm/*out*/)
*comm = fa->comm;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Pget_fapl_mpiposix() */
@@ -399,7 +399,7 @@ H5FD_mpiposix_communicator(H5FD_t *_file)
ret_value=file->comm;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_mpi_posix_communicator() */
@@ -433,7 +433,7 @@ H5FD_mpiposix_mpi_rank(H5FD_t *_file)
ret_value=file->mpi_rank;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_mpiposix_mpi_rank() */
@@ -467,7 +467,7 @@ H5FD_mpiposix_mpi_size(H5FD_t *_file)
ret_value=file->mpi_size;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_mpiposix_mpi_size() */
@@ -511,7 +511,7 @@ H5FD_mpiposix_fapl_get(H5FD_t *_file)
ret_value=fa;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_mpiposix_fapl_get() */
@@ -712,7 +712,7 @@ done:
HDclose(fd);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_mpiposix_open() */
@@ -749,7 +749,7 @@ H5FD_mpiposix_close(H5FD_t *_file)
H5MM_xfree(file);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_mpiposix_close() */
@@ -804,7 +804,7 @@ H5FD_mpiposix_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
#endif
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_mpiposix_cmp() */
@@ -848,7 +848,7 @@ H5FD_mpiposix_query(const H5FD_t UNUSED *_file, unsigned long *flags /* out */)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_mpiposix_query() */
@@ -884,7 +884,7 @@ H5FD_mpiposix_get_eoa(H5FD_t *_file)
ret_value=file->eoa;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_mpiposix_get_eoa() */
@@ -919,7 +919,7 @@ H5FD_mpiposix_set_eoa(H5FD_t *_file, haddr_t addr)
file->eoa = addr;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_mpi_posix_set_eoa() */
@@ -960,7 +960,7 @@ H5FD_mpiposix_get_eof(H5FD_t *_file)
ret_value=MAX(file->eof,file->eoa);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_mpiposix_get_eof() */
@@ -992,7 +992,7 @@ H5FD_mpiposix_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void** file_handle)
*file_handle = &(file->fd);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1088,7 +1088,7 @@ done:
file->op = OP_UNKNOWN;
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_mpiposix_read() */
@@ -1246,7 +1246,7 @@ done:
} /* end if */
} /* end else */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_mpiposix_write() */
@@ -1320,7 +1320,7 @@ H5FD_mpiposix_flush(H5FD_t *_file, unsigned UNUSED closing)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FD_mpiposix_flush() */
#endif /*H5_HAVE_PARALLEL*/
diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c
index 526f539..ecd4d62 100644
--- a/src/H5FDsec2.c
+++ b/src/H5FDsec2.c
@@ -215,7 +215,7 @@ H5FD_sec2_init(void)
ret_value=H5FD_SEC2_g;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -250,7 +250,7 @@ H5Pset_fapl_sec2(hid_t fapl_id)
ret_value= H5P_set_driver(plist, H5FD_SEC2, NULL);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -336,7 +336,7 @@ done:
HDclose(fd);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -370,7 +370,7 @@ H5FD_sec2_close(H5FD_t *_file)
H5FL_FREE(H5FD_sec2_t,file);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -426,7 +426,7 @@ H5FD_sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
#endif
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -464,7 +464,7 @@ H5FD_sec2_query(const H5FD_t UNUSED * _f, unsigned long *flags /* out */)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -498,7 +498,7 @@ H5FD_sec2_get_eoa(H5FD_t *_file)
ret_value=file->eoa;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -531,7 +531,7 @@ H5FD_sec2_set_eoa(H5FD_t *_file, haddr_t addr)
file->eoa = addr;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -567,7 +567,7 @@ H5FD_sec2_get_eof(H5FD_t *_file)
ret_value=MAX(file->eof, file->eoa);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -598,7 +598,7 @@ H5FD_sec2_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void** file_handle)
*file_handle = &(file->fd);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -680,7 +680,7 @@ done:
file->op = OP_UNKNOWN;
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -758,7 +758,7 @@ done:
file->op = OP_UNKNOWN;
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -819,5 +819,5 @@ H5FD_sec2_flush(H5FD_t *_file, unsigned UNUSED closing)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5FDsrb.c b/src/H5FDsrb.c
index f2d87c8..480bf45 100644
--- a/src/H5FDsrb.c
+++ b/src/H5FDsrb.c
@@ -174,7 +174,7 @@ H5FD_srb_init(void)
ret_value=H5FD_SRB_g;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -228,7 +228,7 @@ H5Pset_fapl_srb(hid_t fapl_id, SRB_Info info)
ret_value = H5P_set_driver(plist, H5FD_SRB, &fa);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -273,7 +273,7 @@ H5Pget_fapl_srb(hid_t fapl_id, SRB_Info *info/*out*/)
*info = fa->info;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -408,7 +408,7 @@ done:
if(srb_fid>=0)
srbFileClose(fa->srb_conn, srb_fid);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -439,7 +439,7 @@ H5FD_srb_close(H5FD_t *_file)
H5MM_xfree(file);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -475,7 +475,7 @@ H5FD_srb_query(const UNUSED H5FD_t *_f, unsigned long *flags /* out */)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -508,7 +508,7 @@ H5FD_srb_get_eoa(H5FD_t *_file)
ret_value=file->eoa;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -541,7 +541,7 @@ H5FD_srb_set_eoa(H5FD_t *_file, haddr_t addr)
file->eoa = addr;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -573,7 +573,7 @@ H5FD_srb_get_eof(H5FD_t *_file)
ret_value=file->eof;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -605,7 +605,7 @@ H5FD_srb_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void** file_handle)
*file_handle = &(file->fd);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -676,7 +676,7 @@ done:
clFinish(file->srb_conn);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -741,7 +741,7 @@ done:
clFinish(file->srb_conn);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -775,7 +775,7 @@ done:
clFinish(file->srb_conn);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
#endif /* H5_HAVE_SRB */
diff --git a/src/H5FDstream.c b/src/H5FDstream.c
index a5c89bf..e60c7a7 100644
--- a/src/H5FDstream.c
+++ b/src/H5FDstream.c
@@ -241,7 +241,7 @@ hid_t H5FD_stream_init (void)
ret_value=H5FD_STREAM_g;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -291,7 +291,7 @@ herr_t H5Pset_fapl_stream (hid_t fapl_id, H5FD_stream_fapl_t *fapl)
ret_value = H5P_set_driver (plist, H5FD_STREAM, &default_fapl);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -330,7 +330,7 @@ herr_t H5Pget_fapl_stream(hid_t fapl_id, H5FD_stream_fapl_t *fapl /* out */)
*fapl = *this_fapl;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -367,7 +367,7 @@ H5FD_stream_fapl_get (H5FD_t *_stream)
ret_value=fapl;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -476,7 +476,7 @@ done:
H5FD_STREAM_CLOSE_SOCKET(sock);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -533,7 +533,7 @@ H5FD_stream_read_from_socket (H5FD_stream_t *stream)
(int) stream->eof);
#endif
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -672,7 +672,7 @@ done:
} /* end if */
}
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -745,7 +745,7 @@ H5FD_stream_flush (H5FD_t *_stream, unsigned UNUSED closing)
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -785,7 +785,7 @@ H5FD_stream_close (H5FD_t *_stream)
H5MM_xfree (stream);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -823,7 +823,7 @@ H5FD_stream_query(const H5FD_t UNUSED * _f,
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -856,7 +856,7 @@ H5FD_stream_get_eoa (H5FD_t *_stream)
ret_value=stream->eoa;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -891,7 +891,7 @@ H5FD_stream_set_eoa (H5FD_t *_stream, haddr_t addr)
stream->eoa = addr;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -926,7 +926,7 @@ H5FD_stream_get_eof (H5FD_t *_stream)
ret_value= MAX (stream->eof, stream->eoa);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -958,7 +958,7 @@ H5FD_stream_get_handle(H5FD_t *_file, hid_t UNUSED fapl, void** file_handle)
*file_handle = &(file->socket);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1020,7 +1020,7 @@ H5FD_stream_read (H5FD_t *_stream,
HDmemset (buf, 0, size);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1091,7 +1091,7 @@ H5FD_stream_write (H5FD_t *_stream,
stream->dirty = TRUE;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
#endif /* H5_HAVE_STREAM */
diff --git a/src/H5FL.c b/src/H5FL.c
index 1e49834..5d7302f 100644
--- a/src/H5FL.c
+++ b/src/H5FL.c
@@ -132,7 +132,7 @@ H5FL_malloc(size_t mem_size)
} /* end if */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_malloc() */
@@ -179,7 +179,7 @@ H5FL_reg_init(H5FL_reg_head_t *head)
head->size=sizeof(void *);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_reg_init() */
@@ -243,7 +243,7 @@ H5FL_reg_free(H5FL_reg_head_t *head, void *obj)
H5FL_reg_gc();
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_reg_free() */
@@ -302,7 +302,7 @@ H5FL_reg_malloc(H5FL_reg_head_t *head)
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_reg_malloc() */
@@ -339,7 +339,7 @@ H5FL_reg_calloc(H5FL_reg_head_t *head)
HDmemset(ret_value,0,head->size);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_reg_calloc() */
@@ -396,7 +396,7 @@ H5FL_reg_gc_list(H5FL_reg_head_t *head)
/* Decrement global count of free memory on "regular" lists */
H5FL_reg_gc_head.mem_freed-=total_mem;
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
} /* end H5FL_reg_gc_list() */
@@ -437,7 +437,7 @@ H5FL_reg_gc(void)
/* Double check that all the memory on the free lists is recycled */
assert(H5FL_reg_gc_head.mem_freed==0);
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
} /* end H5FL_reg_gc() */
@@ -509,7 +509,7 @@ H5FL_reg_term(void)
/* Terminating this layer never affects other layers; rather, other layers affect
* the termination of this layer. */
- FUNC_LEAVE(0);
+ FUNC_LEAVE_NOAPI(0);
} /* end H5FL_reg_term() */
@@ -565,7 +565,7 @@ H5FL_blk_find_list(H5FL_blk_node_t **head, size_t size)
ret_value=temp;
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_blk_find_list() */
@@ -617,7 +617,7 @@ H5FL_blk_create_list(H5FL_blk_node_t **head, size_t size)
ret_value=temp;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_blk_create_list() */
@@ -660,7 +660,7 @@ H5FL_blk_init(H5FL_blk_head_t *head)
head->init=1;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_blk_init() */
@@ -698,7 +698,7 @@ H5FL_blk_free_block_avail(H5FL_blk_head_t *head, size_t size)
else
ret_value=FALSE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_blk_free_block_avail() */
@@ -774,7 +774,7 @@ H5FL_blk_malloc(H5FL_blk_head_t *head, size_t size)
} /* end else */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_blk_malloc() */
@@ -815,7 +815,7 @@ H5FL_blk_calloc(H5FL_blk_head_t *head, size_t size)
HDmemset(ret_value,0,size);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_blk_calloc() */
@@ -886,7 +886,7 @@ H5FL_blk_free(H5FL_blk_head_t *head, void *block)
H5FL_blk_gc();
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_blk_free() */
@@ -940,7 +940,7 @@ H5FL_blk_realloc(H5FL_blk_head_t *head, void *block, size_t new_size)
ret_value=H5FL_blk_malloc(head,new_size);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_blk_realloc() */
@@ -1004,7 +1004,7 @@ H5FL_blk_gc_list(H5FL_blk_head_t *head)
/* Double check that all the memory on this list is recycled */
assert(head->list_mem==0);
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
} /* end H5FL_blk_gc_list() */
@@ -1043,7 +1043,7 @@ H5FL_blk_gc(void)
/* Double check that all the memory on the free lists are recycled */
assert(H5FL_blk_gc_head.mem_freed==0);
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
} /* end H5FL_blk_gc() */
@@ -1104,7 +1104,7 @@ printf("H5FL_blk_term: head->name=%s, head->allocated=%d\n", H5FL_blk_gc_head.fi
/* Point to the list of nodes left with allocations open, if any */
H5FL_blk_gc_head.first=left;
- FUNC_LEAVE (H5FL_blk_gc_head.first!=NULL ? 1 : 0);
+ FUNC_LEAVE_NOAPI(H5FL_blk_gc_head.first!=NULL ? 1 : 0);
} /* end H5FL_blk_term() */
@@ -1163,7 +1163,7 @@ H5FL_arr_init(H5FL_arr_head_t *head)
head->init=1;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_arr_init() */
@@ -1244,7 +1244,7 @@ H5FL_arr_free(H5FL_arr_head_t *head, void *obj)
H5FL_blk_free(&(head->u.queue),obj);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_arr_free() */
@@ -1329,7 +1329,7 @@ H5FL_arr_malloc(H5FL_arr_head_t *head, size_t elem)
ret_value=H5FL_blk_malloc(&(head->u.queue),mem_size);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_arr_malloc() */
@@ -1366,7 +1366,7 @@ H5FL_arr_calloc(H5FL_arr_head_t *head, size_t elem)
HDmemset(ret_value,0,head->size*elem);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_arr_calloc() */
@@ -1431,7 +1431,7 @@ H5FL_arr_realloc(H5FL_arr_head_t *head, void * obj, size_t new_elem)
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_arr_realloc() */
@@ -1501,7 +1501,7 @@ H5FL_arr_gc_list(H5FL_arr_head_t *head)
else
H5FL_blk_gc_list(&(head->u.queue));
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
} /* end H5FL_arr_gc_list() */
@@ -1540,7 +1540,7 @@ H5FL_arr_gc(void)
/* Double check that all the memory on the free lists are recycled */
assert(H5FL_arr_gc_head.mem_freed==0);
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
} /* end H5FL_arr_gc() */
@@ -1629,7 +1629,7 @@ printf("H5FL_arr_term: head->name=%s, head->allocated=%d\n", H5FL_arr_gc_head.fi
/* Point to the list of nodes left with allocations open, if any */
H5FL_arr_gc_head.first=left;
- FUNC_LEAVE (H5FL_arr_gc_head.first!=NULL ? 1 : 0);
+ FUNC_LEAVE_NOAPI(H5FL_arr_gc_head.first!=NULL ? 1 : 0);
} /* end H5FL_arr_term() */
@@ -1662,7 +1662,7 @@ H5FL_garbage_coll(void)
/* Garbage collect the free lists for regular objects */
H5FL_reg_gc();
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
} /* end H5FL_garbage_coll() */
@@ -1718,7 +1718,7 @@ H5FL_set_free_list_limits(int reg_global_lim, int reg_list_lim, int arr_global_l
H5FL_blk_lst_mem_lim=(blk_list_lim==-1 ? UINT_MAX : (size_t)blk_list_lim);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FL_set_free_list_limits() */
@@ -1753,6 +1753,6 @@ H5FL_term_interface(void)
ret_value=H5FL_reg_term()+H5FL_arr_term()+H5FL_blk_term();
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5FO.c b/src/H5FO.c
index 9e6011f..4f58f7e 100644
--- a/src/H5FO.c
+++ b/src/H5FO.c
@@ -78,7 +78,7 @@ H5FO_create(H5F_t *f)
HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "unable to create open object TBBT");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FO_create() */
@@ -128,7 +128,7 @@ H5FO_opened(const H5F_t *f, haddr_t addr)
ret_value=FAIL;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FO_opened() */
@@ -180,7 +180,7 @@ H5FO_insert(H5F_t *f, haddr_t addr, hid_t id)
HGOTO_ERROR(H5E_CACHE,H5E_CANTINSERT,FAIL,"can't insert object into TBBT");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FO_insert() */
@@ -230,7 +230,7 @@ H5FO_delete(H5F_t *f, haddr_t addr)
H5FL_FREE(H5FO_open_obj_t,open_obj);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FO_delete() */
@@ -272,6 +272,6 @@ H5FO_dest(H5F_t *f)
f->shared->open_objs=H5TB_dfree(f->shared->open_objs,NULL,NULL);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5FO_dest() */
diff --git a/src/H5FP.c b/src/H5FP.c
index 99f515c..76b44a3 100644
--- a/src/H5FP.c
+++ b/src/H5FP.c
@@ -147,7 +147,7 @@ done:
if (sap_barrier_group != MPI_GROUP_NULL)
MPI_Group_free(&sap_barrier_group);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
/*
@@ -194,7 +194,7 @@ H5FPfinalize(void)
HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "MPI_Comm_free failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
/** Public Libarary (non-API) Functions **/
@@ -228,7 +228,7 @@ H5FP_send_metadata(const char *mdata, int len, int rank)
HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "MPI_Send failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/** Private Functions **/
@@ -298,7 +298,7 @@ H5FP_commit_sap_datatypes(void)
HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "MPI_Type_commit failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -328,7 +328,7 @@ H5FP_request_sap_stop(void)
HGOTO_ERROR(H5E_INTERNAL, H5E_MPI, FAIL, "MPI_Send failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
#endif /* H5_HAVE_FPHDF5 */
diff --git a/src/H5FPclient.c b/src/H5FPclient.c
index 7912b4e..e3b7d09 100644
--- a/src/H5FPclient.c
+++ b/src/H5FPclient.c
@@ -140,7 +140,7 @@ H5FP_request_open(const char *mdata, int md_len, enum sap_obj_type obj_type,
done:
*req_id = req.req_id;
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -204,7 +204,7 @@ H5FP_request_lock(unsigned int sap_file_id, unsigned char *obj_oid,
done:
*req_id = req.req_id;
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -272,7 +272,7 @@ H5FP_request_release_lock(unsigned int sap_file_id, unsigned char *obj_oid,
done:
*req_id = req.req_id;
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -338,7 +338,7 @@ H5FP_request_change(unsigned int sap_file_id, unsigned char *obj_oid,
done:
*req_id = req.req_id;
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
#if 0
@@ -396,7 +396,7 @@ H5FP_generate_message(fid_t fid, const char *dataset, const char *group,
fphdf5->efl = &efl;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
#endif
@@ -486,7 +486,7 @@ H5FP_request_sync(unsigned int sap_file_id, hid_t hdf_file_id,
done:
*req_id = req.req_id;
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -521,7 +521,7 @@ H5FP_request_close(unsigned sap_file_id, unsigned *req_id)
*req_id = req.req_id;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/** Private Functions **/
@@ -540,7 +540,7 @@ H5FP_gen_request_id()
static unsigned int i = 0;
FUNC_ENTER_NOINIT(H5FP_gen_request_id);
- FUNC_LEAVE(i++);
+ FUNC_LEAVE_NOAPI(i++);
}
/*
@@ -649,7 +649,7 @@ done:
if (ret_value == FAIL)
H5MM_xfree(ent);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
#endif /* H5_HAVE_FPHDF5 */
diff --git a/src/H5FPserver.c b/src/H5FPserver.c
index 67972f3..24b7a6f 100644
--- a/src/H5FPserver.c
+++ b/src/H5FPserver.c
@@ -226,7 +226,7 @@ H5FP_sap_receive_loop(void)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -269,7 +269,7 @@ H5FP_sap_receive(struct SAP_request *req, int source, int tag, char **buf)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -286,7 +286,7 @@ static int H5FP_object_lock_cmp(struct sap_obj_lock *o1,
FUNC_ENTER_NOINIT(H5FP_object_lock_cmp);
assert(o1);
assert(o2);
- FUNC_LEAVE(HDmemcmp(o1->oid, o2->oid, sizeof(o1->oid)));
+ FUNC_LEAVE_NOAPI(HDmemcmp(o1->oid, o2->oid, sizeof(o1->oid)));
}
/*
@@ -322,7 +322,7 @@ H5FP_new_object_lock(const unsigned char *oid, unsigned int rank,
ret_value->rw_lock = rw_lock;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -337,7 +337,7 @@ H5FP_free_object_lock(struct sap_obj_lock *ol)
{
FUNC_ENTER_NOINIT(H5FP_free_object_lock);
HDfree(ol);
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
/*
@@ -370,7 +370,7 @@ H5FP_find_object_lock(struct sap_file_struct *fs, unsigned char *oid)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -396,7 +396,7 @@ H5FP_remove_object_lock_from_list(struct sap_file_struct *fs,
ret_value = SUCCEED;
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -412,7 +412,7 @@ H5FP_file_mod_cmp(struct sap_file_mod *k1, struct sap_file_mod *k2, int UNUSED c
FUNC_ENTER_NOINIT(H5FP_file_mod_cmp);
assert(k1);
assert(k2);
- FUNC_LEAVE(k1->key - k2->key);
+ FUNC_LEAVE_NOAPI(k1->key - k2->key);
}
/*
@@ -429,7 +429,7 @@ H5FP_new_file_mod_key(void)
static unsigned long key = 0;
FUNC_ENTER_NOINIT(H5FP_new_file_mod_key);
- FUNC_LEAVE(key++);
+ FUNC_LEAVE_NOAPI(key++);
}
/*
@@ -452,7 +452,7 @@ H5FP_free_mod_node(struct sap_file_mod *fs)
HDfree(fs);
}
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
/*
@@ -494,7 +494,7 @@ H5FP_new_file_mod_node(unsigned rank, enum sap_obj_type obj_type,
ret_value->key = H5FP_new_file_mod_key();
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -525,7 +525,7 @@ H5FP_add_file_mod_to_list(struct sap_file_struct *fs, enum sap_obj_type obj_type
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -555,7 +555,7 @@ H5FP_remove_mod_from_list(struct sap_file_struct *fs, struct sap_file_mod *mod)
ret_value = SUCCEED;
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -582,7 +582,7 @@ H5FP_free_file_struct_node(struct sap_file_struct *fs)
HDfree(fs);
}
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
/*
@@ -598,7 +598,7 @@ H5FP_file_struct_cmp(struct sap_file_struct *k1, struct sap_file_struct *k2, int
FUNC_ENTER_NOINIT(H5FP_file_struct_cmp);
assert(k1);
assert(k2);
- FUNC_LEAVE(k1->sap_file_id - k2->sap_file_id);
+ FUNC_LEAVE_NOAPI(k1->sap_file_id - k2->sap_file_id);
}
/*
@@ -638,7 +638,7 @@ H5FP_new_file_struct_node(unsigned int sap_file_id, char *filename)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -666,7 +666,7 @@ H5FP_find_file_struct(unsigned int sap_file_id)
ret_value = (struct sap_file_struct *)node->data;
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -694,7 +694,7 @@ H5FP_add_new_file_struct_to_list(unsigned int sap_file_id, char *filename)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -726,7 +726,7 @@ H5FP_remove_file_id_from_list(unsigned int sap_file_id)
ret_value = SUCCEED;
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/** Functions to reply to requests **/
@@ -750,7 +750,7 @@ H5FP_send_reply(unsigned int to, unsigned int req_id, unsigned int file_id,
HMPI_GOTO_ERROR(FAIL, "MPI_Send failed", mrc);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/** Functions to handle SAP requests **/
@@ -768,7 +768,7 @@ H5FP_gen_sap_file_id()
{
static unsigned int i = 0;
FUNC_ENTER_NOINIT(H5FP_gen_sap_file_id);
- FUNC_LEAVE(i++);
+ FUNC_LEAVE_NOAPI(i++);
}
/*
@@ -819,7 +819,7 @@ H5FP_sap_handle_open_request(struct SAP_request req, char *mdata, int UNUSED md_
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -1032,7 +1032,7 @@ HDfprintf(stderr, "%s: locking failure (%d)!!\n", FUNC, ret_value);
HDfree(oids);
H5FP_send_reply(req.proc_rank, req.req_id, req.sap_file_id, exit_state);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -1139,7 +1139,7 @@ done:
HDfprintf(stderr, "exit_state == %d\n", exit_state);
HDfree(oids);
H5FP_send_reply(req.proc_rank, req.req_id, req.sap_file_id, exit_state);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -1189,7 +1189,7 @@ H5FP_sap_handle_change_request(struct SAP_request req, char *mdata, int md_len)
}
H5FP_send_reply(req.proc_rank, req.req_id, req.sap_file_id, exit_state);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -1270,7 +1270,7 @@ HDfprintf(stderr, "%s: Trying to Synchronize!\n", FUNC);
HMPI_GOTO_ERROR(FAIL, "MPI_Send failed", mrc);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -1301,7 +1301,7 @@ H5FP_sap_handle_close_request(struct SAP_request req)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
#endif /* H5_HAVE_FPHDF5 */
diff --git a/src/H5Farray.c b/src/H5Farray.c
index 8e01099..bc82cf5 100644
--- a/src/H5Farray.c
+++ b/src/H5Farray.c
@@ -272,7 +272,7 @@ H5F_arr_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -512,5 +512,5 @@ H5F_arr_write(H5F_t *f, hid_t dxpl_id, H5O_layout_t *layout,
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Fcompact.c b/src/H5Fcompact.c
index 0a21211..5d2ad62 100644
--- a/src/H5Fcompact.c
+++ b/src/H5Fcompact.c
@@ -66,7 +66,7 @@ H5F_compact_readv(H5F_t UNUSED *f, const H5O_layout_t *layout, size_t nseq,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5F_compact_readv() */
/*-------------------------------------------------------------------------
@@ -117,5 +117,5 @@ H5F_compact_writev(H5F_t UNUSED *f, H5O_layout_t *layout, size_t nseq,
layout->dirty = TRUE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5F_compact_writev */
diff --git a/src/H5Fcontig.c b/src/H5Fcontig.c
index a63a9ce..f3d7da3 100644
--- a/src/H5Fcontig.c
+++ b/src/H5Fcontig.c
@@ -232,7 +232,7 @@ done:
H5FL_BLK_FREE(zero_fill,buf);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -270,7 +270,7 @@ H5F_contig_read(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr,
HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "vector read failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5F_contig_read() */
@@ -307,7 +307,7 @@ H5F_contig_write(H5F_t *f, hsize_t max_data, H5FD_mem_t type, haddr_t addr, size
HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "vector write failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5F_contig_write() */
@@ -729,7 +729,7 @@ H5F_contig_readv(H5F_t *f, hsize_t _max_data, H5FD_mem_t type, haddr_t _addr,
} /* end else */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5F_contig_readv() */
@@ -1199,6 +1199,6 @@ H5F_contig_writev(H5F_t *f, hsize_t _max_data, H5FD_mem_t type, haddr_t _addr,
} /* end else */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5F_contig_writev() */
diff --git a/src/H5Fistore.c b/src/H5Fistore.c
index f617092..5278554 100644
--- a/src/H5Fistore.c
+++ b/src/H5Fistore.c
@@ -235,7 +235,7 @@ H5F_istore_sizeof_rkey(H5F_t UNUSED *f, const void *_udata)
4 + /*filter mask */
udata->mesg.ndims*8; /*dimension indices */
- FUNC_LEAVE(nbytes);
+ FUNC_LEAVE_NOAPI(nbytes);
}
@@ -277,7 +277,7 @@ H5F_istore_decode_key(H5F_t UNUSED *f, H5B_t *bt, uint8_t *raw, void *_key)
UINT64DECODE(raw, key->offset[i]);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -319,7 +319,7 @@ H5F_istore_encode_key(H5F_t UNUSED *f, H5B_t *bt, uint8_t *raw, void *_key)
UINT64ENCODE(raw, key->offset[i]);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -361,7 +361,7 @@ H5F_istore_debug_key (FILE *stream, int indent, int fwidth,
HDfputs ("}\n", stream);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -406,7 +406,7 @@ H5F_istore_cmp2(H5F_t UNUSED *f, void *_lt_key, void *_udata,
ret_value = H5V_vector_cmp_s(udata->mesg.ndims, lt_key->offset, rt_key->offset);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -464,7 +464,7 @@ H5F_istore_cmp3(H5F_t UNUSED *f, void *_lt_key, void *_udata,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -541,7 +541,7 @@ H5F_istore_new_node(H5F_t *f, H5B_ins_t op,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -604,7 +604,7 @@ H5F_istore_found(H5F_t UNUSED *f, haddr_t addr, const void *_lt_key,
udata->key.offset[u] = lt_key->offset[u];
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -744,7 +744,7 @@ H5F_istore_insert(H5F_t *f, haddr_t addr, void *_lt_key,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -779,7 +779,7 @@ H5F_istore_iter_allocated (H5F_t UNUSED *f, void *_lt_key, haddr_t UNUSED addr,
bt_udata->total_storage += lt_key->nbytes;
- FUNC_LEAVE(H5B_ITER_CONT);
+ FUNC_LEAVE_NOAPI(H5B_ITER_CONT);
} /* H5F_istore_iter_allocated() */
@@ -832,7 +832,7 @@ H5F_istore_iter_dump (H5F_t UNUSED *f, void *_lt_key, haddr_t UNUSED addr,
bt_udata->total_storage++;
}
- FUNC_LEAVE(H5B_ITER_CONT);
+ FUNC_LEAVE_NOAPI(H5B_ITER_CONT);
} /* H5F_istore_iter_dump() */
@@ -868,7 +868,7 @@ H5F_istore_init (H5F_t *f)
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -989,7 +989,7 @@ done:
if(ent->chunk)
ent->chunk = H5MM_xfree(ent->chunk);
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1058,7 +1058,7 @@ H5F_istore_preempt(H5F_t *f, H5F_rdcc_ent_t * ent, hbool_t flush)
H5FL_FREE(H5F_rdcc_ent_t, ent);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1104,7 +1104,7 @@ H5F_istore_flush (H5F_t *f, hbool_t preempt)
HGOTO_ERROR (H5E_IO, H5E_CANTFLUSH, FAIL, "unable to flush one or more raw data chunks");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1151,7 +1151,7 @@ H5F_istore_dest (H5F_t *f)
HDmemset (rdcc, 0, sizeof(H5F_rdcc_t));
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1269,7 +1269,7 @@ H5F_istore_prune (H5F_t *f, size_t size)
HGOTO_ERROR (H5E_IO, H5E_CANTFLUSH, FAIL, "unable to preempt one or more raw data cache entry");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1524,7 +1524,7 @@ H5F_istore_lock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
done:
if (!ret_value)
H5MM_xfree (chunk);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1625,7 +1625,7 @@ H5F_istore_unlock(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
ent->locked = FALSE;
}
- FUNC_LEAVE (SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
@@ -1806,7 +1806,7 @@ H5F_istore_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1988,7 +1988,7 @@ H5F_istore_write(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
} /* end while */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2037,7 +2037,7 @@ H5F_istore_create(H5F_t *f, H5O_layout_t *layout /*out */ )
HGOTO_ERROR(H5E_IO, H5E_CANTINIT, FAIL, "can't create B-tree");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2077,7 +2077,7 @@ H5F_istore_allocated(H5F_t *f, unsigned ndims, haddr_t addr)
ret_value=udata.total_storage;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2116,7 +2116,7 @@ H5F_istore_dump_btree(H5F_t *f, FILE *stream, unsigned ndims, haddr_t addr)
HGOTO_ERROR(H5E_IO, H5E_CANTINIT, 0, "unable to iterate over chunk B-tree");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2181,7 +2181,7 @@ H5F_istore_stats (H5F_t *f, hbool_t headers)
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2215,7 +2215,7 @@ H5F_istore_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent,
H5B_debug (f, addr, stream, indent, fwidth, H5B_ISTORE, &udata);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2267,7 +2267,7 @@ H5F_istore_get_addr(H5F_t *f, const H5O_layout_t *layout,
ret_value=udata.addr;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5F_istore_get_addr() */
@@ -2537,7 +2537,7 @@ done:
if(chunk!=NULL)
H5MM_xfree(chunk);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2717,7 +2717,7 @@ H5F_istore_prune_by_extent(H5F_t *f, const H5O_layout_t *layout, const H5S_t * s
HGOTO_ERROR(H5E_IO, H5E_CANTINIT, 0, "unable to iterate over B-tree");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2777,7 +2777,7 @@ H5F_istore_prune_extent(H5F_t *f, void *_lt_key, haddr_t UNUSED addr,
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2816,7 +2816,7 @@ H5F_istore_remove(H5F_t *f, haddr_t addr, void *_lt_key /*in,out */ ,
*rt_key_changed = FALSE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2995,6 +2995,6 @@ done:
if(space_chunk)
H5S_close(space_chunk);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Fseq.c b/src/H5Fseq.c
index 9592725..15cb668 100644
--- a/src/H5Fseq.c
+++ b/src/H5Fseq.c
@@ -78,7 +78,7 @@ H5F_seq_read(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "vector read failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5F_seq_read() */
@@ -124,7 +124,7 @@ H5F_seq_write(H5F_t *f, hid_t dxpl_id, H5O_layout_t *layout,
HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "vector write failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5F_seq_write() */
@@ -511,7 +511,7 @@ H5F_seq_readv(H5F_t *f, hid_t dxpl_id, const H5O_layout_t *layout,
} /* end switch() */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5F_seq_readv() */
@@ -897,6 +897,6 @@ H5F_seq_writev(H5F_t *f, hid_t dxpl_id, H5O_layout_t *layout,
} /* end switch() */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5F_seq_writev() */
diff --git a/src/H5G.c b/src/H5G.c
index e99b4be..992c639 100644
--- a/src/H5G.c
+++ b/src/H5G.c
@@ -193,7 +193,7 @@ done:
H5G_close(grp);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -245,7 +245,7 @@ done:
H5G_close(grp);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -284,7 +284,7 @@ H5Gclose(hid_t group_id)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to close group");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -367,7 +367,7 @@ H5Giterate(hid_t loc_id, const char *name, int *idx,
H5I_dec_ref (udata.group_id); /*also closes udata.group*/
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -407,7 +407,7 @@ H5Gget_num_objs(hid_t group_id, hsize_t *num_objs)
ret_value = H5G_get_num_objs(group, num_objs);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -460,7 +460,7 @@ H5Gget_objname_by_idx(hid_t group_id, hsize_t idx, char *name, size_t size)
ret_value = H5G_get_objname_by_idx(group, idx, name, size);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -504,7 +504,7 @@ H5Gget_objtype_by_idx(hid_t group_id, hsize_t idx)
ret_value = H5G_get_objtype_by_idx(group, idx);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -565,7 +565,7 @@ H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to change object name");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -635,7 +635,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
HGOTO_ERROR (H5E_SYM, H5E_LINK, FAIL, "unable to create link");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -678,7 +678,7 @@ H5Gunlink(hid_t loc_id, const char *name)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to unlink object");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -720,7 +720,7 @@ H5Gget_objinfo(hid_t loc_id, const char *name, hbool_t follow_link,
HGOTO_ERROR (H5E_ARGS, H5E_CANTINIT, FAIL, "cannot stat object");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -762,7 +762,7 @@ H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf/*out*/)
HGOTO_ERROR (H5E_SYM, H5E_NOTFOUND, FAIL, "unable to get link value");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -801,7 +801,7 @@ H5Gset_comment(hid_t loc_id, const char *name, const char *comment)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to set comment value");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -848,7 +848,7 @@ H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to get comment value");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
/*
@@ -895,7 +895,7 @@ H5G_init_interface(void)
H5G_register_type(H5G_DATASET, H5D_isa, "dataset");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -948,7 +948,7 @@ H5G_term_interface(void)
}
}
- FUNC_LEAVE(n);
+ FUNC_LEAVE_NOAPI(n);
}
@@ -1022,7 +1022,7 @@ H5G_register_type(int type, htri_t(*isa)(H5G_entry_t*), const char *_desc)
done:
if (ret_value<0)
H5MM_xfree(desc);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1061,7 +1061,7 @@ H5G_component(const char *name, size_t *size_p)
if (size_p)
*size_p = HDstrcspn(name, "/");
- FUNC_LEAVE(name);
+ FUNC_LEAVE_NOAPI(name);
}
@@ -1107,7 +1107,7 @@ H5G_basename(const char *name, size_t *size_p)
if ('/'==name[i] && size_p)
*size_p = 1;
- FUNC_LEAVE(name+i);
+ FUNC_LEAVE_NOAPI(name+i);
}
@@ -1384,7 +1384,7 @@ done:
if(null_grp && group_copy)
H5G_free_ent_name(grp_ent);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1472,7 +1472,7 @@ done:
H5G_free_ent_name(&tmp_grp_ent);
H5MM_xfree (linkval);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1557,7 +1557,7 @@ H5G_mkroot (H5F_t *f, H5G_entry_t *ent)
f->nopen_objs = 0;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1626,7 +1626,7 @@ done:
H5FL_FREE(H5G_t,grp);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1662,7 +1662,7 @@ H5G_isa(H5G_entry_t *ent)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to read object header");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1715,7 +1715,7 @@ done:
if (!ret_value && grp)
H5FL_FREE(H5G_t,grp);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1774,7 +1774,7 @@ done:
if (!ret_value && grp)
H5FL_FREE(H5G_t,grp);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1810,7 +1810,7 @@ H5G_reopen(H5G_t *grp)
ret_value=grp;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1850,7 +1850,7 @@ H5G_close(H5G_t *grp)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1887,7 +1887,7 @@ H5G_rootof(H5F_t *f)
ret_value=f->shared->root_grp;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1935,7 +1935,7 @@ H5G_insert(H5G_entry_t *loc, const char *name, H5G_entry_t *ent)
HGOTO_ERROR(H5E_SYM, H5E_LINK, FAIL, "unable to increment hard link count");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1982,7 +1982,7 @@ H5G_find(H5G_entry_t *loc, const char *name,
HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2008,7 +2008,7 @@ H5G_entof (H5G_t *grp)
/* Use FUNC_ENTER_NOINIT here to avoid performance issues */
FUNC_ENTER_NOINIT(H5G_entof);
- FUNC_LEAVE(grp ? &(grp->ent) : NULL);
+ FUNC_LEAVE_NOAPI(grp ? &(grp->ent) : NULL);
}
@@ -2036,7 +2036,7 @@ H5G_fileof (H5G_t *grp)
assert (grp);
- FUNC_LEAVE(grp->ent.file);
+ FUNC_LEAVE_NOAPI(grp->ent.file);
}
@@ -2124,7 +2124,7 @@ H5G_loc (hid_t loc_id)
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2246,7 +2246,7 @@ done:
/* Free the ID to name buffer */
H5G_free_ent_name(&cur_obj);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2287,7 +2287,7 @@ H5G_get_type(H5G_entry_t *ent)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, H5G_UNKNOWN, "unable to determine object type");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2382,7 +2382,7 @@ done:
H5G_free_ent_name(&grp_ent);
H5G_free_ent_name(&obj_ent);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2418,7 +2418,7 @@ H5G_get_num_objs(H5G_t *grp, hsize_t *num_objs)
HERROR (H5E_SYM, H5E_CANTINIT, "iteration operator failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2468,7 +2468,7 @@ done:
/* Free the duplicated name */
if(udata.name!=NULL)
H5MM_xfree(udata.name);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2509,7 +2509,7 @@ H5G_get_objtype_by_idx(H5G_t *grp, hsize_t idx)
ret_value = udata.type;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2575,7 +2575,7 @@ done:
H5G_free_ent_name(&grp_ent);
H5G_free_ent_name(&obj_ent);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2625,7 +2625,7 @@ done:
/* Free the ID to name buffer */
H5G_free_ent_name(&obj_ent);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2681,7 +2681,7 @@ done:
/* Free the ID to name buffer */
H5G_free_ent_name(&obj_ent);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2749,7 +2749,7 @@ done:
H5G_free_ent_name(&grp_ent);
H5G_free_ent_name(&obj_ent);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2840,7 +2840,7 @@ H5G_move(H5G_entry_t *src_loc, const char *src_name, H5G_entry_t *dst_loc,
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to deregister old object name");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2915,7 +2915,7 @@ H5G_insertion_file(H5G_entry_t *loc, const char *name)
ret_value=loc->file;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2956,7 +2956,7 @@ H5G_free_grp_name(H5G_t *grp)
H5G_free_ent_name(ent);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2997,7 +2997,7 @@ H5G_free_ent_name(H5G_entry_t *ent)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3096,7 +3096,7 @@ H5G_replace_name( int type, H5G_entry_t *loc,
H5I_search(H5I_DATATYPE, H5G_replace_ent, &names);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3166,7 +3166,7 @@ H5G_common_path(const H5RS_str_t *fullpath_r, const H5RS_str_t *prefix_r)
ret_value=TRUE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3542,6 +3542,6 @@ H5G_replace_ent(void *obj_ptr, hid_t obj_id, const void *key)
} /* end switch */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Gent.c b/src/H5Gent.c
index 3bf1a58..e8732f1 100644
--- a/src/H5Gent.c
+++ b/src/H5Gent.c
@@ -55,7 +55,7 @@ H5G_ent_cache(H5G_entry_t *ent, H5G_type_t *cache_type)
ret_value=&(ent->cache);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -91,7 +91,7 @@ H5G_ent_modified(H5G_entry_t *ent, H5G_type_t cache_type)
ent->dirty = TRUE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -138,7 +138,7 @@ H5G_ent_decode_vec(H5F_t *f, const uint8_t **pp, H5G_entry_t *ent, int n)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -209,7 +209,7 @@ H5G_ent_decode(H5F_t *f, const uint8_t **pp, H5G_entry_t *ent)
*pp = p_ret + H5G_SIZEOF_ENTRY(f);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -256,7 +256,7 @@ H5G_ent_encode_vec(H5F_t *f, uint8_t **pp, const H5G_entry_t *ent, int n)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -334,7 +334,7 @@ H5G_ent_encode(H5F_t *f, uint8_t **pp, const H5G_entry_t *ent)
*pp = p_ret;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -407,7 +407,7 @@ H5G_ent_copy(H5G_entry_t *dst, const H5G_entry_t *src, H5G_ent_copy_depth_t dept
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -484,5 +484,5 @@ H5G_ent_debug(H5F_t UNUSED *f, const H5G_entry_t *ent, FILE * stream,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index d850910..c32c46b 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -129,7 +129,7 @@ H5G_node_sizeof_rkey(H5F_t *f, const void UNUSED * udata)
/* Use FUNC_ENTER_NOINIT here to avoid performance issues */
FUNC_ENTER_NOINIT(H5G_node_sizeof_rkey);
- FUNC_LEAVE(H5F_SIZEOF_SIZE(f)); /*the name offset */
+ FUNC_LEAVE_NOAPI(H5F_SIZEOF_SIZE(f)); /*the name offset */
}
@@ -163,7 +163,7 @@ H5G_node_decode_key(H5F_t *f, H5B_t UNUSED *bt, uint8_t *raw, void *_key)
H5F_DECODE_LENGTH(f, raw, key->offset);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -197,7 +197,7 @@ H5G_node_encode_key(H5F_t *f, H5B_t UNUSED *bt, uint8_t *raw, void *_key)
H5F_ENCODE_LENGTH(f, raw, key->offset);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -223,7 +223,7 @@ H5G_node_size(H5F_t *f)
{
FUNC_ENTER_NOINIT(H5G_node_size);
- FUNC_LEAVE(H5G_NODE_SIZEOF_HDR(f) +
+ FUNC_LEAVE_NOAPI(H5G_NODE_SIZEOF_HDR(f) +
(2 * H5F_SYM_LEAF_K(f)) * H5G_SIZEOF_ENTRY(f));
}
@@ -298,7 +298,7 @@ done:
} /* end if */
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -406,7 +406,7 @@ H5G_node_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5G_node_
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -496,7 +496,7 @@ done:
}
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -551,7 +551,7 @@ H5G_node_cmp2(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key)
ret_value = HDstrcmp(s1, s2);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -609,7 +609,7 @@ H5G_node_cmp3(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key)
HGOTO_DONE(1);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -703,7 +703,7 @@ done:
if (sn && H5AC_unprotect(f, H5AC_SNODE, addr, sn) < 0 && ret_value>=0)
HDONE_ERROR(H5E_SYM, H5E_PROTECT, FAIL, "unable to release symbol table node");
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -875,7 +875,7 @@ done:
if (sn && H5AC_unprotect(f, H5AC_SNODE, addr, sn) < 0 && ret_value!=H5B_INS_ERROR)
HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5B_INS_ERROR, "unable to release symbol table node");
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1032,7 +1032,7 @@ done:
if (sn && H5AC_unprotect(f, H5AC_SNODE, addr, sn)<0 && ret_value!=H5B_INS_ERROR)
HDONE_ERROR(H5E_SYM, H5E_PROTECT, H5B_INS_ERROR, "unable to release symbol table node");
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1121,7 +1121,7 @@ H5G_node_iterate (H5F_t *f, void UNUSED *_lt_key, haddr_t addr,
done:
name_off = H5MM_xfree (name_off);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1163,7 +1163,7 @@ H5G_node_sumup(H5F_t *f, void UNUSED *_lt_key, haddr_t addr,
*num_objs += sn->nsyms;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1220,7 +1220,7 @@ H5G_node_name(H5F_t *f, void UNUSED *_lt_key, haddr_t addr,
bt_udata->num_objs += sn->nsyms;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1268,7 +1268,7 @@ H5G_node_type(H5F_t *f, void UNUSED *_lt_key, haddr_t addr,
bt_udata->num_objs += sn->nsyms;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1345,6 +1345,6 @@ H5G_node_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent,
H5AC_unprotect(f, H5AC_SNODE, addr, sn);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Gstab.c b/src/H5Gstab.c
index e5e2535..9aa46dc 100644
--- a/src/H5Gstab.c
+++ b/src/H5Gstab.c
@@ -108,7 +108,7 @@ H5G_stab_create(H5F_t *f, size_t init, H5G_entry_t *self/*out*/)
self->type = H5G_CACHED_STAB;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -175,7 +175,7 @@ H5G_stab_find(H5G_entry_t *grp_ent, const char *name,
} /* end else */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -238,7 +238,7 @@ H5G_stab_insert(H5G_entry_t *grp_ent, const char *name, H5G_entry_t *obj_ent)
obj_ent->name_off = udata.ent.name_off;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -281,7 +281,7 @@ H5G_stab_remove(H5G_entry_t *grp_ent, const char *name)
HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to remove entry");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -395,6 +395,6 @@ H5G_insert_name(H5G_entry_t *loc, H5G_entry_t *obj, const char *name)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5HG.c b/src/H5HG.c
index 27a5f6d..fbe626b 100644
--- a/src/H5HG.c
+++ b/src/H5HG.c
@@ -202,7 +202,7 @@ H5HG_create (H5F_t *f, size_t size)
H5FL_ARR_FREE (H5HG_obj_t,heap->obj);
H5FL_FREE (H5HG_heap_t,heap);
}
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -383,7 +383,7 @@ H5HG_load (H5F_t *f, hid_t dxpl_id, haddr_t addr, const void * UNUSED udata1,
H5FL_ARR_FREE(H5HG_obj_t,heap->obj);
H5FL_FREE (H5HG_heap_t,heap);
}
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -443,7 +443,7 @@ H5HG_flush (H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HG_heap_t
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -539,7 +539,7 @@ H5HG_alloc (H5F_t *f, H5HG_heap_t *heap, int cwfsno, size_t size)
}
heap->dirty = 1;
- FUNC_LEAVE (idx);
+ FUNC_LEAVE_NOAPI(idx);
}
@@ -632,7 +632,7 @@ H5HG_insert (H5F_t *f, size_t size, void *obj, H5HG_t *hobj/*out*/)
hobj->idx = idx;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -694,7 +694,7 @@ H5HG_peek (H5F_t *f, H5HG_t *hobj)
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -763,7 +763,7 @@ H5HG_read (H5F_t *f, H5HG_t *hobj, void *object/*out*/)
ret_value=object;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -818,7 +818,7 @@ H5HG_link (H5F_t *f, H5HG_t *hobj, int adjust)
ret_value=heap->obj[hobj->idx].nrefs;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -918,7 +918,7 @@ H5HG_remove (H5F_t *f, H5HG_t *hobj)
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1018,5 +1018,5 @@ H5HG_debug(H5F_t *f, haddr_t addr, FILE *stream, int indent,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5HL.c b/src/H5HL.c
index e4b117c..2f77502 100644
--- a/src/H5HL.c
+++ b/src/H5HL.c
@@ -180,7 +180,7 @@ H5HL_create(H5F_t *f, size_t size_hint, haddr_t *addr_p/*out*/)
H5FL_FREE (H5HL_t,heap);
}
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*-------------------------------------------------------------------------
@@ -297,7 +297,7 @@ done:
H5FL_FREE(H5HL_t,heap);
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -425,7 +425,7 @@ H5HL_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5HL_t *heap)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -481,7 +481,7 @@ H5HL_read(H5F_t *f, haddr_t addr, size_t offset, size_t size, void *buf)
ret_value=buf;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -536,7 +536,7 @@ H5HL_peek(H5F_t *f, haddr_t addr, size_t offset)
ret_value = heap->chunk + H5HL_SIZEOF_HDR(f) + offset;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -566,7 +566,7 @@ H5HL_remove_free(H5HL_t *heap, H5HL_free_t *fl)
if (!fl->prev) heap->freelist = fl->next;
- FUNC_LEAVE(H5FL_FREE(H5HL_free_t,fl));
+ FUNC_LEAVE_NOAPI(H5FL_FREE(H5HL_free_t,fl));
}
@@ -731,7 +731,7 @@ H5HL_insert(H5F_t *f, haddr_t addr, size_t buf_size, const void *buf)
ret_value=offset;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -782,7 +782,7 @@ H5HL_write(H5F_t *f, haddr_t addr, size_t offset, size_t size, const void *buf)
HDmemcpy(heap->chunk + H5HL_SIZEOF_HDR(f) + offset, buf, size);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -912,7 +912,7 @@ H5HL_remove(H5F_t *f, haddr_t addr, size_t offset, size_t size)
heap->freelist = fl;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1048,5 +1048,5 @@ H5HL_debug(H5F_t *f, haddr_t addr, FILE * stream, int indent, int fwidth)
H5MM_xfree(marker);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5I.c b/src/H5I.c
index fa92bf9..5e66b33 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -100,7 +100,7 @@ H5I_init_interface(void)
*/
assert(H5I_NGROUPS<=(1<<GROUP_BITS));
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
@@ -150,7 +150,7 @@ H5I_term_interface(void)
/* Mark interface closed */
interface_initialize_g = 0;
}
- FUNC_LEAVE(n);
+ FUNC_LEAVE_NOAPI(n);
}
@@ -240,7 +240,7 @@ done:
}
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -285,7 +285,7 @@ H5I_nmembers(H5I_type_t grp)
ret_value=n;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -442,7 +442,7 @@ H5I_clear_group(H5I_type_t grp, hbool_t force)
} /* end for */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -497,7 +497,7 @@ H5I_destroy_group(H5I_type_t grp)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -612,7 +612,7 @@ H5I_register(H5I_type_t grp, void *object)
ret_value = new_id;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -647,7 +647,7 @@ H5I_object(hid_t id)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -686,7 +686,7 @@ H5I_object_verify(hid_t id, H5I_type_t id_type)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5I_object_verify() */
@@ -722,7 +722,7 @@ H5I_get_type(hid_t id)
assert(ret_value>=H5I_BADID && ret_value<H5I_NGROUPS);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -760,7 +760,7 @@ H5Iget_type(hid_t id)
HGOTO_DONE(H5I_BADID);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -845,7 +845,7 @@ H5I_remove(hid_t id)
(grp_ptr->ids)--;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -928,7 +928,7 @@ H5I_dec_ref(hid_t id)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -974,7 +974,7 @@ H5I_inc_ref(hid_t id)
ret_value=id_ptr->count;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1031,7 +1031,7 @@ H5I_search(H5I_type_t grp, H5I_search_func_t func, const void *key)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1117,7 +1117,7 @@ H5I_find_id(hid_t id)
#endif /* IDS_ARE_CACHED */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1173,7 +1173,7 @@ H5Iget_name(hid_t id, char *name/*out*/, size_t size)
ret_value=(ssize_t)len;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1207,7 +1207,7 @@ H5I_debug(H5I_type_t grp)
unsigned int iu;
herr_t ret_value; /* Return value */
- FUNC_ENTER_API(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];
@@ -1263,7 +1263,7 @@ H5I_debug(H5I_type_t grp)
} /* end for */
done:
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
#endif /* H5I_DEBUG_OUTPUT */
diff --git a/src/H5MF.c b/src/H5MF.c
index 660f849..12fd240 100644
--- a/src/H5MF.c
+++ b/src/H5MF.c
@@ -82,7 +82,7 @@ H5MF_alloc(H5F_t *f, H5FD_mem_t type, hsize_t size)
ret_value -= f->shared->base_addr;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -134,7 +134,7 @@ H5MF_xfree(H5F_t *f, H5FD_mem_t type, haddr_t addr, hsize_t size)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -197,5 +197,5 @@ H5MF_realloc(H5F_t *f, H5FD_mem_t type, haddr_t old_addr, hsize_t old_size,
ret_value -= f->shared->base_addr;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5MM.c b/src/H5MM.c
index d5fff2f..554dcc9 100644
--- a/src/H5MM.c
+++ b/src/H5MM.c
@@ -72,7 +72,7 @@ H5MM_realloc(void *mem, size_t size)
ret_value=mem;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -112,7 +112,7 @@ H5MM_xstrdup(const char *s)
#ifdef LATER
done:
#endif /* LATER */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -149,7 +149,7 @@ H5MM_strdup(const char *s)
HDstrcpy(ret_value, s);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -183,5 +183,5 @@ H5MM_xfree(void *mem)
if (mem)
HDfree(mem);
- FUNC_LEAVE(NULL);
+ FUNC_LEAVE_NOAPI(NULL);
}
diff --git a/src/H5MPprivate.h b/src/H5MPprivate.h
index 78d2c81..d482369 100644
--- a/src/H5MPprivate.h
+++ b/src/H5MPprivate.h
@@ -40,28 +40,19 @@
#define MPE_LOG_VARS(func_name) \
static int eventa(func_name) = -1; \
static int eventb(func_name) = -1; \
- static int eventc(func_name) = 0; \
- int * p_eventb = &eventb(func_name); \
+/* static int eventc(func_name) = 0; */ \
char* p_end_funcname = #func_name; \
- char* p_event_start = "start" #func_name; \
- int * p_eventc = & eventc(func_name);
-/* the following is for the elimination of "unused variable" warning */
-#define MPE_LOG_VARS_USE(func_name) \
- eventa(func_name) = eventa(func_name); \
- eventb(func_name) = eventb(func_name); \
- eventc(func_name) = eventc(func_name); \
- p_eventc = p_eventc; \
- p_event_start = p_event_start;
+ char* p_event_start = "start" #func_name;
-#define BEGIN_MPE_LOG(func_name) \
+#define BEGIN_MPE_LOG(func_name) \
if (H5_MPEinit_g){ \
- if (H5_MPEinit_g && eventa(func_name) == -1 && eventb(func_name) == -1) { \
+ if (H5_MPEinit_g && eventa(func_name) == -1 && eventb(func_name) == -1) { \
char* p_color = COLOR(func_name); \
eventa(func_name)=MPE_Log_get_event_number(); \
eventb(func_name)=MPE_Log_get_event_number(); \
- MPE_Describe_state(eventa(func_name), eventb(func_name), p_end_funcname,p_color); \
+ MPE_Describe_state(eventa(func_name), eventb(func_name), p_end_funcname,p_color); \
} \
- MPE_Log_event(eventa(func_name), 0, p_event_start); \
+ MPE_Log_event(eventa(func_name), 0, p_event_start); \
}
@@ -72,8 +63,8 @@
* Programmer: Long Wang
*/
#define FINISH_MPE_LOG \
- if (H5_IS_API(FUNC) && H5_MPEinit_g) { \
- MPE_Log_event(*p_eventb, 0, p_end_funcname); \
+ if (H5_MPEinit_g) { \
+ MPE_Log_event(eventb(func_name), 0, p_end_funcname); \
/* eventc(func_name)++ */ \
}
@@ -388,12 +379,7 @@
#define color_H5Zunregister "red"
#else
-#define eventa(func_name) /* void */
-#define eventb(func_name) /* void */
-#define eventc(func_name) /* void */
#define MPE_LOG_VARS(func_name) /* void */
-#define MPE_LOG_VARS_USE(func_name) /* void */
-#define COLOR(func_name) /* void */
#define BEGIN_MPE_LOG(func_name) /* void */
#define FINISH_MPE_LOG /* void */
diff --git a/src/H5O.c b/src/H5O.c
index e266b86..886a130 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -128,7 +128,7 @@ H5O_init_interface(void)
*/
H5O_fast_g[H5G_CACHED_STAB] = H5O_stab_fast;
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
@@ -185,7 +185,7 @@ H5O_create(H5F_t *f, size_t size_hint, H5G_entry_t *ent/*out*/)
HGOTO_ERROR(H5E_OHDR, H5E_CANTINIT, FAIL, "unable to initialize object header");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -274,7 +274,7 @@ H5O_init(H5F_t *f, size_t size_hint, H5G_entry_t *ent/*out*/, haddr_t header)
HGOTO_ERROR(H5E_OHDR, H5E_CANTOPENOBJ, FAIL, "unable to open object header");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -313,7 +313,7 @@ H5O_open(H5G_entry_t *obj_ent)
obj_ent->file->nopen_objs++;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -374,7 +374,7 @@ H5O_close(H5G_entry_t *obj_ent)
H5G_free_ent_name(obj_ent);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -561,7 +561,7 @@ done:
H5FL_FREE(H5O_t,oh);
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -757,7 +757,7 @@ H5O_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5O_t *oh)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -795,7 +795,7 @@ H5O_reset(const H5O_class_t *type, void *native)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -832,7 +832,7 @@ H5O_free (const H5O_class_t *type, void *mesg)
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -869,7 +869,7 @@ H5O_copy (const H5O_class_t *type, const void *mesg, void *dst)
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -935,7 +935,7 @@ done:
if (oh && H5AC_unprotect(ent->file, H5AC_OHDR, ent->header, oh) < 0 && ret_value>=0)
HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header");
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -985,7 +985,7 @@ H5O_count (H5G_entry_t *ent, const H5O_class_t *type)
ret_value=acc;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1039,7 +1039,7 @@ H5O_exists(H5G_entry_t *ent, const H5O_class_t *type, int sequence)
ret_value=(sequence<0);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1146,7 +1146,7 @@ done:
if (oh && H5AC_unprotect(ent->file, H5AC_OHDR, ent->header, oh) < 0 && ret_value!=NULL)
HDONE_ERROR(H5E_OHDR, H5E_PROTECT, NULL, "unable to release object header");
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1225,7 +1225,7 @@ H5O_find_in_ohdr(H5F_t *f, haddr_t addr, const H5O_class_t **type_p,
ret_value=u;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1401,7 +1401,7 @@ done:
if (oh && H5AC_unprotect(ent->file, H5AC_OHDR, ent->header, oh) < 0 && ret_value!=FAIL)
HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header");
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1444,7 +1444,7 @@ H5O_protect(H5G_entry_t *ent)
HGOTO_ERROR(H5E_OHDR, H5E_CANTLOAD, NULL, "unable to load object header");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5O_protect() */
@@ -1484,7 +1484,7 @@ H5O_unprotect(H5G_entry_t *ent, H5O_t *oh)
HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5O_unprotect() */
@@ -1601,7 +1601,7 @@ H5O_append(H5F_t *f, H5O_t *oh, const H5O_class_t *type,
ret_value = idx;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5O_append() */
@@ -1668,7 +1668,7 @@ H5O_touch_oh(H5F_t *f, H5O_t *oh, hbool_t force)
oh->dirty = TRUE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1716,7 +1716,7 @@ done:
if (oh && H5AC_unprotect(ent->file, H5AC_OHDR, ent->header, oh)<0 && ret_value>=0)
HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header");
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1816,7 +1816,7 @@ done:
if (oh && H5AC_unprotect(ent->file, H5AC_OHDR, ent->header, oh) < 0 && ret_value>=0)
HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header");
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1947,7 +1947,7 @@ H5O_alloc_extend_chunk(H5O_t *oh, unsigned chunkno, size_t size)
ret_value=idx;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2145,7 +2145,7 @@ H5O_alloc_new_chunk(H5F_t *f, H5O_t *oh, size_t size)
ret_value=idx;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2266,7 +2266,7 @@ H5O_alloc(H5F_t *f, H5O_t *oh, const H5O_class_t *type, size_t size)
ret_value=idx;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2317,7 +2317,7 @@ done:
if(buf)
H5MM_xfree (buf);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2499,5 +2499,5 @@ done:
if (oh && H5AC_unprotect(f, H5AC_OHDR, addr, oh) < 0 && ret_value>=0)
HDONE_ERROR(H5E_OHDR, H5E_PROTECT, FAIL, "unable to release object header");
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Oattr.c b/src/H5Oattr.c
index 34e209a..ae227e3 100644
--- a/src/H5Oattr.c
+++ b/src/H5Oattr.c
@@ -179,7 +179,7 @@ H5O_attr_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh)
ret_value=attr;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -260,7 +260,7 @@ H5O_attr_encode(H5F_t *f, uint8_t *p, const void *mesg)
HDmemcpy(p,attr->data,attr->data_size);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -305,7 +305,7 @@ H5O_attr_copy(const void *_src, void *_dst)
ret_value=dst;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -352,7 +352,7 @@ H5O_attr_size(H5F_t UNUSED *f, const void *mesg)
attr->data_size; /*the data itself */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -389,7 +389,7 @@ H5O_attr_reset(void *_mesg)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -452,5 +452,5 @@ H5O_attr_debug(H5F_t *f, const void *_mesg, FILE * stream, int indent,
H5S_debug(f, mesg->ds, stream, indent+3, MAX(0, fwidth-3));
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Ocont.c b/src/H5Ocont.c
index ba6ab5f..18f5a76 100644
--- a/src/H5Ocont.c
+++ b/src/H5Ocont.c
@@ -91,7 +91,7 @@ H5O_cont_decode(H5F_t *f, const uint8_t *p, H5O_shared_t UNUSED *sh)
ret_value=cont;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -128,7 +128,7 @@ H5O_cont_encode(H5F_t *f, uint8_t *p, const void *_mesg)
H5F_ENCODE_LENGTH(f, p, cont->size);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -174,5 +174,5 @@ H5O_cont_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream,
(int) (cont->chunkno));
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Odtype.c b/src/H5Odtype.c
index 4244c41..aea382d 100644
--- a/src/H5Odtype.c
+++ b/src/H5Odtype.c
@@ -400,7 +400,7 @@ H5O_dtype_decode_helper(H5F_t *f, const uint8_t **pp, H5T_t *dt)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -760,7 +760,7 @@ H5O_dtype_encode_helper(uint8_t **pp, const H5T_t *dt)
*hdr++ = (flags >> 16) & 0xff;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -810,7 +810,7 @@ done:
H5FL_FREE(H5T_t,dt);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -849,7 +849,7 @@ H5O_dtype_encode(H5F_t UNUSED *f, uint8_t *p, const void *mesg)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTENCODE, FAIL, "can't encode type");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -897,7 +897,7 @@ H5O_dtype_copy(const void *_src, void *_dst)
ret_value=dst;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -986,7 +986,7 @@ H5O_dtype_size(H5F_t *f, const void *mesg)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1017,7 +1017,7 @@ H5O_dtype_reset(void *_mesg)
H5T_free(dt);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1047,7 +1047,7 @@ H5O_dtype_free (void *mesg)
H5FL_FREE(H5T_t,mesg);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1086,7 +1086,7 @@ H5O_dtype_get_share(H5F_t UNUSED *f, const void *_mesg,
HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL, "data type is not sharable");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1131,7 +1131,7 @@ H5O_dtype_set_share (H5F_t UNUSED *f, void *_mesg/*in,out*/,
dt->state = H5T_STATE_NAMED;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1423,5 +1423,5 @@ H5O_dtype_debug(H5F_t *f, const void *mesg, FILE *stream,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Oefl.c b/src/H5Oefl.c
index c81002b..38b2dfb 100644
--- a/src/H5Oefl.c
+++ b/src/H5Oefl.c
@@ -134,7 +134,7 @@ done:
if(mesg!=NULL)
H5MM_xfree (mesg);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -204,7 +204,7 @@ H5O_efl_encode(H5F_t *f, uint8_t *p, const void *_mesg)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -261,7 +261,7 @@ H5O_efl_copy(const void *_mesg, void *_dest)
ret_value=dest;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -305,7 +305,7 @@ H5O_efl_size(H5F_t *f, const void *_mesg)
H5F_SIZEOF_SIZE(f)); /*file size */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -345,7 +345,7 @@ H5O_efl_reset(void *_mesg)
mesg->slot = H5MM_xfree(mesg->slot);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -386,7 +386,7 @@ H5O_efl_total_size (H5O_efl_t *efl)
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -474,7 +474,7 @@ done:
if (fd>=0)
HDclose (fd);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -563,7 +563,7 @@ done:
if (fd>=0)
HDclose (fd);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -628,5 +628,5 @@ H5O_efl_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index 92d2000..dd98dc1 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -149,7 +149,7 @@ done:
H5FL_FREE(H5O_fill_new_t,mesg);
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -201,7 +201,7 @@ done:
H5FL_FREE(H5O_fill_t,mesg);
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -251,7 +251,7 @@ H5O_fill_new_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -286,7 +286,7 @@ H5O_fill_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg)
HDmemcpy(p, mesg->buf, mesg->size);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -362,7 +362,7 @@ done:
H5FL_FREE(H5O_fill_new_t,dest);
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -426,7 +426,7 @@ done:
H5FL_FREE(H5O_fill_t,dest);
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -469,7 +469,7 @@ H5O_fill_new_size(H5F_t UNUSED *f, const void *_mesg)
(mesg->size>0 ? mesg->size : 0); /* Size of fill value */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -506,7 +506,7 @@ H5O_fill_size(H5F_t UNUSED *f, const void *_mesg)
ret_value=4+mesg->size;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -548,7 +548,7 @@ H5O_fill_new_reset(void *_mesg)
mesg->fill_defined = (H5D_fill_value_t)0;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -585,7 +585,7 @@ H5O_fill_reset(void *_mesg)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -615,7 +615,7 @@ H5O_fill_new_free (void *mesg)
H5FL_FREE(H5O_fill_new_t,mesg);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -645,7 +645,7 @@ H5O_fill_free (void *mesg)
H5FL_FREE(H5O_fill_t,mesg);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -689,7 +689,7 @@ H5O_fill_new_debug(H5F_t UNUSED *f, const void *_mesg, FILE *stream,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -733,7 +733,7 @@ H5O_fill_debug(H5F_t UNUSED *f, const void *_mesg, FILE *stream,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -826,5 +826,5 @@ done:
if (bkg)
H5MM_xfree(bkg);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Olayout.c b/src/H5Olayout.c
index 41c173e..96340d1 100644
--- a/src/H5Olayout.c
+++ b/src/H5Olayout.c
@@ -139,7 +139,7 @@ done:
if(mesg)
H5FL_FREE(H5O_layout_t,mesg);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -216,7 +216,7 @@ H5O_layout_encode(H5F_t *f, uint8_t *p, const void *_mesg)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -268,7 +268,7 @@ H5O_layout_copy(const void *_mesg, void *_dest)
ret_value=dest;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -315,7 +315,7 @@ H5O_layout_meta_size(H5F_t *f, const void *_mesg)
ret_value += H5F_SIZEOF_ADDR(f); /* file address of data or B-tree for chunked dataset */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -354,7 +354,7 @@ H5O_layout_size(H5F_t *f, const void *_mesg)
if(mesg->type==H5D_COMPACT)
ret_value += mesg->size;/* data for compact dataset */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -391,7 +391,7 @@ H5O_layout_reset (void *_mesg)
} /* end if */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -426,7 +426,7 @@ H5O_layout_free (void *_mesg)
H5FL_FREE(H5O_layout_t,mesg);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -478,5 +478,5 @@ H5O_layout_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream,
HDfprintf(stream, "}\n");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index ff3eb5a..a43c47a 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -133,7 +133,7 @@ H5O_mtime_new_decode(H5F_t UNUSED *f, const uint8_t *p,
ret_value=mesg;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5O_mtime_new_decode() */
@@ -261,7 +261,7 @@ H5O_mtime_decode(H5F_t UNUSED *f, const uint8_t *p,
ret_value=mesg;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -305,7 +305,7 @@ H5O_mtime_new_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg)
UINT32ENCODE(p, *mesg);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5O_mtime_new_encode() */
@@ -345,7 +345,7 @@ H5O_mtime_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg)
tm->tm_hour, tm->tm_min, tm->tm_sec);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -388,7 +388,7 @@ H5O_mtime_copy(const void *_mesg, void *_dest)
ret_value=dest;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -424,7 +424,7 @@ H5O_mtime_new_size(H5F_t * UNUSED f, const void * UNUSED mesg)
assert(mesg);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5O_mtime_new_size() */
@@ -460,7 +460,7 @@ H5O_mtime_size(H5F_t * UNUSED f, const void * UNUSED mesg)
assert(mesg);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -487,7 +487,7 @@ H5O_mtime_reset(void UNUSED *_mesg)
FUNC_ENTER_NOAPI(H5O_mtime_reset, FAIL);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -517,7 +517,7 @@ H5O_mtime_free (void *mesg)
H5FL_FREE(time_t,mesg);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -562,6 +562,6 @@ H5O_mtime_debug(H5F_t UNUSED *f, const void *_mesg, FILE *stream,
"Time:", buf);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Oname.c b/src/H5Oname.c
index 94514c9..a74488c 100644
--- a/src/H5Oname.c
+++ b/src/H5Oname.c
@@ -98,7 +98,7 @@ done:
H5MM_xfree (mesg);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -134,7 +134,7 @@ H5O_name_encode(H5F_t UNUSED *f, uint8_t *p, const void *_mesg)
HDstrcpy((char*)p, mesg->s);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -179,7 +179,7 @@ H5O_name_copy(const void *_mesg, void *_dest)
ret_value=dest;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -218,7 +218,7 @@ H5O_name_size(H5F_t UNUSED *f, const void *_mesg)
ret_value = mesg->s ? HDstrlen(mesg->s) + 1 : 0;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -253,7 +253,7 @@ H5O_name_reset(void *_mesg)
mesg->s = H5MM_xfree(mesg->s);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -293,5 +293,5 @@ H5O_name_debug(H5F_t UNUSED *f, const void *_mesg, FILE *stream,
mesg->s);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Opline.c b/src/H5Opline.c
index eb42f5b..11be53e 100644
--- a/src/H5Opline.c
+++ b/src/H5Opline.c
@@ -141,7 +141,7 @@ done:
H5FL_FREE(H5O_pline_t,pline);
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -212,7 +212,7 @@ H5O_pline_encode (H5F_t UNUSED *f, uint8_t *p/*out*/, const void *mesg)
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -288,7 +288,7 @@ done:
H5FL_FREE(H5O_pline_t,dst);
}
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -347,7 +347,7 @@ H5O_pline_size (H5F_t UNUSED *f, const void *mesg)
ret_value=size;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -386,7 +386,7 @@ H5O_pline_reset (void *mesg)
HDmemset(pline, 0, sizeof *pline);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -416,7 +416,7 @@ H5O_pline_free (void *mesg)
H5FL_FREE(H5O_pline_t,mesg);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -489,5 +489,5 @@ H5O_pline_debug (H5F_t UNUSED *f, const void *mesg, FILE *stream,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Oplist.c b/src/H5Oplist.c
index 352df06..8f5fc39 100644
--- a/src/H5Oplist.c
+++ b/src/H5Oplist.c
@@ -263,7 +263,7 @@ H5O_plist_decode(H5F_t UNUSED *f, const uint8_t *p, H5O_shared_t UNUSED *sh)
ret_value = new_plist; /* success */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -370,7 +370,7 @@ H5O_plist_encode(H5F_t UNUSED *f, uint8_t *p, const void *mesg)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -438,7 +438,7 @@ H5O_plist_size(H5F_t UNUSED *f, const void *mesg)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -464,7 +464,7 @@ H5O_plist_free(void *mesg)
ret_value = H5P_close(plist);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*
@@ -549,5 +549,5 @@ H5O_plist_debug(H5F_t UNUSED *f, const void *mesg, FILE *stream,
HDfprintf(stream, "%*s}\n", indent, "");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Osdspace.c b/src/H5Osdspace.c
index 6114e51..2be7b2d 100644
--- a/src/H5Osdspace.c
+++ b/src/H5Osdspace.c
@@ -146,7 +146,7 @@ done:
H5FL_FREE(H5S_simple_t,sdim);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -224,7 +224,7 @@ H5O_sdspace_encode(H5F_t *f, uint8_t *p, const void *mesg)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -282,7 +282,7 @@ H5O_sdspace_copy(const void *mesg, void *dest)
ret_value=dst;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -331,7 +331,7 @@ H5O_sdspace_size(H5F_t *f, const void *mesg)
#endif
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -361,7 +361,7 @@ H5O_sdspace_reset(void *_mesg)
H5S_release_simple(mesg);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -391,7 +391,7 @@ H5O_sdspace_free (void *mesg)
H5FL_FREE(H5S_simple_t,mesg);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -465,5 +465,5 @@ H5O_sdspace_debug(H5F_t UNUSED *f, const void *mesg,
#endif
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Oshared.c b/src/H5Oshared.c
index 8a96e7b..ad1fff7 100644
--- a/src/H5Oshared.c
+++ b/src/H5Oshared.c
@@ -112,7 +112,7 @@ done:
H5MM_xfree(mesg);
} /* end if */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -165,7 +165,7 @@ H5O_shared_encode (H5F_t *f, uint8_t *buf/*out*/, const void *_mesg)
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -198,7 +198,7 @@ H5O_shared_size (H5F_t *f, const void UNUSED *_mesg)
H5G_SIZEOF_ENTRY(f)); /*sharing by another obj hdr */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -251,5 +251,5 @@ H5O_shared_debug (H5F_t UNUSED *f, const void *_mesg,
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Ostab.c b/src/H5Ostab.c
index 182f280..bcc70fd 100644
--- a/src/H5Ostab.c
+++ b/src/H5Ostab.c
@@ -102,7 +102,7 @@ done:
H5FL_FREE(H5O_stab_t,stab);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -139,7 +139,7 @@ H5O_stab_encode(H5F_t *f, uint8_t *p, const void *_mesg)
H5F_addr_encode(f, &p, stab->heap_addr);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -188,7 +188,7 @@ H5O_stab_fast(const H5G_cache_t *cache, const H5O_class_t *type, void *_mesg)
ret_value=stab;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -231,7 +231,7 @@ H5O_stab_copy(const void *_mesg, void *_dest)
ret_value=dest;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -265,7 +265,7 @@ H5O_stab_size(H5F_t *f, const void UNUSED *_mesg)
ret_value=2 * H5F_SIZEOF_ADDR(f);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -295,7 +295,7 @@ H5O_stab_free (void *mesg)
H5FL_FREE(H5O_stab_t,mesg);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -337,5 +337,5 @@ H5O_stab_debug(H5F_t UNUSED *f, const void *_mesg, FILE * stream,
"Name heap address:", stab->heap_addr);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5P.c b/src/H5P.c
index 8fd4d4c..895812b 100644
--- a/src/H5P.c
+++ b/src/H5P.c
@@ -88,7 +88,7 @@ static H5P_genclass_t *H5P_create_class(H5P_genclass_t *par_class,
H5P_cls_close_func_t cls_close, void *close_data);
static herr_t H5P_unregister(H5P_genclass_t *pclass, const char *name);
static H5P_genprop_t *H5P_dup_prop(H5P_genprop_t *oprop, H5P_prop_within_t type);
-static herr_t H5P_free_prop(H5P_genprop_t *prop);
+static void H5P_free_prop(H5P_genprop_t *prop);
/*--------------------------------------------------------------------------
@@ -156,7 +156,7 @@ done:
H5P_free_prop(pcopy);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5P_do_prop_cb1() */
@@ -185,7 +185,7 @@ H5P_init(void)
/* FUNC_ENTER() does all the work */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -283,7 +283,7 @@ H5P_init_interface(void)
HGOTO_ERROR (H5E_PLIST, H5E_CANTREGISTER, FAIL, "can't register property list class");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -361,7 +361,7 @@ H5P_term_interface(void)
interface_initialize_g = 0;
}
}
- FUNC_LEAVE(n);
+ FUNC_LEAVE_NOAPI(n);
}
@@ -434,7 +434,7 @@ done:
if (ret_value==NULL && new_pclass)
H5P_close_class(new_pclass);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_copy_pclass() */
@@ -637,7 +637,7 @@ done:
if (ret_value<0 && new_plist)
H5P_close(new_plist);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_copy_plist() */
@@ -701,7 +701,7 @@ H5Pcopy(hid_t id)
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Pcopy() */
@@ -798,7 +798,7 @@ done:
} /* end if */
} /* end if */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_dup_prop() */
@@ -890,7 +890,7 @@ done:
} /* end if */
} /* end if */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_create_prop() */
@@ -928,7 +928,7 @@ H5P_add_prop(H5TB_TREE *tree, H5P_genprop_t *prop)
HGOTO_ERROR(H5E_PLIST,H5E_CANTINSERT,FAIL,"can't insert property into TBBT");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_add_prop() */
@@ -991,7 +991,7 @@ H5P_find_prop_plist(H5P_genplist_t *plist, const char *name)
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_find_prop_plist() */
@@ -1032,7 +1032,7 @@ H5P_find_prop_pclass(H5P_genclass_t *pclass, const char *name)
ret_value=prop_node->data;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_find_prop_pclass() */
@@ -1054,7 +1054,7 @@ done:
EXAMPLES
REVISION LOG
--------------------------------------------------------------------------*/
-static herr_t
+static void
H5P_free_prop(H5P_genprop_t *prop)
{
FUNC_ENTER_NOINIT(H5P_free_prop);
@@ -1071,7 +1071,7 @@ H5P_free_prop(H5P_genprop_t *prop)
H5FL_FREE(H5P_genprop_t,prop);
- FUNC_LEAVE (SUCCEED);
+ FUNC_LEAVE_NOAPI_VOID;
} /* H5P_free_prop() */
@@ -1127,7 +1127,7 @@ H5P_free_all_prop(H5TB_TREE *tree,unsigned make_cb)
} /* end while */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_free_all_prop() */
@@ -1219,7 +1219,7 @@ H5P_access_class(H5P_genclass_t *pclass, H5P_class_mod_t mod)
H5P_access_class(par_class, H5P_MOD_DEC_CLS);
} /* end if */
- FUNC_LEAVE (SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
} /* H5P_access_class() */
@@ -1264,7 +1264,7 @@ H5P_check_class(void *_obj, hid_t id, const void *_key)
ret_value=1; /* Indicate a match */
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5P_check_class() */
@@ -1363,7 +1363,7 @@ done:
H5FL_FREE(H5P_genclass_t,pclass);
}
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_create_class() */
@@ -1444,7 +1444,7 @@ done:
if (ret_value<0 && pclass)
H5P_close_class(pclass);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Pcreate_class() */
@@ -1586,7 +1586,7 @@ done:
} /* end if */
} /* end if */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_create() */
@@ -1653,7 +1653,7 @@ done:
if (ret_value<0 && plist)
H5P_close(plist);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_create_id() */
@@ -1697,7 +1697,7 @@ H5Pcreate(hid_t cls_id)
HGOTO_ERROR(H5E_PLIST, H5E_CANTCREATE, FAIL, "unable to create property list");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Pcreate() */
@@ -1914,7 +1914,7 @@ done:
H5FL_FREE(H5P_genprop_t,new_prop);
} /* end if */
} /* end if */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_register() */
@@ -2075,7 +2075,7 @@ H5Pregister(hid_t cls_id, const char *name, size_t size, void *def_value,
HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to register property in class");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Pregister() */
@@ -2256,7 +2256,7 @@ done:
} /* end if */
} /* end if */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_insert() */
@@ -2391,7 +2391,7 @@ H5Pinsert(hid_t plist_id, const char *name, size_t size, void *value,
HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to register property in plist");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Pinsert() */
@@ -2559,7 +2559,7 @@ H5P_set(H5P_genplist_t *plist, const char *name, const void *value)
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_set() */
@@ -2616,7 +2616,7 @@ H5Pset(hid_t plist_id, const char *name, void *value)
HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to set value in plist");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Pset() */
@@ -2676,7 +2676,7 @@ H5P_exist_plist(H5P_genplist_t *plist, const char *name)
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_exist_plist() */
@@ -2717,7 +2717,7 @@ H5P_exist_pclass(H5P_genclass_t *pclass, const char *name)
else
ret_value=1;
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_exist_pclass() */
@@ -2777,7 +2777,7 @@ H5Pexist(hid_t id, const char *name)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Pexist() */
@@ -2823,7 +2823,7 @@ H5P_get_size_plist(H5P_genplist_t *plist, const char *name, size_t *size)
*size=prop->size;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_get_size_plist() */
@@ -2869,7 +2869,7 @@ H5P_get_size_pclass(H5P_genclass_t *pclass, const char *name, size_t *size)
*size=prop->size;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_get_size_pclass() */
@@ -2935,7 +2935,7 @@ H5Pget_size(hid_t id, const char *name, size_t *size)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Pget_size() */
@@ -2970,7 +2970,7 @@ H5P_get_class(H5P_genplist_t *plist)
/* Get property size */
ret_value=plist->pclass;
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_get_class() */
@@ -3024,7 +3024,7 @@ done:
if (ret_value<0 && pclass)
H5P_close_class(pclass);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Pget_class() */
@@ -3059,7 +3059,7 @@ H5P_get_nprops_plist(H5P_genplist_t *plist, size_t *nprops)
/* Get property size */
*nprops=plist->nprops;
- FUNC_LEAVE (SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
} /* H5P_get_nprops_plist() */
@@ -3097,7 +3097,7 @@ H5P_get_nprops_pclass(H5P_genclass_t *pclass, size_t *nprops)
*nprops=pclass->nprops;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_get_nprops_pclass() */
@@ -3157,7 +3157,7 @@ H5Pget_nprops(hid_t id, size_t *nprops)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Pget_nprops() */
@@ -3240,7 +3240,7 @@ H5P_cmp_prop(H5P_genprop_t *prop1, H5P_genprop_t *prop2)
if(prop1->close!=prop2->close) HGOTO_DONE(-1);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_cmp_prop() */
@@ -3342,7 +3342,7 @@ H5P_cmp_class(H5P_genclass_t *pclass1, H5P_genclass_t *pclass2)
} /* end while */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_cmp_class() */
@@ -3441,7 +3441,7 @@ H5P_cmp_plist(H5P_genplist_t *plist1, H5P_genplist_t *plist2)
HGOTO_DONE(cmp_value);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_cmp_plist() */
@@ -3495,7 +3495,7 @@ H5Pequal(hid_t id1, hid_t id2)
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Pequal() */
@@ -3544,7 +3544,7 @@ H5P_isa_class_real(H5P_genclass_t *pclass1, H5P_genclass_t *pclass2)
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_isa_class_real() */
@@ -3593,7 +3593,7 @@ H5P_isa_class(hid_t plist_id, hid_t pclass_id)
HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to compare property list classes");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_isa_class() */
@@ -3639,7 +3639,7 @@ H5Pisa_class(hid_t plist_id, hid_t pclass_id)
HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to compare property list classes");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Pisa_class() */
@@ -3687,7 +3687,7 @@ H5P_object_verify(hid_t plist_id, hid_t pclass_id)
HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, NULL, "can't find object for ID");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_object_verify() */
@@ -3846,7 +3846,7 @@ done:
if(seen!=NULL)
H5TB_dfree(seen,NULL,NULL);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_iterate_plist() */
@@ -3946,7 +3946,7 @@ done:
/* Set the index we stopped at */
*idx=curr_idx;
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_iterate_pclass() */
@@ -4032,7 +4032,7 @@ H5Piterate(hid_t id, int *idx, H5P_iterate_t iter_func, void *iter_data)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a property object");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Piterate() */
@@ -4077,7 +4077,7 @@ H5P_peek_unsigned(H5P_genplist_t *plist, const char *name)
H5P_get(plist,name,&ret_value);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_peek_unsigned() */
@@ -4122,7 +4122,7 @@ H5P_peek_hid_t(H5P_genplist_t *plist, const char *name)
H5P_get(plist,name,&ret_value);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_peek_hid_t() */
@@ -4167,7 +4167,7 @@ H5P_peek_voidp(H5P_genplist_t *plist, const char *name)
H5P_get(plist,name,&ret_value);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_peek_voidp() */
@@ -4212,7 +4212,7 @@ H5P_peek_hsize_t(H5P_genplist_t *plist, const char *name)
H5P_get(plist,name,&ret_value);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_peek_hsize_t() */
@@ -4257,7 +4257,7 @@ H5P_peek_size_t(H5P_genplist_t *plist, const char *name)
H5P_get(plist,name,&ret_value);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_peek_size_t() */
@@ -4412,7 +4412,7 @@ H5P_get(H5P_genplist_t *plist, const char *name, void *value)
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_get() */
@@ -4466,7 +4466,7 @@ H5Pget(hid_t plist_id, const char *name, void *value)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to query property value");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Pget() */
@@ -4601,7 +4601,7 @@ H5P_remove(hid_t plist_id, H5P_genplist_t *plist, const char *name)
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_remove() */
@@ -4651,7 +4651,7 @@ H5Premove(hid_t plist_id, const char *name)
HGOTO_ERROR(H5E_PLIST, H5E_CANTDELETE, FAIL, "unable to remove property");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Premove() */
@@ -4760,7 +4760,7 @@ done:
H5P_free_prop(new_prop);
} /* end if */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_copy_prop_plist() */
@@ -4823,7 +4823,7 @@ H5P_copy_prop_pclass(H5P_genclass_t *dst_pclass, H5P_genclass_t *src_pclass, con
done:
/* Cleanup, if necessary */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_copy_prop_pclass() */
@@ -4897,7 +4897,7 @@ H5Pcopy_prop(hid_t dst_id, hid_t src_id, const char *name)
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Pcopy_prop() */
@@ -4955,7 +4955,7 @@ H5P_unregister(H5P_genclass_t *pclass, const char *name)
pclass->revision = H5P_GET_NEXT_REV;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_unregister() */
@@ -5000,7 +5000,7 @@ H5Punregister(hid_t pclass_id, const char *name)
HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to remove property from class");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Punregister() */
@@ -5148,7 +5148,7 @@ done:
if(seen!=NULL)
H5TB_dfree(seen,NULL,NULL);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_close() */
@@ -5198,7 +5198,7 @@ H5Pclose(hid_t plist_id)
HGOTO_ERROR(H5E_ARGS, H5E_CANTDELETE, FAIL, "can't delete property list");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Pclose() */
@@ -5235,7 +5235,7 @@ H5P_get_class_name(H5P_genclass_t *pclass)
ret_value=H5MM_xstrdup(pclass->name);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_get_class_name() */
@@ -5276,7 +5276,7 @@ H5Pget_class_name(hid_t pclass_id)
HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, NULL, "unable to query name of class");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Pget_class_name() */
@@ -5343,7 +5343,7 @@ H5P_get_class_path(H5P_genclass_t *pclass)
ret_value=H5MM_xstrdup(pclass->name);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_get_class_path() */
@@ -5386,7 +5386,7 @@ H5P_get_class_path_test(hid_t pclass_id)
HGOTO_ERROR(H5E_PLIST, H5E_NOTFOUND, NULL, "unable to query full path of class");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_get_class_path_test() */
@@ -5464,7 +5464,7 @@ done:
/* Free the duplicated path */
H5MM_xfree(tmp_path);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_open_class_path() */
@@ -5512,7 +5512,7 @@ done:
if(ret_value<0 && pclass)
H5P_close_class(pclass);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_open_class_path_test() */
@@ -5547,7 +5547,7 @@ H5P_get_class_parent(H5P_genclass_t *pclass)
/* Get property size */
ret_value=pclass->parent;
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_get_class_parent() */
@@ -5600,7 +5600,7 @@ done:
if (ret_value<0 && parent)
H5P_close_class(parent);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Pget_class_parent() */
@@ -5636,7 +5636,7 @@ H5P_close_class(void *_pclass)
HGOTO_ERROR (H5E_PLIST, H5E_NOTFOUND, FAIL, "Can't decrement ID ref count");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5P_close_class() */
@@ -5676,6 +5676,6 @@ H5Pclose_class(hid_t cls_id)
HGOTO_ERROR(H5E_PLIST, H5E_CANTFREE, FAIL, "can't close");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Pclose_class() */
diff --git a/src/H5Pdcpl.c b/src/H5Pdcpl.c
index 2e2b883..7aafe92 100644
--- a/src/H5Pdcpl.c
+++ b/src/H5Pdcpl.c
@@ -77,7 +77,7 @@ H5Pset_layout(hid_t plist_id, H5D_layout_t layout)
HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't set layout");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -120,7 +120,7 @@ H5Pget_layout(hid_t plist_id)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, H5D_LAYOUT_ERROR, "can't get layout");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -189,7 +189,7 @@ H5Pset_chunk(hid_t plist_id, int ndims, const hsize_t dim[/*ndims*/])
HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't set chunk size");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -252,7 +252,7 @@ H5Pget_chunk(hid_t plist_id, int max_ndims, hsize_t dim[]/*out*/)
ret_value=ndims;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -345,7 +345,7 @@ H5Pset_external(hid_t plist_id, const char *name, off_t offset, hsize_t size)
HGOTO_ERROR(H5E_PLIST, H5E_CANTINIT, FAIL, "can't set external file list");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -392,7 +392,7 @@ H5Pget_external_count(hid_t plist_id)
ret_value=efl.nused;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -458,7 +458,7 @@ H5Pget_external(hid_t plist_id, int idx, size_t name_size, char *name/*out*/,
*size = efl.slot[idx].size;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -535,7 +535,7 @@ H5Pset_filter(hid_t plist_id, H5Z_filter_t filter, unsigned int flags,
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set pipeline");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -585,7 +585,7 @@ H5Pget_nfilters(hid_t plist_id)
ret_value=(int)(pline.nfilters);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -692,7 +692,7 @@ H5Pget_filter(hid_t plist_id, int idx, unsigned int *flags/*out*/,
ret_value=pline.filter[idx].id;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -748,7 +748,7 @@ H5Pset_deflate(hid_t plist_id, unsigned level)
HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to set pipeline");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -797,7 +797,7 @@ H5Pset_shuffle(hid_t plist_id, unsigned bytes_of_type)
HGOTO_ERROR(H5E_PLINE, H5E_CANTINIT, FAIL, "unable to set pipeline");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -869,7 +869,7 @@ H5Pset_fill_value(hid_t plist_id, hid_t type_id, const void *value)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set fill value");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -975,7 +975,7 @@ done:
H5MM_xfree(bkg);
if (src_id>=0)
H5I_dec_ref(src_id);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1022,7 +1022,7 @@ H5P_is_fill_value_defined(const struct H5O_fill_t *fill, H5D_fill_value_t *statu
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5P_is_fill_value_defined() */
@@ -1061,7 +1061,7 @@ H5P_fill_value_defined(H5P_genplist_t *plist, H5D_fill_value_t *status)
HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, FAIL, "can't check fill value status");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5P_fill_value_defined() */
@@ -1100,7 +1100,7 @@ H5Pfill_value_defined(hid_t plist_id, H5D_fill_value_t *status)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get fill value info");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Pfill_value_defined() */
@@ -1139,7 +1139,7 @@ H5Pset_alloc_time(hid_t plist_id, H5D_alloc_time_t alloc_time)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set space allocation time");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1178,7 +1178,7 @@ H5Pget_alloc_time(hid_t plist_id, H5D_alloc_time_t *alloc_time/*out*/)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get space allocation time");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1216,7 +1216,7 @@ H5Pset_fill_time(hid_t plist_id, H5D_fill_time_t fill_time)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set space allocation time");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
/*-------------------------------------------------------------------------
@@ -1253,6 +1253,6 @@ H5Pget_fill_time(hid_t plist_id, H5D_fill_time_t *fill_time/*out*/)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set space allocation time");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
diff --git a/src/H5Pdxpl.c b/src/H5Pdxpl.c
index 15d0557..33aa607 100644
--- a/src/H5Pdxpl.c
+++ b/src/H5Pdxpl.c
@@ -85,7 +85,7 @@ H5Pset_buffer(hid_t plist_id, hsize_t _size, void *tconv, void *bkg)
HGOTO_ERROR (H5E_PLIST, H5E_CANTSET, FAIL, "Can't set background type conversion buffer");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -135,7 +135,7 @@ H5Pget_buffer(hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/)
ret_value=(hsize_t)size;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
#else /* H5_WANT_H5_V1_4_COMPAT */
@@ -189,7 +189,7 @@ H5Pset_buffer(hid_t plist_id, size_t size, void *tconv, void *bkg)
HGOTO_ERROR (H5E_PLIST, H5E_CANTSET, FAIL, "Can't set background type conversion buffer");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -239,7 +239,7 @@ H5Pget_buffer(hid_t plist_id, void **tconv/*out*/, void **bkg/*out*/)
ret_value=size;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
#endif /* H5_WANT_H5_V1_4_COMPAT */
@@ -290,7 +290,7 @@ H5Pset_hyper_cache(hid_t plist_id, unsigned cache, unsigned limit)
HGOTO_ERROR(H5E_PLIST, H5E_CANTREGISTER, FAIL, "unable to set value");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -331,7 +331,7 @@ H5Pget_hyper_cache(hid_t plist_id, unsigned *cache/*out*/,
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
#endif /* H5_WANT_H5_V1_4_COMPAT */
@@ -374,7 +374,7 @@ H5Pset_preserve(hid_t plist_id, hbool_t status)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -416,7 +416,7 @@ H5Pget_preserve(hid_t plist_id)
ret_value= need_bkg ? TRUE : FALSE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -465,7 +465,7 @@ H5Pget_btree_ratios(hid_t plist_id, double *left/*out*/, double *middle/*out*/,
*right = btree_split_ratio[2];
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -521,7 +521,7 @@ H5Pset_btree_ratios(hid_t plist_id, double left, double middle,
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -567,7 +567,7 @@ H5P_set_vlen_mem_manager(H5P_genplist_t *plist, H5MM_allocate_t alloc_func,
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5P_set_vlen_mem_manager() */
@@ -611,7 +611,7 @@ H5Pset_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t alloc_func,
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set values");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Pset_vlen_mem_manager() */
@@ -659,7 +659,7 @@ H5Pget_vlen_mem_manager(hid_t plist_id, H5MM_allocate_t *alloc_func/*out*/,
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -708,7 +708,7 @@ H5Pset_hyper_vector_size(hid_t plist_id, size_t vector_size)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "unable to set value");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Pset_hyper_vector_size() */
@@ -745,6 +745,6 @@ H5Pget_hyper_vector_size(hid_t plist_id, size_t *vector_size/*out*/)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "unable to get value");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Pget_hyper_vector_size() */
diff --git a/src/H5Pfapl.c b/src/H5Pfapl.c
index a80b3ab..4b25846 100644
--- a/src/H5Pfapl.c
+++ b/src/H5Pfapl.c
@@ -94,7 +94,7 @@ H5Pset_alignment(hid_t fapl_id, hsize_t threshold, hsize_t alignment)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set alignment");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -142,7 +142,7 @@ H5Pget_alignment(hid_t fapl_id, hsize_t *threshold/*out*/,
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get alignment");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -244,7 +244,7 @@ H5P_set_driver(H5P_genplist_t *plist, hid_t new_driver_id, const void *new_drive
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5P_set_driver() */
@@ -295,7 +295,7 @@ H5Pset_driver(hid_t plist_id, hid_t new_driver_id, const void *new_driver_info)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set driver info");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Pset_driver() */
@@ -354,7 +354,7 @@ H5P_get_driver(H5P_genplist_t *plist)
ret_value = H5FD_SEC2;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -401,7 +401,7 @@ H5Pget_driver(hid_t plist_id)
ret_value = H5P_get_driver(plist);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -450,7 +450,7 @@ H5P_get_driver_info(H5P_genplist_t *plist)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5P_get_driver_info() */
@@ -495,7 +495,7 @@ H5Pget_driver_info(hid_t plist_id)
HGOTO_ERROR(H5E_PLIST,H5E_CANTGET,NULL,"can't get driver info");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Pget_driver_info() */
@@ -534,7 +534,7 @@ herr_t H5Pset_family_offset(hid_t fapl_id, hsize_t offset)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set family offset");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -569,7 +569,7 @@ herr_t H5P_set_family_offset(H5P_genplist_t *plist, hsize_t offset)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -608,7 +608,7 @@ herr_t H5Pget_family_offset(hid_t fapl_id, hsize_t *offset)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't get family offset");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -643,7 +643,7 @@ herr_t H5P_get_family_offset(H5P_genplist_t *plist, hsize_t *offset)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -682,7 +682,7 @@ herr_t H5Pset_multi_type(hid_t fapl_id, H5FD_mem_t type)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set data type for multi driver");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -717,7 +717,7 @@ herr_t H5P_set_multi_type(H5P_genplist_t *plist, H5FD_mem_t type)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -756,7 +756,7 @@ herr_t H5Pget_multi_type(hid_t fapl_id, H5FD_mem_t *type)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't get data type for multi driver");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -791,7 +791,7 @@ herr_t H5P_get_multi_type(H5P_genplist_t *plist, H5FD_mem_t *type)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -857,7 +857,7 @@ H5Pset_cache(hid_t plist_id, int mdc_nelmts,
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set preempt read chunks");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -917,7 +917,7 @@ H5Pget_cache(hid_t plist_id, int *mdc_nelmts,
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get preempt read chunks");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
#else /* H5_WANT_H5_V1_4_COMPAT */
@@ -981,7 +981,7 @@ H5Pset_cache(hid_t plist_id, int mdc_nelmts,
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET,FAIL, "can't set preempt read chunks");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1038,7 +1038,7 @@ H5Pget_cache(hid_t plist_id, int *mdc_nelmts,
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET,FAIL, "can't get preempt read chunks");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
#endif /* H5_WANT_H5_V1_4_COMPAT */
@@ -1092,7 +1092,7 @@ H5Pset_gc_references(hid_t plist_id, unsigned gc_ref)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set garbage collect reference");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1135,7 +1135,7 @@ H5Pget_gc_references(hid_t plist_id, unsigned *gc_ref/*out*/)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get garbage collect reference");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1171,7 +1171,7 @@ H5Pset_fclose_degree(hid_t plist_id, H5F_close_degree_t degree)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set file close degree");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1204,7 +1204,7 @@ herr_t H5Pget_fclose_degree(hid_t plist_id, H5F_close_degree_t *degree)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get file close degree");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1255,7 +1255,7 @@ H5Pset_meta_block_size(hid_t plist_id, hsize_t size)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set meta data block size");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1299,7 +1299,7 @@ H5Pget_meta_block_size(hid_t plist_id, hsize_t *size/*out*/)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
#ifdef H5_WANT_H5_V1_4_COMPAT
@@ -1352,7 +1352,7 @@ H5Pset_sieve_buf_size(hid_t plist_id, hsize_t _size)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set sieve buffer size");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Pset_sieve_buf_size() */
@@ -1398,7 +1398,7 @@ H5Pget_sieve_buf_size(hid_t plist_id, hsize_t *_size/*out*/)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Pget_sieve_buf_size() */
#else /* H5_WANT_H5_V1_4_COMPAT */
@@ -1449,7 +1449,7 @@ H5Pset_sieve_buf_size(hid_t plist_id, size_t size)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set sieve buffer size");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Pset_sieve_buf_size() */
@@ -1492,7 +1492,7 @@ H5Pget_sieve_buf_size(hid_t plist_id, size_t *size/*out*/)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get sieve buffer size");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Pget_sieve_buf_size() */
#endif /* H5_WANT_H5_V1_4_COMPAT */
@@ -1539,7 +1539,7 @@ H5Pset_small_data_block_size(hid_t plist_id, hsize_t size)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set 'small data' block size");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Pset_small_data_block_size() */
@@ -1578,6 +1578,6 @@ H5Pget_small_data_block_size(hid_t plist_id, hsize_t *size/*out*/)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Pget_small_data_block_size() */
diff --git a/src/H5Pfcpl.c b/src/H5Pfcpl.c
index 93a4390..d709859 100644
--- a/src/H5Pfcpl.c
+++ b/src/H5Pfcpl.c
@@ -93,7 +93,7 @@ H5Pget_version(hid_t plist_id, int *boot/*out*/, int *freelist/*out*/,
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get shared-header version");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -144,7 +144,7 @@ H5Pset_userblock(hid_t plist_id, hsize_t size)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set user block");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -187,7 +187,7 @@ H5Pget_userblock(hid_t plist_id, hsize_t *size)
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL,"can't get user block");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -241,7 +241,7 @@ H5Pset_sizes(hid_t plist_id, size_t sizeof_addr, size_t sizeof_size)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set byte number for object ");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -286,7 +286,7 @@ H5Pget_sizes(hid_t plist_id,
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get byte number for object ");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
#ifdef H5_WANT_H5_V1_4_COMPAT
@@ -348,7 +348,7 @@ H5Pset_sym_k(hid_t plist_id, int ik, int lk)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set rank for symbol table leaf nodes");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -397,7 +397,7 @@ H5Pget_sym_k(hid_t plist_id, int *ik /*out */ , int *lk /*out */ )
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for symbol table leaf nodes");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
#else /* H5_WANT_H5_V1_4_COMPAT */
@@ -458,7 +458,7 @@ H5Pset_sym_k(hid_t plist_id, int ik, unsigned lk)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set rank for symbol table leaf nodes");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -507,7 +507,7 @@ H5Pget_sym_k(hid_t plist_id, int *ik /*out */ , unsigned *lk /*out */ )
HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get rank for symbol table leaf nodes");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
#endif /* H5_WANT_H5_V1_4_COMPAT */
@@ -557,7 +557,7 @@ H5Pset_istore_k(hid_t plist_id, int ik)
HGOTO_ERROR(H5E_PLIST, H5E_CANTSET, FAIL, "can't set rank for btree interanl nodes");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -604,6 +604,6 @@ H5Pget_istore_k(hid_t plist_id, int *ik /*out */ )
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
diff --git a/src/H5R.c b/src/H5R.c
index 1ffa827..57fd5b4 100644
--- a/src/H5R.c
+++ b/src/H5R.c
@@ -66,7 +66,7 @@ H5R_init_interface(void)
HGOTO_ERROR (H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable to initialize interface");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -104,7 +104,7 @@ H5R_term_interface(void)
}
}
- FUNC_LEAVE(n);
+ FUNC_LEAVE_NOAPI(n);
}
@@ -242,7 +242,7 @@ H5R_create(void *_ref, H5G_entry_t *loc, const char *name, H5R_type_t ref_type,
} /* end switch */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5R_create() */
@@ -302,7 +302,7 @@ H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t
HGOTO_ERROR (H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable to create reference");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Rcreate() */
@@ -437,7 +437,7 @@ H5R_dereference(H5F_t *file, H5R_type_t ref_type, void *_ref)
} /* end switch */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5R_dereference() */
@@ -489,7 +489,7 @@ H5Rdereference(hid_t id, H5R_type_t ref_type, void *_ref)
HGOTO_ERROR (H5E_REFERENCE, H5E_CANTINIT, FAIL, "unable dereference object");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Rdereference() */
@@ -561,7 +561,7 @@ H5R_get_region(H5F_t *file, H5R_type_t UNUSED ref_type, void *_ref)
H5MM_xfree(buf);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5R_get_region() */
@@ -619,7 +619,7 @@ H5Rget_region(hid_t id, H5R_type_t ref_type, void *_ref)
HGOTO_ERROR (H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to register dataspace atom");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Rget_region() */
#ifdef H5_WANT_H5_V1_4_COMPAT
@@ -673,7 +673,7 @@ H5R_get_object_type(H5F_t *file, void *_ref)
#ifdef LATER
done:
#endif /* LATER */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5R_get_object_type() */
@@ -723,7 +723,7 @@ H5Rget_object_type(hid_t id, void *_ref)
HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, H5G_UNKNOWN, "unable to determine object type");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Rget_object_type() */
#endif /* H5_WANT_H5_V1_4_COMPAT */
@@ -820,7 +820,7 @@ H5R_get_obj_type(H5F_t *file, H5R_type_t ref_type, void *_ref)
ret_value=H5G_get_type(&ent);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5R_get_obj_type() */
@@ -873,6 +873,6 @@ H5Rget_obj_type(hid_t id, H5R_type_t ref_type, void *_ref)
HGOTO_ERROR(H5E_REFERENCE, H5E_CANTINIT, H5G_UNKNOWN, "unable to determine object type");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Rget_obj_type() */
diff --git a/src/H5RS.c b/src/H5RS.c
index f6f18ac..39953d6 100644
--- a/src/H5RS.c
+++ b/src/H5RS.c
@@ -68,7 +68,7 @@ H5RS_xstrdup(const char *s)
else
ret_value=NULL;
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5RS_xstrdup() */
@@ -108,7 +108,7 @@ H5RS_create(const char *s)
ret_value->n=1;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5RS_create() */
@@ -148,7 +148,7 @@ H5RS_wrap(char *s)
ret_value->n=1;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5RS_wrap() */
@@ -190,7 +190,7 @@ H5RS_own(char *s)
ret_value->n=1;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5RS_own() */
@@ -232,7 +232,7 @@ H5RS_decr(H5RS_str_t *rs)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5RS_decr() */
@@ -278,7 +278,7 @@ H5RS_incr(H5RS_str_t *rs)
rs->n++;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5RS_incr() */
@@ -312,7 +312,7 @@ H5RS_dup(H5RS_str_t *ret_value)
ret_value->n++;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5RS_dup() */
@@ -349,7 +349,7 @@ H5RS_cmp(const H5RS_str_t *rs1, const H5RS_str_t *rs2)
assert(rs2);
assert(rs2->s);
- FUNC_LEAVE(HDstrcmp(rs1->s,rs2->s));
+ FUNC_LEAVE_NOAPI(HDstrcmp(rs1->s,rs2->s));
} /* end H5RS_cmp() */
@@ -385,6 +385,6 @@ H5RS_len(const H5RS_str_t *rs)
ret_value=HDstrlen(rs->s);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5RS_len() */
diff --git a/src/H5S.c b/src/H5S.c
index 0127056..980c87f 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -102,7 +102,7 @@ H5S_init_interface(void)
#endif /* H5_HAVE_PARALLEL */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -273,7 +273,7 @@ H5S_term_interface(void)
}
}
- FUNC_LEAVE(n);
+ FUNC_LEAVE_NOAPI(n);
}
@@ -323,7 +323,7 @@ H5S_create(H5S_class_t type)
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_create() */
@@ -371,7 +371,7 @@ done:
H5S_close(new_ds);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Screate() */
@@ -422,7 +422,7 @@ H5S_extent_release(H5S_t *ds)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_extent_release() */
@@ -463,7 +463,7 @@ H5S_close(H5S_t *ds)
H5FL_FREE(H5S_t,ds);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -500,7 +500,7 @@ H5Sclose(hid_t space_id)
HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "problem freeing id");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -538,7 +538,7 @@ H5S_release_simple(H5S_simple_t *simple)
#endif /* LATER */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*-------------------------------------------------------------------------
@@ -585,7 +585,7 @@ done:
H5S_close(dst);
} /* end if */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -624,7 +624,7 @@ H5Sextent_copy(hid_t dst_id,hid_t src_id)
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTCOPY, FAIL, "can't copy extent");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -681,7 +681,7 @@ H5S_extent_copy(H5S_extent_t *dst, const H5S_extent_t *src)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -728,7 +728,7 @@ H5S_copy(const H5S_t *src)
ret_value=dst;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -763,7 +763,7 @@ H5S_get_simple_extent_npoints(const H5S_t *ds)
ret_value = ds->extent.nelem;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -800,7 +800,7 @@ H5Sget_simple_extent_npoints(hid_t space_id)
ret_value = H5S_get_simple_extent_npoints(ds);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -867,7 +867,7 @@ H5S_get_npoints_max(const H5S_t *ds)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -903,7 +903,7 @@ H5Sget_simple_extent_ndims(hid_t space_id)
ret_value = H5S_get_simple_extent_ndims(ds);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -952,7 +952,7 @@ H5S_get_simple_extent_ndims(const H5S_t *ds)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -995,7 +995,7 @@ H5Sget_simple_extent_dims(hid_t space_id, hsize_t dims[]/*out*/,
ret_value = H5S_get_simple_extent_dims(ds, dims, maxdims);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1055,7 +1055,7 @@ H5S_get_simple_extent_dims(const H5S_t *ds, hsize_t dims[], hsize_t max_dims[])
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1100,7 +1100,7 @@ H5S_modify(H5G_entry_t *ent, const H5S_t *ds, hbool_t update_time)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1146,7 +1146,7 @@ H5S_append(H5F_t *f, H5O_t *oh, const H5S_t *ds)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_append() */
@@ -1218,7 +1218,7 @@ done:
H5FL_FREE(H5S_t,ds);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1293,7 +1293,7 @@ H5S_cmp(const H5S_t *ds1, const H5S_t *ds2)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1324,7 +1324,7 @@ H5S_is_simple(const H5S_t *sdim)
sdim->extent.type == H5S_SCALAR) ? TRUE : FALSE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1358,7 +1358,7 @@ H5Sis_simple(hid_t space_id)
ret_value = H5S_is_simple(space);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1425,7 +1425,7 @@ H5Sset_extent_simple(hid_t space_id, int rank, const hsize_t dims[/*rank*/],
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to set simple extent");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1513,7 +1513,7 @@ H5S_set_extent_simple (H5S_t *space, unsigned rank, const hsize_t *dims,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1660,7 +1660,7 @@ done:
H5MM_xfree(path);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1718,7 +1718,7 @@ H5S_extend (H5S_t *space, const hsize_t *size)
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1795,7 +1795,7 @@ done:
H5S_close(space);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1829,7 +1829,7 @@ H5S_get_simple_extent_type(const H5S_t *space)
ret_value=space->extent.type;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1867,7 +1867,7 @@ H5Sget_simple_extent_type(hid_t sid)
ret_value=H5S_get_simple_extent_type(space);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -1905,7 +1905,7 @@ H5Sset_extent_none(hid_t space_id)
space->extent.type=H5S_NO_CLASS;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Sset_extent_none() */
@@ -1950,7 +1950,7 @@ H5Soffset_simple(hid_t space_id, const hssize_t *offset)
HDmemcpy(space->select.offset,offset,sizeof(hssize_t)*space->extent.u.simple.rank);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Soffset_simple() */
@@ -2003,7 +2003,7 @@ H5S_set_extent( H5S_t *space, const hsize_t *size )
} /* end if */
done:
- FUNC_LEAVE( ret_value );
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2049,6 +2049,6 @@ H5S_debug(H5F_t *f, const void *_mesg, FILE *stream, int indent, int fwidth)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5ST.c b/src/H5ST.c
index 35b6ab8..35af906 100644
--- a/src/H5ST.c
+++ b/src/H5ST.c
@@ -62,7 +62,7 @@ H5ST_create(void)
ret_value->root=NULL;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5ST_create() */
@@ -98,7 +98,7 @@ H5ST_close_internal(H5ST_ptr_t p)
H5FL_FREE(H5ST_node_t,p);
} /* end if */
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
} /* end H5ST_close_internal() */
@@ -139,7 +139,7 @@ H5ST_close(H5ST_tree_t *tree)
H5FL_FREE(H5ST_tree_t,tree);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5ST_close() */
@@ -217,7 +217,7 @@ H5ST_insert(H5ST_tree_t *tree, const char *s, void *obj)
} /* end for */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5ST_insert() */
@@ -262,7 +262,7 @@ H5ST_search(H5ST_tree_t *tree, const char *s)
} /* end while */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5ST_search() */
@@ -305,7 +305,7 @@ H5ST_find_internal(H5ST_ptr_t p, const char *s)
} /* end while */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5ST_find_internal() */
@@ -340,7 +340,7 @@ H5ST_find(H5ST_tree_t *tree, const char *s)
HGOTO_ERROR(H5E_TST,H5E_NOTFOUND,NULL,"key not found in TST");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5ST_find() */
@@ -379,7 +379,7 @@ H5ST_locate(H5ST_tree_t *tree, const char *s)
ret_value=node->eqkid;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5ST_locate() */
@@ -425,7 +425,7 @@ H5ST_findfirst_internal(H5ST_ptr_t p)
} /* end while */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5ST_findfirst_internal() */
@@ -458,7 +458,7 @@ H5ST_findfirst(H5ST_tree_t *tree)
HGOTO_ERROR(H5E_TST,H5E_NOTFOUND,NULL,"no nodes in TST");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5ST_findfirst() */
@@ -516,7 +516,7 @@ H5ST_getnext(H5ST_ptr_t p)
} /* end else */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5ST_getnext() */
@@ -557,7 +557,7 @@ H5ST_findnext(H5ST_ptr_t p)
} while(p);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5ST_findnext() */
@@ -633,7 +633,7 @@ H5ST_delete_internal(H5ST_ptr_t *root, H5ST_ptr_t p)
H5FL_FREE(H5ST_node_t,p);
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
} /* end H5ST_delete_internal() */
@@ -668,7 +668,7 @@ H5ST_delete(H5ST_tree_t *tree, H5ST_ptr_t p)
HGOTO_ERROR(H5E_TST,H5E_CANTDELETE,FAIL,"can't delete node from TST");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5ST_delete() */
@@ -711,7 +711,7 @@ H5ST_remove(H5ST_tree_t *tree, const char *s)
HGOTO_ERROR(H5E_TST,H5E_CANTDELETE,NULL,"can't delete node from TST");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5ST_remove() */
#ifdef H5ST_DEBUG
@@ -757,7 +757,7 @@ H5ST_dump_internal(H5ST_ptr_t p)
} /* end if */
done:
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
} /* end H5ST_dump_internal() */
@@ -790,6 +790,6 @@ H5ST_dump(H5ST_tree_t *tree)
H5ST_dump_internal(tree->root);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5ST_dump() */
#endif /* H5ST_DEBUG */
diff --git a/src/H5Sall.c b/src/H5Sall.c
index 8bab11c..bc7a162 100644
--- a/src/H5Sall.c
+++ b/src/H5Sall.c
@@ -54,7 +54,7 @@ H5S_all_iter_init (const H5S_t *space, size_t UNUSED elmt_size, H5S_sel_iter_t *
sel_iter->all.offset=0;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_all_iter_init() */
@@ -86,7 +86,7 @@ H5S_all_iter_nelmts (const H5S_sel_iter_t *sel_iter)
ret_value=sel_iter->all.elmt_left;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_all_iter_nelmts() */
@@ -118,7 +118,7 @@ H5S_all_iter_release (H5S_sel_iter_t * UNUSED sel_iter)
assert (sel_iter);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_all_iter_release() */
@@ -150,7 +150,7 @@ H5S_all_release (H5S_t * UNUSED space)
assert (space);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_all_release() */
@@ -185,7 +185,7 @@ H5S_all_npoints (const H5S_t *space)
ret_value=(hsize_t)H5S_get_simple_extent_npoints(space);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_all_npoints() */
@@ -219,7 +219,7 @@ H5S_all_is_valid (const H5S_t UNUSED *space)
assert(space);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_all_is_valid() */
@@ -258,7 +258,7 @@ H5S_all_serial_size (const H5S_t UNUSED *space)
ret_value=16;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_all_serial_size() */
@@ -300,7 +300,7 @@ H5S_all_serialize (const H5S_t *space, uint8_t *buf)
ret_value=SUCCEED;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_all_serialize() */
@@ -337,7 +337,7 @@ H5S_all_deserialize (H5S_t *space, const uint8_t UNUSED *buf)
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_all_deserialize() */
@@ -389,7 +389,7 @@ H5S_all_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
} /* end for */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5Sget_all_bounds() */
@@ -421,7 +421,7 @@ H5S_all_is_contiguous(const H5S_t UNUSED *space)
assert(space);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_all_is_contiguous() */
@@ -453,7 +453,7 @@ H5S_all_is_single(const H5S_t UNUSED *space)
assert(space);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_all_is_single() */
@@ -487,7 +487,7 @@ H5S_all_is_regular(const H5S_t UNUSED *space)
assert(space);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_all_is_regular() */
@@ -543,7 +543,7 @@ H5S_select_all (H5S_t *space, unsigned rel_prev)
space->select.is_regular=H5S_all_is_regular;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_select_all() */
@@ -580,7 +580,7 @@ herr_t H5Sselect_all (hid_t spaceid)
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Sselect_all() */
@@ -660,6 +660,6 @@ H5S_all_get_seq_list(const H5S_t UNUSED *space, unsigned UNUSED flags, H5S_sel_i
iter->all.offset+=elem_used;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_all_get_seq_list() */
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index 994238f..25e52c8 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -67,7 +67,7 @@ H5S_hyper_print_spans_helper(struct H5S_hyper_span_t *span,unsigned depth)
tmp_span=tmp_span->next;
} /* end while */
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
static herr_t
@@ -80,7 +80,7 @@ H5S_hyper_print_spans(const struct H5S_hyper_span_info_t *span_lst)
H5S_hyper_print_spans_helper(span_lst->head,0);
} /* end if */
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
#endif /* H5S_HYPER_DEBUG */
@@ -254,7 +254,7 @@ H5S_hyper_iter_init (const H5S_t *space, size_t elmt_size, H5S_sel_iter_t *sel_i
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_iter_init() */
@@ -286,7 +286,7 @@ H5S_hyper_iter_nelmts (const H5S_sel_iter_t *sel_iter)
ret_value=sel_iter->hyp.elmt_left;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_iter_nelmts() */
@@ -344,7 +344,7 @@ H5S_hyper_iter_release (H5S_sel_iter_t *sel_iter)
H5FL_ARR_FREE(H5S_hyper_span_t,sel_iter->hyp.span);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_iter_release() */
@@ -452,7 +452,7 @@ H5S_hyper_iter_next (const H5S_t *space, H5S_sel_iter_t *iter)
for(i=0; i<ndims; i++)
iter->hyp.off[i]=tdiminfo[i].start+(tdiminfo[i].stride*iter_count[i])+iter_offset[i];
- FUNC_LEAVE (SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
} /* H5S_hyper_iter_next() */
@@ -487,7 +487,7 @@ H5S_hyper_npoints (const H5S_t *space)
ret_value=space->select.num_elem;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_npoints() */
@@ -536,7 +536,7 @@ H5S_hyper_new_span (hssize_t low, hssize_t high, H5S_hyper_span_info_t *down, H5
ret_value->down->count++;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_new_span() */
@@ -595,7 +595,7 @@ H5S_hyper_span_precompute_helper (H5S_hyper_span_info_t *spans, size_t elmt_size
} /* end if */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_span_precompute_helper() */
@@ -636,7 +636,7 @@ H5S_hyper_span_precompute (H5S_hyper_span_info_t *spans, size_t elmt_size)
HGOTO_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "can't reset hyperslab scratch pointer");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_span_precompute() */
@@ -687,7 +687,7 @@ H5S_hyper_span_scratch (H5S_hyper_span_info_t *spans, void *scr_value)
} /* end if */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_span_scratch() */
@@ -775,7 +775,7 @@ H5S_hyper_copy_span_helper (H5S_hyper_span_info_t *spans)
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_copy_span_helper() */
@@ -815,7 +815,7 @@ H5S_hyper_copy_span (H5S_hyper_span_info_t *spans)
HGOTO_ERROR(H5E_INTERNAL, H5E_CANTFREE, NULL, "can't reset span tree scratch pointers");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_copy_span() */
@@ -921,7 +921,7 @@ H5S_hyper_cmp_spans (H5S_hyper_span_info_t *span_info1, H5S_hyper_span_info_t *s
#ifdef LATER
done:
#endif /* LATER */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_cmp_spans() */
@@ -974,7 +974,7 @@ H5S_hyper_free_span_info (H5S_hyper_span_info_t *span_info)
} /* end if */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_free_span_info() */
@@ -1016,7 +1016,7 @@ H5S_hyper_free_span (H5S_hyper_span_t *span)
H5FL_FREE(H5S_hyper_span_t,span);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_free_span() */
@@ -1091,7 +1091,7 @@ H5S_hyper_copy (H5S_t *dst, const H5S_t *src)
} /* end if */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_hyper_copy() */
@@ -1157,7 +1157,7 @@ H5S_hyper_is_valid_helper (const H5S_hyper_span_info_t *spans, const hssize_t *o
curr=curr->next;
} /* end while */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_hyper_is_valid_helper() */
@@ -1225,7 +1225,7 @@ H5S_hyper_is_valid (const H5S_t *space)
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_hyper_is_valid() */
@@ -1273,7 +1273,7 @@ H5S_hyper_span_nblocks (H5S_hyper_span_info_t *spans)
} /* end while */
} /* end else */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_span_nblocks() */
@@ -1313,7 +1313,7 @@ H5S_get_select_hyper_nblocks(H5S_t *space)
else
ret_value = H5S_hyper_span_nblocks(space->select.sel_info.hslab.span_lst);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_get_select_hyper_nblocks() */
@@ -1352,7 +1352,7 @@ H5Sget_select_hyper_nblocks(hid_t spaceid)
ret_value = H5S_get_select_hyper_nblocks(space);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Sget_select_hyper_nblocks() */
@@ -1406,7 +1406,7 @@ H5S_hyper_serial_size (const H5S_t *space)
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_hyper_serial_size() */
@@ -1484,7 +1484,7 @@ H5S_hyper_serialize_helper (const H5S_hyper_span_info_t *spans, hssize_t *start,
} /* end while */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_serialize_helper() */
@@ -1644,7 +1644,7 @@ H5S_hyper_serialize (const H5S_t *space, uint8_t *buf)
UINT32ENCODE(lenp, (uint32_t)len); /* Store the length of the extra information */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_serialize() */
@@ -1736,7 +1736,7 @@ H5S_hyper_deserialize (H5S_t *space, const uint8_t *buf)
H5FL_ARR_FREE(hsize_t,block);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_deserialize() */
@@ -1840,7 +1840,7 @@ H5S_hyper_span_blocklist(H5S_hyper_span_info_t *spans, hssize_t start[], hssize_
} /* end while */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_span_blocklist() */
@@ -1982,7 +1982,7 @@ H5S_get_select_hyper_blocklist(H5S_t *space, hsize_t startblock, hsize_t numbloc
else
ret_value=H5S_hyper_span_blocklist(space->select.sel_info.hslab.span_lst,start,end,(hsize_t)0,&startblock,&numblocks,&buf);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_get_select_hyper_blocklist() */
@@ -2040,7 +2040,7 @@ H5Sget_select_hyper_blocklist(hid_t spaceid, hsize_t startblock, hsize_t numbloc
ret_value=SUCCEED; /* Successfully got 0 blocks... */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Sget_select_hyper_blocklist() */
@@ -2107,7 +2107,7 @@ H5S_hyper_bounds_helper (const H5S_hyper_span_info_t *spans, const hssize_t *off
curr=curr->next;
} /* end while */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_hyper_bounds_helper() */
@@ -2176,8 +2176,8 @@ H5S_hyper_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
} /* end if */
done:
- FUNC_LEAVE (ret_value);
-} /* H5Sget_hyper_bounds() */
+ FUNC_LEAVE_NOAPI(ret_value);
+} /* H5S_hyper_bounds() */
/*--------------------------------------------------------------------------
@@ -2359,7 +2359,7 @@ H5S_hyper_is_contiguous(const H5S_t *space)
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_is_contiguous() */
@@ -2438,7 +2438,7 @@ H5S_hyper_is_single(const H5S_t *space)
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_is_single() */
@@ -2479,7 +2479,7 @@ H5S_hyper_is_regular(const H5S_t *space)
ret_value=FALSE;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_is_regular() */
@@ -2534,7 +2534,7 @@ H5S_hyper_release (H5S_t *space)
} /* end if */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_release() */
@@ -2575,7 +2575,7 @@ H5S_hyper_recover_span (unsigned *recover, H5S_hyper_span_t **curr_span, H5S_hyp
/* Set the current span to next span */
*curr_span=next_span;
- FUNC_LEAVE (SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
} /* H5S_hyper_recover_span() */
@@ -2674,7 +2674,7 @@ H5S_hyper_append_span (H5S_hyper_span_t **prev_span, H5S_hyper_span_info_t ** sp
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_append_span() */
@@ -3178,7 +3178,7 @@ H5S_hyper_clip_spans (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_info_t *b_s
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_clip_spans() */
@@ -3489,7 +3489,7 @@ H5S_hyper_merge_spans_helper (H5S_hyper_span_info_t *a_spans, H5S_hyper_span_inf
ret_value=merged_spans;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_merge_spans_helper() */
@@ -3544,7 +3544,7 @@ H5S_hyper_merge_spans (H5S_t *space, H5S_hyper_span_info_t *new_spans)
space->select.sel_info.hslab.span_lst=merged_spans;
} /* end else */
- FUNC_LEAVE (SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
} /* H5S_hyper_merge_spans() */
@@ -3592,7 +3592,7 @@ H5S_hyper_spans_nelem (H5S_hyper_span_info_t *spans)
} /* end while */
} /* end else */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_spans_nelem() */
@@ -3702,7 +3702,7 @@ H5S_hyper_make_spans (unsigned rank, const hssize_t *start, const hsize_t *strid
ret_value=down;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_hyper_make_spans() */
#ifndef NEW_HYPERSLAB_API
@@ -3908,7 +3908,7 @@ H5S_generate_hyperslab (H5S_t *space, H5S_seloper_t op,
HGOTO_ERROR(H5E_INTERNAL, H5E_CANTFREE, FAIL, "failed to release temporary hyperslab spans");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_generate_hyperslab() */
@@ -4150,7 +4150,7 @@ done:
H5FL_ARR_FREE(hsize_t,_stride);
if(_block!=NULL)
H5FL_ARR_FREE(hsize_t,_block);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_select_hyperslab() */
@@ -4203,7 +4203,7 @@ H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hssize_t start[],
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to set hyperslab selection");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Sselect_hyperslab() */
#else /* NEW_HYPERSLAB_API */ /* Works */
@@ -4378,7 +4378,7 @@ H5S_operate_hyperslab (H5S_t *result, H5S_hyper_span_info_t *spans1, H5S_seloper
space->select.is_single=H5S_hyper_is_single;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_operate_hyperslab() */
@@ -4456,7 +4456,7 @@ done:
if(new_spans!=NULL)
H5S_hyper_free_span_info(new_spans);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_generate_hyperslab() */
@@ -4681,7 +4681,7 @@ done:
H5FL_ARR_FREE(hsize_t,_stride);
if(_block!=NULL)
H5FL_ARR_FREE(hsize_t,_block);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_select_hyperslab() */
@@ -4734,7 +4734,7 @@ H5Sselect_hyperslab(hid_t space_id, H5S_seloper_t op, const hssize_t start[],
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to set hyperslab selection");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Sselect_hyperslab() */
@@ -4803,7 +4803,7 @@ done:
if (ret_value<0 && new_space)
H5S_close(new_space);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Scombine_hyperslab() */
@@ -4849,7 +4849,7 @@ done:
if(ret_value==NULL && new_space!=NULL)
H5S_close(new_space);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_combine_select() */
@@ -4914,7 +4914,7 @@ done:
if (ret_value<0 && new_space)
H5S_close(new_space);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Scombine_select() */
@@ -4957,7 +4957,7 @@ done:
if(tmp_spans!=NULL)
H5S_hyper_free_span_info(tmp_spans);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_select_select() */
@@ -5014,7 +5014,7 @@ H5Sselect_select(hid_t space1_id, H5S_seloper_t op, hid_t space2_id)
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTINIT, FAIL, "unable to modify hyperslab selection");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Sselect_select() */
#endif /* NEW_HYPERSLAB_API */ /* Works */
@@ -5426,7 +5426,7 @@ partial_done: /* Yes, goto's are evil, so sue me... :-) */
/* Set the number of bytes used */
*nbytes=(start_io_bytes_left-io_bytes_left);
- FUNC_LEAVE (SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
} /* end H5S_hyper_get_seq_list_gen() */
@@ -5985,7 +5985,7 @@ H5S_hyper_get_seq_list_opt(const H5S_t *space,H5S_sel_iter_t *iter,
/* Set the number of bytes used */
*nbytes=(start_io_left-io_left)*elmt_size;
- FUNC_LEAVE (SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
} /* end H5S_hyper_get_seq_list_opt() */
@@ -6050,6 +6050,6 @@ H5S_hyper_get_seq_list(const H5S_t *space, unsigned UNUSED flags, H5S_sel_iter_t
ret_value=H5S_hyper_get_seq_list_gen(space,iter,elem_size,maxseq,maxbytes,nseq,nbytes,off,len);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_hyper_get_seq_list() */
diff --git a/src/H5Smpio.c b/src/H5Smpio.c
index 1fc2ea9..44d2979 100644
--- a/src/H5Smpio.c
+++ b/src/H5Smpio.c
@@ -162,7 +162,7 @@ done:
#ifdef H5Smpi_DEBUG
HDfprintf(stdout, "Leave %s total_bytes=%Hu\n", FUNC, total_bytes );
#endif
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_mpio_all_type() */
@@ -225,7 +225,7 @@ H5S_mpio_none_type( const H5S_t *space, size_t UNUSED elmt_size, hbool_t prefer_
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_mpio_none_type() */
@@ -566,7 +566,7 @@ done:
HDfprintf(stdout, "Leave %s, count=%Hu is_derived_type=%d\n",
FUNC, *count, *is_derived_type );
#endif
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -669,7 +669,7 @@ done:
#ifdef H5Smpi_DEBUG
HDfprintf(stdout, "Leave %s total_bytes=%Hu\n", FUNC, total_bytes );
#endif
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_mpio_hyper_contig_type() */
@@ -770,7 +770,7 @@ H5S_mpio_space_type( const H5S_t *space, size_t elmt_size, hbool_t prefer_derive
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -924,7 +924,7 @@ done:
HMPI_DONE_ERROR(FAIL, "MPI_Type_free failed", mpi_code);
}
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -963,7 +963,7 @@ H5S_mpio_spaces_read(H5F_t *f, const H5O_layout_t *layout,
buf, 0/*read*/);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1003,7 +1003,7 @@ H5S_mpio_spaces_write(H5F_t *f, H5O_layout_t *layout,
(void*)buf, 1/*write*/);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1061,7 +1061,7 @@ H5S_mpio_opt_possible( const H5S_t *mem_space, const H5S_t *file_space, const un
HGOTO_DONE(FALSE);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_mpio_opt_possible() */
#endif /* H5_HAVE_PARALLEL */
diff --git a/src/H5Snone.c b/src/H5Snone.c
index 7105958..a7db217 100644
--- a/src/H5Snone.c
+++ b/src/H5Snone.c
@@ -49,7 +49,7 @@ H5S_none_iter_init (const H5S_t UNUSED *space, size_t UNUSED elmt_size, H5S_sel_
assert (sel_iter);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_none_iter_init() */
@@ -78,7 +78,7 @@ H5S_none_iter_nelmts (const H5S_sel_iter_t UNUSED *sel_iter)
assert (sel_iter);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_none_iter_nelmts() */
@@ -110,7 +110,7 @@ H5S_none_iter_release (H5S_sel_iter_t * UNUSED sel_iter)
assert (sel_iter);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_none_iter_release() */
@@ -142,7 +142,7 @@ H5S_none_release (H5S_t * UNUSED space)
assert (space);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_none_release() */
@@ -175,7 +175,7 @@ H5S_none_npoints (const H5S_t UNUSED *space)
assert (space);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_none_npoints() */
@@ -209,7 +209,7 @@ H5S_none_is_valid (const H5S_t UNUSED *space)
assert(space);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_none_is_valid() */
@@ -248,7 +248,7 @@ H5S_none_serial_size (const H5S_t UNUSED *space)
ret_value=16;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_none_serial_size() */
@@ -287,7 +287,7 @@ H5S_none_serialize (const H5S_t *space, uint8_t *buf)
UINT32ENCODE(buf, (uint32_t)0); /* Store the additional information length */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_none_serialize() */
@@ -324,7 +324,7 @@ H5S_none_deserialize (H5S_t *space, const uint8_t UNUSED *buf)
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_none_deserialize() */
@@ -365,7 +365,7 @@ H5S_none_bounds(const H5S_t UNUSED *space, hsize_t UNUSED *start, hsize_t UNUSED
assert(end);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5Sget_none_bounds() */
@@ -397,7 +397,7 @@ H5S_none_is_contiguous(const H5S_t UNUSED *space)
assert(space);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_none_is_contiguous() */
@@ -429,7 +429,7 @@ H5S_none_is_single(const H5S_t UNUSED *space)
assert(space);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_none_is_single() */
@@ -463,7 +463,7 @@ H5S_none_is_regular(const H5S_t UNUSED *space)
assert(space);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_none_is_regular() */
@@ -516,7 +516,7 @@ herr_t H5S_select_none (H5S_t *space)
space->select.is_regular=H5S_none_is_regular;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_select_none() */
@@ -553,7 +553,7 @@ herr_t H5Sselect_none (hid_t spaceid)
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Sselect_none() */
@@ -616,5 +616,5 @@ H5S_none_get_seq_list(const H5S_t UNUSED *space, unsigned UNUSED flags, H5S_sel_
*nbytes=0;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_all_get_seq_list() */
diff --git a/src/H5Spoint.c b/src/H5Spoint.c
index 0072c15..0a59d67 100644
--- a/src/H5Spoint.c
+++ b/src/H5Spoint.c
@@ -62,7 +62,7 @@ H5S_point_iter_init(const H5S_t *space, size_t UNUSED elmt_size, H5S_sel_iter_t
sel_iter->pnt.curr=space->select.sel_info.pnt_lst->head;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_point_iter_init() */
@@ -94,7 +94,7 @@ H5S_point_iter_nelmts (const H5S_sel_iter_t *sel_iter)
ret_value=sel_iter->pnt.elmt_left;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_point_iter_nelmts() */
@@ -126,7 +126,7 @@ H5S_point_iter_release (H5S_sel_iter_t * UNUSED sel_iter)
assert (sel_iter);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_point_iter_release() */
@@ -211,7 +211,7 @@ H5S_point_add (H5S_t *space, H5S_seloper_t op, size_t num_elem, const hssize_t *
space->select.num_elem+=num_elem;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_point_add() */
@@ -260,7 +260,7 @@ H5S_point_release (H5S_t *space)
space->select.num_elem=0;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_point_release() */
@@ -294,7 +294,7 @@ H5S_point_npoints (const H5S_t *space)
ret_value=space->select.num_elem;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_point_npoints() */
@@ -377,7 +377,7 @@ H5S_select_elements (H5S_t *space, H5S_seloper_t op, size_t num_elem,
space->select.is_regular=H5S_point_is_regular;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_select_elements() */
@@ -438,7 +438,7 @@ H5S_point_copy (H5S_t *dst, const H5S_t *src)
} /* end while */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_point_copy() */
@@ -491,7 +491,7 @@ H5S_point_is_valid (const H5S_t *space)
} /* end while */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_point_is_valid() */
@@ -523,7 +523,7 @@ H5S_get_select_elem_npoints(H5S_t *space)
ret_value = space->select.num_elem;
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5Sget_select_elem_npoints() */
@@ -562,7 +562,7 @@ H5Sget_select_elem_npoints(hid_t spaceid)
ret_value = H5S_get_select_elem_npoints(space);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Sget_select_elem_npoints() */
@@ -610,7 +610,7 @@ H5S_point_serial_size (const H5S_t *space)
} /* end while */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_point_serial_size() */
@@ -678,7 +678,7 @@ H5S_point_serialize (const H5S_t *space, uint8_t *buf)
UINT32ENCODE(lenp, (uint32_t)len); /* Store the length of the extra information */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_point_serialize() */
@@ -742,7 +742,7 @@ done:
if(coord!=NULL)
H5MM_xfree(coord);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_point_deserialize() */
@@ -806,8 +806,8 @@ H5S_get_select_elem_pointlist(H5S_t *space, hsize_t startpoint, hsize_t numpoint
node=node->next;
} /* end while */
- FUNC_LEAVE (SUCCEED);
-} /* H5Sget_select_elem_pointlist() */
+ FUNC_LEAVE_NOAPI(SUCCEED);
+} /* H5S_get_select_elem_pointlist() */
/*--------------------------------------------------------------------------
@@ -859,7 +859,7 @@ H5Sget_select_elem_pointlist(hid_t spaceid, hsize_t startpoint, hsize_t numpoint
ret_value = H5S_get_select_elem_pointlist(space,startpoint,numpoints,buf);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Sget_select_elem_pointlist() */
@@ -925,8 +925,8 @@ H5S_point_bounds(const H5S_t *space, hsize_t *start, hsize_t *end)
} /* end while */
done:
- FUNC_LEAVE (ret_value);
-} /* H5Sget_point_bounds() */
+ FUNC_LEAVE_NOAPI(ret_value);
+} /* H5S_point_bounds() */
/*--------------------------------------------------------------------------
@@ -966,7 +966,7 @@ H5S_point_is_contiguous(const H5S_t *space)
ret_value=FALSE;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_point_is_contiguous() */
@@ -1004,7 +1004,7 @@ H5S_point_is_single(const H5S_t *space)
ret_value=FALSE;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_point_is_single() */
@@ -1046,7 +1046,7 @@ H5S_point_is_regular(const H5S_t *space)
ret_value=FALSE;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_point_is_regular() */
@@ -1103,7 +1103,7 @@ H5Sselect_elements(hid_t spaceid, H5S_seloper_t op, size_t num_elem,
HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't select elements");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Sselect_elements() */
@@ -1245,6 +1245,6 @@ H5S_point_get_seq_list(const H5S_t *space, unsigned flags, H5S_sel_iter_t *iter,
*nbytes=(start_bytes_left-bytes_left);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_point_get_seq_list() */
diff --git a/src/H5Sselect.c b/src/H5Sselect.c
index edc8fa7..77068a0 100644
--- a/src/H5Sselect.c
+++ b/src/H5Sselect.c
@@ -76,7 +76,7 @@ H5S_get_vector_size(hid_t dxpl_id)
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_get_vector_size() */
@@ -159,7 +159,7 @@ H5S_select_copy (H5S_t *dst, const H5S_t *src)
} /* end switch */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_select_copy() */
@@ -196,7 +196,7 @@ H5Sget_select_npoints(hid_t spaceid)
ret_value = (*space->select.get_npoints)(space);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Sget_select_npoints() */
@@ -236,7 +236,7 @@ H5Sselect_valid(hid_t spaceid)
ret_value = (*space->select.is_valid)(space);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Sselect_valid() */
@@ -297,7 +297,7 @@ H5S_select_deserialize (H5S_t *space, const uint8_t *buf)
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_select_deserialize() */
@@ -346,7 +346,7 @@ H5Sget_select_bounds(hid_t spaceid, hsize_t *start, hsize_t *end)
ret_value = (*space->select.bounds)(space,start,end);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* H5Sget_select_bounds() */
@@ -509,7 +509,7 @@ done:
if(off!=NULL)
H5FL_ARR_FREE(hsize_t,off);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_select_iterate() */
@@ -545,7 +545,7 @@ H5Sget_select_type(hid_t space_id)
ret_value=space->select.type;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Sget_select_type() */
@@ -665,7 +665,7 @@ H5S_select_shape_same(const H5S_t *space1, const H5S_t *space2)
} /* end for */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_select_shape_same() */
@@ -784,7 +784,7 @@ done:
if(_fill==NULL && fill)
H5FL_BLK_FREE(type_elem,fill);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_select_fill() */
@@ -870,7 +870,7 @@ done:
H5FL_ARR_FREE(size_t,len);
if(off!=NULL)
H5FL_ARR_FREE(hsize_t,off);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_select_fscat() */
@@ -960,7 +960,7 @@ done:
H5FL_ARR_FREE(size_t,len);
if(off!=NULL)
H5FL_ARR_FREE(hsize_t,off);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_select_fgath() */
@@ -1047,7 +1047,7 @@ done:
H5FL_ARR_FREE(size_t,len);
if(off!=NULL)
H5FL_ARR_FREE(hsize_t,off);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_select_mscat() */
@@ -1136,7 +1136,7 @@ done:
H5FL_ARR_FREE(size_t,len);
if(off!=NULL)
H5FL_ARR_FREE(hsize_t,off);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5S_select_mgath() */
@@ -1363,7 +1363,7 @@ done:
H5FL_ARR_FREE(size_t,mem_len);
if(mem_off!=NULL)
H5FL_ARR_FREE(hsize_t,mem_off);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_select_read() */
@@ -1590,6 +1590,6 @@ done:
H5FL_ARR_FREE(size_t,mem_len);
if(mem_off!=NULL)
H5FL_ARR_FREE(hsize_t,mem_off);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5S_select_write() */
diff --git a/src/H5T.c b/src/H5T.c
index 64cc2e3..26812b4 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -262,7 +262,7 @@ H5T_init(void)
/* FUNC_ENTER() does all the work */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1824,7 +1824,7 @@ done:
} /* end if */
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1855,7 +1855,7 @@ H5T_unlock_cb (void *_dt, hid_t UNUSED id, const void UNUSED *key)
if (H5T_STATE_IMMUTABLE==dt->state)
dt->state = H5T_STATE_RDONLY;
- FUNC_LEAVE (SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
@@ -2023,7 +2023,7 @@ H5T_term_interface(void)
interface_initialize_g = 0;
n = 1; /*H5I*/
}
- FUNC_LEAVE(n);
+ FUNC_LEAVE_NOAPI(n);
}
@@ -2071,7 +2071,7 @@ H5Tcreate(H5T_class_t type, size_t size)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register data type atom");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2121,7 +2121,7 @@ done:
H5T_close (type);
} /* end if */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2163,7 +2163,7 @@ H5Tcommit(hid_t loc_id, const char *name, hid_t type_id)
HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit data type");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2200,7 +2200,7 @@ H5Tcommitted(hid_t type_id)
ret_value= (H5T_STATE_OPEN==type->state || H5T_STATE_NAMED==type->state);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2272,7 +2272,7 @@ done:
H5T_close(new_dt);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Tcopy() */
@@ -2310,7 +2310,7 @@ H5Tclose(hid_t type_id)
HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "problem freeing id");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2350,7 +2350,7 @@ H5Tequal(hid_t type1_id, hid_t type2_id)
ret_value = (0 == H5T_cmp(dt1, dt2)) ? TRUE : FALSE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2397,7 +2397,7 @@ H5Tlock(hid_t type_id)
HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to lock transient data type");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2435,7 +2435,7 @@ H5Tget_class(hid_t type_id)
ret_value= H5T_get_class(dt);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2473,7 +2473,7 @@ H5T_get_class(const H5T_t *dt)
ret_value=dt->type;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_get_class() */
@@ -2511,7 +2511,7 @@ H5Tdetect_class(hid_t type, H5T_class_t cls)
ret_value=H5T_detect_class(dt,cls);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2569,7 +2569,7 @@ H5T_detect_class (const H5T_t *dt, H5T_class_t cls)
} /* end if */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2604,7 +2604,7 @@ H5Tis_variable_str(hid_t dtype_id)
ret_value=H5T_is_variable_str(dt);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -2637,7 +2637,7 @@ H5T_is_variable_str(H5T_t *dt)
ret_value = TRUE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2704,7 +2704,7 @@ done:
H5T_close(new_dt);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -3059,7 +3059,7 @@ done:
H5T_close(new_type);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3191,7 +3191,7 @@ H5T_t* H5T_get_native_integer(size_t size, H5T_sign_t sign, H5T_direction_t dire
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3282,7 +3282,7 @@ H5T_t* H5T_get_native_float(size_t size, H5T_direction_t direction, size_t *stru
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "cannot compute compound offset");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3327,7 +3327,7 @@ herr_t H5T_cmp_offset(size_t *comp_size, size_t *offset, size_t elem_size,
*struct_align = align;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3366,7 +3366,7 @@ H5Tget_size(hid_t type_id)
ret_value = H5T_get_size(dt);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Tget_size() */
@@ -3426,7 +3426,7 @@ H5Tset_size(hid_t type_id, size_t size)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set size for data type");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -3471,7 +3471,7 @@ H5Tget_order(hid_t type_id)
ret_value = dt->u.atomic.order;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -3519,7 +3519,7 @@ H5Tset_order(hid_t type_id, H5T_order_t order)
dt->u.atomic.order = order;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -3567,7 +3567,7 @@ H5Tget_precision(hid_t type_id)
ret_value = dt->u.atomic.prec;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -3624,7 +3624,7 @@ H5Tset_precision(hid_t type_id, size_t prec)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set precision");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -3684,7 +3684,7 @@ H5Tget_offset(hid_t type_id)
ret_value = (int)dt->u.atomic.offset;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -3751,7 +3751,7 @@ H5Tset_offset(hid_t type_id, size_t offset)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to set offset");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -3798,7 +3798,7 @@ H5Tget_pad(hid_t type_id, H5T_pad_t *lsb/*out*/, H5T_pad_t *msb/*out*/)
*msb = dt->u.atomic.msb_pad;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -3847,7 +3847,7 @@ H5Tset_pad(hid_t type_id, H5T_pad_t lsb, H5T_pad_t msb)
dt->u.atomic.msb_pad = msb;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -3884,7 +3884,7 @@ H5Tget_sign(hid_t type_id)
ret_value = H5T_get_sign(dt);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -3926,7 +3926,7 @@ H5T_get_sign(H5T_t *dt)
ret_value = dt->u.atomic.u.i.sign;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3974,7 +3974,7 @@ H5Tset_sign(hid_t type_id, H5T_sign_t sign)
dt->u.atomic.u.i.sign = sign;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -4028,7 +4028,7 @@ H5Tget_fields(hid_t type_id, size_t *spos/*out*/,
if (msize) *msize = dt->u.atomic.u.f.msize;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -4097,7 +4097,7 @@ H5Tset_fields(hid_t type_id, size_t spos, size_t epos, size_t esize,
dt->u.atomic.u.f.msize = msize;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -4139,7 +4139,7 @@ H5Tget_ebias(hid_t type_id)
H5_ASSIGN_OVERFLOW(ret_value,dt->u.atomic.u.f.ebias,uint64_t,size_t);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -4182,7 +4182,7 @@ H5Tset_ebias(hid_t type_id, size_t ebias)
dt->u.atomic.u.f.ebias = ebias;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -4226,7 +4226,7 @@ H5Tget_norm(hid_t type_id)
ret_value = dt->u.atomic.u.f.norm;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -4272,7 +4272,7 @@ H5Tset_norm(hid_t type_id, H5T_norm_t norm)
dt->u.atomic.u.f.norm = norm;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -4318,7 +4318,7 @@ H5Tget_inpad(hid_t type_id)
ret_value = dt->u.atomic.u.f.pad;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -4366,7 +4366,7 @@ H5Tset_inpad(hid_t type_id, H5T_pad_t pad)
dt->u.atomic.u.f.pad = pad;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -4417,7 +4417,7 @@ H5Tget_cset(hid_t type_id)
HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, H5T_CSET_ERROR, "can't get cset info");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -4470,7 +4470,7 @@ H5Tset_cset(hid_t type_id, H5T_cset_t cset)
HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, FAIL, "can't set cset info");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -4522,7 +4522,7 @@ H5Tget_strpad(hid_t type_id)
HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, H5T_STR_ERROR, "can't get strpad info");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -4586,7 +4586,7 @@ H5Tset_strpad(hid_t type_id, H5T_str_t strpad)
HGOTO_ERROR(H5E_DATATYPE, H5E_BADVALUE, H5T_STR_ERROR, "can't set strpad info");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -4627,7 +4627,7 @@ H5Tget_nmembers(hid_t type_id)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "cannot return member number");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -4668,7 +4668,7 @@ H5T_get_nmembers(const H5T_t *dt)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "operation not supported for type class");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4709,7 +4709,7 @@ H5Tget_member_name(hid_t type_id, int membno)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "unable to get member name");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -4759,7 +4759,7 @@ H5T_get_member_name(H5T_t *dt, int membno)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4817,7 +4817,7 @@ H5Tget_member_index(hid_t type_id, const char *name)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -4860,7 +4860,7 @@ H5Tget_member_offset(hid_t type_id, int membno)
ret_value = H5T_get_member_offset(dt, membno);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -4899,7 +4899,7 @@ H5T_get_member_offset(H5T_t *dt, int membno)
ret_value = dt->u.compnd.memb[membno].offset;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4938,7 +4938,7 @@ H5Tget_member_class(hid_t type_id, int membno)
ret_value = dt->u.compnd.memb[membno].type->type;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Tget_member_class() */
@@ -4992,7 +4992,7 @@ done:
H5T_close(memb_dt);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -5030,7 +5030,7 @@ H5T_get_member_type(H5T_t *dt, int membno)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy member data type");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5086,7 +5086,7 @@ H5Tinsert(hid_t parent_id, const char *name, size_t offset, hid_t member_id)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINSERT, FAIL, "unable to insert member");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -5125,7 +5125,7 @@ H5Tpack(hid_t type_id)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to pack compound data type");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -5168,7 +5168,7 @@ H5Tenum_create(hid_t parent_id)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register data type atom");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -5209,7 +5209,7 @@ H5T_enum_create(H5T_t *parent)
ret_value->ent.header = HADDR_UNDEF;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5259,7 +5259,7 @@ H5Tenum_insert(hid_t type, const char *name, void *value)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to insert new enumeration member");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -5302,7 +5302,7 @@ done:
H5T_close(super);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -5339,7 +5339,7 @@ H5T_get_super(H5T_t *dt)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy parent data type");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5381,7 +5381,7 @@ H5Tget_member_value(hid_t type, int membno, void *value/*out*/)
if (H5T_get_member_value(dt, membno, value)<0)
HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "unable to get member value");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -5416,7 +5416,7 @@ H5T_get_member_value(H5T_t *dt, int membno, void *value/*out*/)
HDmemcpy(value, dt->u.enumer.value + membno*dt->size, dt->size);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5466,7 +5466,7 @@ H5Tenum_nameof(hid_t type, void *value, char *name/*out*/, size_t size)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "nameof query failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -5512,7 +5512,7 @@ H5Tenum_valueof(hid_t type, const char *name, void *value/*out*/)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "valueof query failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -5568,7 +5568,7 @@ H5T_vlen_create(H5T_t *base)
ret_value=dt;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5612,7 +5612,7 @@ H5Tvlen_create(hid_t base_id)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -5654,7 +5654,7 @@ H5Tset_tag(hid_t type_id, const char *tag)
dt->u.opaque.tag = H5MM_strdup(tag);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -5695,7 +5695,7 @@ H5Tget_tag(hid_t type_id)
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -5861,7 +5861,7 @@ done:
H5I_dec_ref(tmp_did);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_register() */
@@ -5914,7 +5914,7 @@ H5Tregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id,
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "can't register conversion function");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Tregister() */
@@ -6001,7 +6001,7 @@ H5T_unregister(H5T_pers_t pers, const char *name, H5T_t *src, H5T_t *dst,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_unregister() */
@@ -6044,7 +6044,7 @@ H5Tunregister(H5T_pers_t pers, const char *name, hid_t src_id, hid_t dst_id,
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTDELETE, FAIL, "internal unregister function failed");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -6096,7 +6096,7 @@ H5Tfind(hid_t src_id, hid_t dst_id, H5T_cdata_t **pcdata)
ret_value = path->func;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -6156,7 +6156,7 @@ H5Tconvert(hid_t src_id, hid_t dst_id, hsize_t nelmts, void *buf,
HGOTO_ERROR (H5E_DATATYPE, H5E_CANTINIT, FAIL, "data type conversion failed");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -6194,7 +6194,7 @@ H5Tget_overflow(void)
ret_value=H5T_overflow_g;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -6227,7 +6227,7 @@ H5Tset_overflow(H5T_overflow_t func)
H5T_overflow_g = func;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -6323,7 +6323,7 @@ done:
H5FL_FREE(H5T_t,dt);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6358,7 +6358,7 @@ H5T_isa(H5G_entry_t *ent)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to read object header");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6406,7 +6406,7 @@ H5T_open (H5G_entry_t *loc, const char *name)
ret_value=dt;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6455,7 +6455,7 @@ done:
H5O_close(ent);
} /* end if */
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6673,7 +6673,7 @@ done:
H5FL_FREE (H5T_t,new_dt);
} /* end if */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6741,7 +6741,7 @@ done:
type->ent.header = HADDR_UNDEF;
}
}
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6787,7 +6787,7 @@ H5T_lock (H5T_t *dt, hbool_t immutable)
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6865,7 +6865,7 @@ H5T_free(H5T_t *dt)
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to close parent data type");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_free() */
@@ -6911,7 +6911,7 @@ H5T_close(H5T_t *dt)
H5FL_FREE(H5T_t,dt);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6946,7 +6946,7 @@ H5T_is_atomic(const H5T_t *dt)
ret_value = FALSE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -7097,7 +7097,7 @@ H5T_set_size(H5T_t *dt, size_t size)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -7128,7 +7128,7 @@ H5T_get_size(const H5T_t *dt)
/* check args */
assert(dt);
- FUNC_LEAVE(dt->size);
+ FUNC_LEAVE_NOAPI(dt->size);
}
@@ -7231,7 +7231,7 @@ H5T_set_precision(H5T_t *dt, size_t prec)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -7304,7 +7304,7 @@ H5T_set_offset(H5T_t *dt, size_t offset)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -7396,7 +7396,7 @@ H5T_insert(H5T_t *parent, const char *name, size_t offset, const H5T_t *member)
parent->u.compnd.has_array=TRUE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -7447,7 +7447,7 @@ H5T_pack(H5T_t *dt)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -7558,7 +7558,7 @@ H5T_sort_value(H5T_t *dt, int *map)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -7665,7 +7665,7 @@ H5T_sort_name(H5T_t *dt, int *map)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -7730,7 +7730,7 @@ H5T_enum_insert(H5T_t *dt, const char *name, void *value)
HDmemcpy(dt->u.enumer.value+i*dt->size, value, dt->size);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -7810,7 +7810,7 @@ H5T_enum_nameof(H5T_t *dt, void *value, char *name/*out*/, size_t size)
ret_value=name;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -7875,7 +7875,7 @@ H5T_enum_valueof(H5T_t *dt, const char *name, void *value/*out*/)
HDmemcpy(value, dt->u.enumer.value+md*dt->size, dt->size);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -8245,7 +8245,7 @@ done:
if(idx2!=NULL)
H5MM_xfree(idx2);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -8515,7 +8515,7 @@ done:
if (src_id>=0) H5I_dec_ref(src_id);
if (dst_id>=0) H5I_dec_ref(dst_id);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -8588,7 +8588,7 @@ H5T_convert(H5T_path_t *tpath, hid_t src_id, hid_t dst_id, hsize_t nelmts,
#endif
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -8629,7 +8629,7 @@ H5T_entof (H5T_t *dt)
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -8662,7 +8662,7 @@ H5T_is_immutable(H5T_t *dt)
ret_value = TRUE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -8695,7 +8695,7 @@ H5T_is_named(H5T_t *dt)
ret_value = TRUE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -8732,7 +8732,7 @@ H5T_get_ref_type(const H5T_t *dt)
ret_value=dt->u.atomic.u.r.rtype;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_get_ref_type() */
@@ -8792,7 +8792,7 @@ H5Tarray_create(hid_t base_id, int ndims, const hsize_t dim[/* ndims */],
HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable to register datatype");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Tarray_create */
@@ -8864,7 +8864,7 @@ H5T_array_create(H5T_t *base, int ndims, const hsize_t dim[/* ndims */],
ret_value->force_conv=TRUE;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_array_create */
@@ -8902,7 +8902,7 @@ H5Tget_array_ndims(hid_t type_id)
ret_value = H5T_get_array_ndims(dt);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Tget_array_ndims */
@@ -8936,7 +8936,7 @@ H5T_get_array_ndims(H5T_t *dt)
ret_value=dt->u.array.ndims;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_get_array_ndims */
@@ -8974,7 +8974,7 @@ H5Tget_array_dims(hid_t type_id, hsize_t dims[], int perm[])
if(H5T_get_array_dims(dt, dims, perm)<0)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "unable to get dimension sizes");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Tget_array_dims */
@@ -9016,7 +9016,7 @@ H5T_get_array_dims(H5T_t *dt, hsize_t dims[], int perm[])
perm[i]=dt->u.array.perm[i];
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_get_array_dims */
@@ -9071,7 +9071,7 @@ H5T_is_sensible(const H5T_t *dt)
} /* end switch */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -9137,7 +9137,7 @@ H5T_print_stats(H5T_path_t * UNUSED path, int * UNUSED nprint/*in,out*/)
bandwidth);
}
#endif
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
/*-------------------------------------------------------------------------
@@ -9348,6 +9348,6 @@ H5T_debug(const H5T_t *dt, FILE *stream)
fprintf(stream, "}");
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5TB.c b/src/H5TB.c
index 5f04732..1a057f2 100644
--- a/src/H5TB.c
+++ b/src/H5TB.c
@@ -135,7 +135,7 @@ H5TB_strcmp(const void *k1, const void *k2, int UNUSED cmparg)
assert(k1);
assert(k2);
- FUNC_LEAVE(HDstrcmp(k1,k2));
+ FUNC_LEAVE_NOAPI(HDstrcmp(k1,k2));
} /* end H5TB_strcmp() */
@@ -161,7 +161,7 @@ H5TB_addr_cmp(const void *k1, const void *k2, int UNUSED cmparg)
assert(k1);
assert(k2);
- FUNC_LEAVE(H5F_addr_cmp(*(const haddr_t *)k1,*(const haddr_t *)k2));
+ FUNC_LEAVE_NOAPI(H5F_addr_cmp(*(const haddr_t *)k1,*(const haddr_t *)k2));
} /* end H5TB_addr_cmp() */
@@ -187,7 +187,7 @@ H5TB_int_cmp(const void *k1, const void *k2, int UNUSED cmparg)
assert(k1);
assert(k2);
- FUNC_LEAVE(*(const int *)k1 - *(const int *)k2);
+ FUNC_LEAVE_NOAPI(*(const int *)k1 - *(const int *)k2);
} /* end H5TB_int_cmp() */
@@ -242,7 +242,7 @@ H5TB_fast_dmake(unsigned fast_compare)
HGOTO_ERROR (H5E_TBBT, H5E_CANTCREATE, NULL, "can't create TBBT");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_fast_dmake() */
@@ -341,7 +341,7 @@ H5TB_dmake(H5TB_cmp_t cmp, int arg, unsigned fast_compare)
ret_value=tree;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_dmake() */
@@ -390,7 +390,7 @@ H5TB_dfind(H5TB_TREE * tree, const void * key, H5TB_NODE ** pp)
} /* end else */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_dfind() */
@@ -451,7 +451,7 @@ H5TB_find(H5TB_NODE * root, const void * key,
ret_value= (0 == cmp) ? ptr : NULL;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_find() */
@@ -494,7 +494,7 @@ H5TB_dless(H5TB_TREE * tree, void * key, H5TB_NODE ** pp)
ret_value= H5TB_less(tree->root, key, tree->compar, tree->cmparg, pp);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_dless() */
@@ -567,7 +567,7 @@ H5TB_less(H5TB_NODE * root, void * key, H5TB_cmp_t compar, int arg, H5TB_NODE **
ret_value= (0 == cmp) ? ptr : NULL;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_less */
@@ -625,7 +625,7 @@ H5TB_index(H5TB_NODE * root, unsigned indx)
ret_value=ptr;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_index() */
@@ -667,7 +667,7 @@ H5TB_dins(H5TB_TREE * tree, void * item, void * key)
tree->count++;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_dins() */
@@ -739,7 +739,7 @@ H5TB_ins(H5TB_NODE ** root, void * item, void * key, H5TB_cmp_t compar, int arg)
ret_value=ptr;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_ins() */
@@ -909,7 +909,7 @@ done:
if(ret_value)
((H5TB_TREE *) root)->count--;
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_rem() */
@@ -944,7 +944,7 @@ H5TB_first(H5TB_NODE * root)
ret_value=H5TB_end(root, LEFT);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_first() */
@@ -979,7 +979,7 @@ H5TB_last(H5TB_NODE * root)
ret_value=H5TB_end(root, RIGHT);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_last() */
@@ -1013,7 +1013,7 @@ H5TB_next(H5TB_NODE * node)
ret_value=H5TB_nbr(node, RIGHT);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_next() */
@@ -1047,7 +1047,7 @@ H5TB_prev(H5TB_NODE * node)
ret_value=H5TB_nbr(node, LEFT);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_prev() */
@@ -1092,7 +1092,7 @@ H5TB_dfree(H5TB_TREE * tree, void(*fd) (void * /* item */), void(*fk) (void * /*
} /* end if */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_dfree() */
@@ -1164,7 +1164,7 @@ H5TB_free(H5TB_NODE ** root, void(*fd) (void * /* item */), void(*fk) (void * /*
} /* end while */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_free() */
@@ -1196,7 +1196,7 @@ H5TB_count(H5TB_TREE * tree)
ret_value= (tree==NULL) ? FAIL : (long)tree->count;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_count() */
#ifdef H5TB_DEBUG
@@ -1227,11 +1227,11 @@ H5TB_dump(H5TB_TREE *tree, void (*key_dump)(void *,void *), int method)
{
FUNC_ENTER_NOAPI(H5TB_dump,FAIL);
- printf("H5TB-tree dump %p:\n",tree);
- printf("capacity = %ld\n\n",(long)tree->count);
- H5TB_dumpNode(tree->root,key_dump, method);
+ printf("H5TB-tree dump %p:\n",tree);
+ printf("capacity = %ld\n\n",(long)tree->count);
+ H5TB_dumpNode(tree->root,key_dump, method);
- FUNC_LEAVE(SUCCESS);
+ FUNC_LEAVE_NOAPI(SUCCESS);
} /* end H5TB_dump() */
@@ -1270,7 +1270,7 @@ H5TB_printNode(H5TB_NODE * node, void(*key_dump)(void *,void *))
(*key_dump)(node->key,node->data);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_printNode() */
@@ -1334,7 +1334,7 @@ H5TB_dumpNode(H5TB_NODE *node, void (*key_dump)(void *,void *),
} /* end switch() */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_dumpNode() */
#endif /* H5TB_DEBUG */
@@ -1367,7 +1367,7 @@ H5TB_end(H5TB_NODE * root, int side)
while (HasChild(root, side))
root = root->link[side];
- FUNC_LEAVE(root);
+ FUNC_LEAVE_NOAPI(root);
} /* end H5TB_end() */
/* Returns pointer to neighboring node (to LEFT or RIGHT): */
@@ -1390,7 +1390,7 @@ H5TB_nbr(H5TB_NODE * ptr, int side)
ret_value=ptr;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5TB_nbr() */
/* H5TB_ffind -- Look up a node in a tree based on a key value */
@@ -1463,7 +1463,7 @@ H5TB_ffind(H5TB_NODE * root, const void * key, unsigned fast_compare, H5TB_NODE
break;
} /* end switch */
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5TB_ffind() */
/* swapkid -- Often refered to as "rotating" nodes. ptr and ptr's `side'
@@ -1540,7 +1540,7 @@ H5TB_swapkid(H5TB_NODE ** root, H5TB_NODE * ptr, int side)
} /* end if */
ptr->flags = ptrflg;
- FUNC_LEAVE(kid);
+ FUNC_LEAVE_NOAPI(kid);
} /* end H5TB_swapkid() */
/* balance -- Move up tree, incrimenting number of left children when needed
@@ -1688,6 +1688,6 @@ H5TB_balance(H5TB_NODE ** root, H5TB_NODE * ptr, int side, int added)
ptr = ptr->Parent; /* Move up the tree */
}
/* total tree depth += deeper; */
- FUNC_LEAVE(SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
} /* end H5TB_balance() */
diff --git a/src/H5Tbit.c b/src/H5Tbit.c
index 6f235e7..ad716d3 100644
--- a/src/H5Tbit.c
+++ b/src/H5Tbit.c
@@ -197,7 +197,7 @@ H5T_bit_get_d (uint8_t *buf, size_t offset, size_t size)
ret_value=val;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -398,7 +398,7 @@ H5T_bit_find (uint8_t *buf, size_t offset, size_t size, H5T_sdir_t direction,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -466,5 +466,5 @@ H5T_bit_inc(uint8_t *buf, size_t start, size_t size)
buf[idx] |= acc & mask;
}
- FUNC_LEAVE(carry ? TRUE : FALSE);
+ FUNC_LEAVE_NOAPI(carry ? TRUE : FALSE);
}
diff --git a/src/H5Tconv.c b/src/H5Tconv.c
index 7f389ec..a1df8e8 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -449,7 +449,7 @@ H5T_conv_noop(hid_t UNUSED src_id, hid_t UNUSED dst_id, H5T_cdata_t *cdata,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -828,7 +828,7 @@ H5T_conv_order_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -930,7 +930,7 @@ H5T_conv_order(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1139,7 +1139,7 @@ H5T_conv_b_b(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1265,7 +1265,7 @@ H5T_conv_struct_init (H5T_t *src, H5T_t *dst, H5T_cdata_t *cdata)
cdata->recalc = FALSE;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1484,7 +1484,7 @@ H5T_conv_struct(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1750,7 +1750,7 @@ H5T_conv_struct_opt(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -1886,7 +1886,7 @@ done:
H5MM_xfree(priv);
cdata->priv = NULL;
}
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2050,7 +2050,7 @@ H5T_conv_enum(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2359,7 +2359,7 @@ done:
if(tmp_buf!=NULL)
H5FL_BLK_FREE(vlen_seq,tmp_buf);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -2511,7 +2511,7 @@ H5T_conv_array(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
} /* end switch */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_conv_array() */
@@ -2833,7 +2833,7 @@ H5T_conv_i_i (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3267,7 +3267,7 @@ H5T_conv_f_f (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3491,7 +3491,7 @@ H5T_conv_s_s (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts,
done:
H5MM_xfree(dbuf);
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3524,7 +3524,7 @@ H5T_conv_schar_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_su(SCHAR, UCHAR, signed char, unsigned char);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3557,7 +3557,7 @@ H5T_conv_uchar_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_us(UCHAR, SCHAR, unsigned char, signed char, SCHAR_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3590,7 +3590,7 @@ H5T_conv_schar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sS(SCHAR, SHORT, signed char, short);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3623,7 +3623,7 @@ H5T_conv_schar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sU(SCHAR, USHORT, signed char, unsigned short);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3656,7 +3656,7 @@ H5T_conv_uchar_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uS(UCHAR, SHORT, unsigned char, short, SHRT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3689,7 +3689,7 @@ H5T_conv_uchar_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uU(UCHAR, USHORT, unsigned char, unsigned short);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3721,7 +3721,7 @@ H5T_conv_schar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sS(SCHAR, INT, signed char, int);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3753,7 +3753,7 @@ H5T_conv_schar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sU(SCHAR, UINT, signed char, unsigned);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3785,7 +3785,7 @@ H5T_conv_uchar_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uS(UCHAR, INT, unsigned char, int, INT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3817,7 +3817,7 @@ H5T_conv_uchar_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uU(UCHAR, UINT, unsigned char, unsigned);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3849,7 +3849,7 @@ H5T_conv_schar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sS(SCHAR, LONG, signed char, long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3882,7 +3882,7 @@ H5T_conv_schar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sU(SCHAR, ULONG, signed char, unsigned long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3914,7 +3914,7 @@ H5T_conv_uchar_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uS(UCHAR, LONG, unsigned char, long, LONG_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3947,7 +3947,7 @@ H5T_conv_uchar_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uU(UCHAR, ULONG, unsigned char, unsigned long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -3980,7 +3980,7 @@ H5T_conv_schar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sS(SCHAR, LLONG, signed char, long_long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4013,7 +4013,7 @@ H5T_conv_schar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sU(SCHAR, ULLONG, signed char, unsigned long_long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4046,7 +4046,7 @@ H5T_conv_uchar_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uS(UCHAR, LLONG, unsigned char, long_long, LLONG_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4079,7 +4079,7 @@ H5T_conv_uchar_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uU(UCHAR, ULLONG, unsigned char, unsigned long_long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4112,7 +4112,7 @@ H5T_conv_short_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Ss(SHORT, SCHAR, short, signed char, SCHAR_MIN, SCHAR_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4145,7 +4145,7 @@ H5T_conv_short_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Su(SHORT, UCHAR, short, unsigned char, UCHAR_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4178,7 +4178,7 @@ H5T_conv_ushort_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Us(USHORT, SCHAR, unsigned short, signed char, SCHAR_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4211,7 +4211,7 @@ H5T_conv_ushort_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Uu(USHORT, UCHAR, unsigned short, unsigned char, UCHAR_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4244,7 +4244,7 @@ H5T_conv_short_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_su(SHORT, USHORT, short, unsigned short);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4277,7 +4277,7 @@ H5T_conv_ushort_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_us(USHORT, SHORT, unsigned short, short, SHRT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4310,7 +4310,7 @@ H5T_conv_short_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sS(SHORT, INT, short, int);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4343,7 +4343,7 @@ H5T_conv_short_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sU(SHORT, UINT, short, unsigned);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4376,7 +4376,7 @@ H5T_conv_ushort_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uS(USHORT, INT, unsigned short, int, INT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4409,7 +4409,7 @@ H5T_conv_ushort_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uU(USHORT, UINT, unsigned short, unsigned);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4442,7 +4442,7 @@ H5T_conv_short_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sS(SHORT, LONG, short, long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4475,7 +4475,7 @@ H5T_conv_short_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sU(SHORT, ULONG, short, unsigned long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4508,7 +4508,7 @@ H5T_conv_ushort_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uS(USHORT, LONG, unsigned short, long, LONG_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4541,7 +4541,7 @@ H5T_conv_ushort_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uU(USHORT, ULONG, unsigned short, unsigned long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4574,7 +4574,7 @@ H5T_conv_short_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sS(SHORT, LLONG, short, long_long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4607,7 +4607,7 @@ H5T_conv_short_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sU(SHORT, ULLONG, short, unsigned long_long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4640,7 +4640,7 @@ H5T_conv_ushort_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uS(USHORT, LLONG, unsigned short, long_long, LLONG_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4673,7 +4673,7 @@ H5T_conv_ushort_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uU(USHORT, ULLONG, unsigned short, unsigned long_long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4706,7 +4706,7 @@ H5T_conv_int_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Ss(INT, SCHAR, int, signed char, SCHAR_MIN, SCHAR_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4739,7 +4739,7 @@ H5T_conv_int_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Su(INT, UCHAR, int, unsigned char, UCHAR_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4772,7 +4772,7 @@ H5T_conv_uint_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Us(UINT, SCHAR, unsigned, signed char, SCHAR_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4805,7 +4805,7 @@ H5T_conv_uint_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Uu(UINT, UCHAR, unsigned, unsigned char, UCHAR_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4838,7 +4838,7 @@ H5T_conv_int_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Ss(INT, SHORT, int, short, SHRT_MIN, SHRT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4871,7 +4871,7 @@ H5T_conv_int_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Su(INT, USHORT, int, unsigned short, USHRT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4904,7 +4904,7 @@ H5T_conv_uint_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Us(UINT, SHORT, unsigned, short, SHRT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4937,7 +4937,7 @@ H5T_conv_uint_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Uu(UINT, USHORT, unsigned, unsigned short, USHRT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -4969,7 +4969,7 @@ H5T_conv_int_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_su(INT, UINT, int, unsigned);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5001,7 +5001,7 @@ H5T_conv_uint_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_us(UINT, INT, unsigned, int, INT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5033,7 +5033,7 @@ H5T_conv_int_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sS(INT, LONG, int, long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5065,7 +5065,7 @@ H5T_conv_int_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sU(INT, LONG, int, unsigned long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5097,7 +5097,7 @@ H5T_conv_uint_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uS(UINT, LONG, unsigned, long, LONG_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5129,7 +5129,7 @@ H5T_conv_uint_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uU(UINT, ULONG, unsigned, unsigned long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5161,7 +5161,7 @@ H5T_conv_int_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sS(INT, LLONG, int, long_long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5193,7 +5193,7 @@ H5T_conv_int_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sU(INT, ULLONG, int, unsigned long_long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5225,7 +5225,7 @@ H5T_conv_uint_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uS(UINT, LLONG, unsigned, long_long, LLONG_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5258,7 +5258,7 @@ H5T_conv_uint_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uU(UINT, ULLONG, unsigned, unsigned long_long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5290,7 +5290,7 @@ H5T_conv_long_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Ss(LONG, SCHAR, long, signed char, SCHAR_MIN, SCHAR_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5322,7 +5322,7 @@ H5T_conv_long_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Su(LONG, UCHAR, long, unsigned char, UCHAR_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5355,7 +5355,7 @@ H5T_conv_ulong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Us(ULONG, SCHAR, unsigned long, signed char, SCHAR_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5388,7 +5388,7 @@ H5T_conv_ulong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Uu(ULONG, UCHAR, unsigned long, unsigned char, UCHAR_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5420,7 +5420,7 @@ H5T_conv_long_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Ss(LONG, SHORT, long, short, SHRT_MIN, SHRT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5453,7 +5453,7 @@ H5T_conv_long_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Su(LONG, USHORT, long, unsigned short, USHRT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5485,7 +5485,7 @@ H5T_conv_ulong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Us(ULONG, SHORT, unsigned long, short, SHRT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5518,7 +5518,7 @@ H5T_conv_ulong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Uu(ULONG, USHORT, unsigned long, unsigned short, USHRT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5550,7 +5550,7 @@ H5T_conv_long_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Ss(LONG, INT, long, int, INT_MIN, INT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5582,7 +5582,7 @@ H5T_conv_long_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Su(LONG, UINT, long, unsigned, UINT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5614,7 +5614,7 @@ H5T_conv_ulong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Us(ULONG, INT, unsigned long, int, INT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5646,7 +5646,7 @@ H5T_conv_ulong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Uu(ULONG, UINT, unsigned long, unsigned, UINT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5678,7 +5678,7 @@ H5T_conv_long_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_su(LONG, ULONG, long, unsigned long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5710,7 +5710,7 @@ H5T_conv_ulong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_us(ULONG, LONG, unsigned long, long, LONG_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5742,7 +5742,7 @@ H5T_conv_long_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sS(LONG, LLONG, long, long_long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5775,7 +5775,7 @@ H5T_conv_long_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_sU(LONG, ULLONG, long, unsigned long_long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5808,7 +5808,7 @@ H5T_conv_ulong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uS(ULONG, LLONG, unsigned long, long_long, LLONG_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5841,7 +5841,7 @@ H5T_conv_ulong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_uU(ULONG, ULLONG, unsigned long, unsigned long_long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5874,7 +5874,7 @@ H5T_conv_llong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Ss(LLONG, SCHAR, long_long, signed char, SCHAR_MIN, SCHAR_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5907,7 +5907,7 @@ H5T_conv_llong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Su(LLONG, UCHAR, long_long, unsigned char, UCHAR_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5940,7 +5940,7 @@ H5T_conv_ullong_schar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Us(ULLONG, SCHAR, unsigned long_long, signed char, SCHAR_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -5973,7 +5973,7 @@ H5T_conv_ullong_uchar(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Uu(ULLONG, UCHAR, unsigned long_long, unsigned char, UCHAR_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6006,7 +6006,7 @@ H5T_conv_llong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Ss(LLONG, SHORT, long_long, short, SHRT_MIN, SHRT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6039,7 +6039,7 @@ H5T_conv_llong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Su(LLONG, USHORT, long_long, unsigned short, USHRT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6072,7 +6072,7 @@ H5T_conv_ullong_short(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Us(ULLONG, SHORT, unsigned long_long, short, SHRT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6105,7 +6105,7 @@ H5T_conv_ullong_ushort(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Uu(ULLONG, USHORT, unsigned long_long, unsigned short, USHRT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6137,7 +6137,7 @@ H5T_conv_llong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Ss(LLONG, INT, long_long, int, INT_MIN, INT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6169,7 +6169,7 @@ H5T_conv_llong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Su(LLONG, UINT, long_long, unsigned, UINT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6201,7 +6201,7 @@ H5T_conv_ullong_int(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Us(ULLONG, INT, unsigned long_long, int, INT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6234,7 +6234,7 @@ H5T_conv_ullong_uint(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Uu(ULLONG, UINT, unsigned long_long, unsigned, UINT_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6266,7 +6266,7 @@ H5T_conv_llong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Ss(LLONG, LONG, long_long, long, LONG_MIN, LONG_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6299,7 +6299,7 @@ H5T_conv_llong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Su(LLONG, ULONG, long_long, unsigned long, ULONG_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6332,7 +6332,7 @@ H5T_conv_ullong_long(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Us(ULLONG, LONG, unsigned long_long, long, LONG_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6365,7 +6365,7 @@ H5T_conv_ullong_ulong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_Uu(ULLONG, ULONG, unsigned long_long, unsigned long, ULONG_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6398,7 +6398,7 @@ H5T_conv_llong_ullong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_su(LLONG, ULLONG, long_long, unsigned long_long);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6431,7 +6431,7 @@ H5T_conv_ullong_llong(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
H5T_CONV_us(ULLONG, LLONG, unsigned long_long, long_long, LLONG_MAX);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6548,7 +6548,7 @@ H5T_conv_float_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -6676,7 +6676,7 @@ H5T_conv_double_float (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -7067,5 +7067,5 @@ H5T_conv_i32le_f64le (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata,
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Tvlen.c b/src/H5Tvlen.c
index 145fc3b..42e249a 100644
--- a/src/H5Tvlen.c
+++ b/src/H5Tvlen.c
@@ -127,7 +127,7 @@ H5T_vlen_set_loc(H5T_t *dt, H5F_t *f, H5T_vlen_loc_t loc)
} /* end if */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_vlen_set_loc() */
@@ -160,7 +160,7 @@ H5T_vlen_seq_mem_getlen(H5F_t UNUSED *f, void *vl_addr)
ret_value=(hssize_t)vl->len;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_vlen_seq_mem_getlen() */
@@ -193,7 +193,7 @@ H5T_vlen_seq_mem_read(H5F_t UNUSED *f, void *vl_addr, void *buf, size_t len)
HDmemcpy(buf,vl->p,len);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_vlen_seq_mem_read() */
@@ -260,7 +260,7 @@ H5T_vlen_seq_mem_write(hid_t plist_id, H5F_t UNUSED *f, void *vl_addr, void *buf
H5_ASSIGN_OVERFLOW(vl->len,seq_len,hsize_t,size_t);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_vlen_seq_mem_write() */
@@ -294,7 +294,7 @@ H5T_vlen_str_mem_getlen(H5F_t UNUSED *f, void *vl_addr)
ret_value=(hssize_t)HDstrlen(s);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_vlen_str_mem_getlen() */
@@ -327,7 +327,7 @@ H5T_vlen_str_mem_read(H5F_t UNUSED *f, void *vl_addr, void *buf, size_t len)
HDmemcpy(buf,s,len);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_vlen_str_mem_read() */
@@ -385,7 +385,7 @@ H5T_vlen_str_mem_write(hid_t plist_id, H5F_t UNUSED *f, void *vl_addr, void *buf
(*s)[len]='\0';
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_vlen_str_mem_write() */
@@ -417,7 +417,7 @@ H5T_vlen_disk_getlen(H5F_t UNUSED *f, void *vl_addr)
UINT32DECODE(vl, ret_value);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_vlen_disk_getlen() */
@@ -465,7 +465,7 @@ H5T_vlen_disk_read(H5F_t *f, void *vl_addr, void *buf, size_t UNUSED len)
} /* end if */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_vlen_disk_read() */
@@ -541,7 +541,7 @@ H5T_vlen_disk_write(hid_t UNUSED plist_id, H5F_t *f, void *vl_addr, void *buf, v
INT32ENCODE(vl,hobjid.idx);
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_vlen_disk_write() */
@@ -651,7 +651,7 @@ H5T_vlen_reclaim_recurse(void *elem, H5T_t *dt, H5MM_free_t free_func, void *fre
} /* end switch */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_vlen_reclaim_recurse() */
@@ -710,7 +710,7 @@ H5T_vlen_reclaim(void *elem, hid_t type_id, hsize_t UNUSED ndim, hssize_t UNUSED
ret_value=H5T_vlen_reclaim_recurse(elem,dt,free_func,free_info);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_vlen_reclaim() */
@@ -835,6 +835,6 @@ H5T_vlen_mark(H5T_t *dt, H5F_t *f, H5T_vlen_loc_t loc)
} /* end switch */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5T_vlen_mark() */
diff --git a/src/H5V.c b/src/H5V.c
index 0f90860..a4b5ce3 100644
--- a/src/H5V.c
+++ b/src/H5V.c
@@ -63,7 +63,7 @@ H5V_stride_optimize1(unsigned *np/*in,out*/, hsize_t *elmt_size/*in,out*/,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -205,7 +205,7 @@ H5V_stride_optimize2(unsigned *np/*in,out*/, hsize_t *elmt_size/*in,out*/,
} /* end switch */
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -322,7 +322,7 @@ H5V_hyper_stride(unsigned n, const hsize_t *size,
ret_value=skip;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -375,7 +375,7 @@ H5V_hyper_eq(int n,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -427,7 +427,7 @@ H5V_hyper_disjointp(unsigned n,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -493,7 +493,7 @@ H5V_hyper_fill(unsigned n, const hsize_t *_size,
fill_value);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -694,7 +694,7 @@ H5V_hyper_copy(unsigned n, const hsize_t *_size,
dst_stride, dst+dst_start, src_stride, src+src_start);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -746,7 +746,7 @@ H5V_stride_fill(unsigned n, hsize_t elmt_size, const hsize_t *size,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -814,7 +814,7 @@ H5V_stride_copy(unsigned n, hsize_t elmt_size, const hsize_t *size,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*-------------------------------------------------------------------------
@@ -886,7 +886,7 @@ H5V_stride_copy2(hsize_t nelmts, hsize_t elmt_size,
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*-------------------------------------------------------------------------
@@ -943,7 +943,7 @@ H5V_array_fill(void *_dst, const void *src, size_t size, size_t count)
HDmemcpy(dst, _dst, items_left * size);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* H5V_array_fill() */
@@ -991,6 +991,6 @@ H5V_array_offset(unsigned n, const hsize_t *total_size, const hssize_t *offset)
ret_value=skip;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5V_array_offset() */
diff --git a/src/H5Vprivate.h b/src/H5Vprivate.h
index 4fab3ba..4d2065e 100644
--- a/src/H5Vprivate.h
+++ b/src/H5Vprivate.h
@@ -107,7 +107,7 @@ H5V_vector_reduce_product(unsigned n, const hsize_t *v)
while (n--) ret_value *= *v++;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*-------------------------------------------------------------------------
@@ -142,7 +142,7 @@ H5V_vector_zerop_u(int n, const hsize_t *v)
HGOTO_DONE(FALSE);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*-------------------------------------------------------------------------
@@ -177,7 +177,7 @@ H5V_vector_zerop_s(int n, const hssize_t *v)
HGOTO_DONE(FALSE);
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
/*-------------------------------------------------------------------------
@@ -216,7 +216,7 @@ H5V_vector_cmp_u (int n, const hsize_t *v1, const hsize_t *v2)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -256,7 +256,7 @@ H5V_vector_cmp_s (unsigned n, const hssize_t *v1, const hssize_t *v2)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Z.c b/src/H5Z.c
index 9c240c3..77ca9b6 100644
--- a/src/H5Z.c
+++ b/src/H5Z.c
@@ -53,7 +53,7 @@ H5Z_init_interface (void)
H5Z_register (H5Z_FILTER_SHUFFLE, "shuffle", H5Z_filter_shuffle);
#endif /* H5_HAVE_FILTER_SHUFFLE */
- FUNC_LEAVE (SUCCEED);
+ FUNC_LEAVE_NOAPI(SUCCEED);
}
@@ -177,7 +177,7 @@ H5Zregister(H5Z_filter_t id, const char *comment, H5Z_func_t func)
HGOTO_ERROR (H5E_PLINE, H5E_CANTINIT, FAIL, "unable to register filter");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
}
@@ -235,7 +235,7 @@ H5Z_register (H5Z_filter_t id, const char *comment, H5Z_func_t func)
}
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -272,7 +272,7 @@ H5Zunregister(H5Z_filter_t id)
HGOTO_ERROR (H5E_PLINE, H5E_CANTINIT, FAIL, "unable to unregister filter");
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Zunregister() */
@@ -316,7 +316,7 @@ H5Z_unregister (H5Z_filter_t id)
H5Z_table_used_g--;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
} /* end H5Z_unregister() */
@@ -355,7 +355,7 @@ H5Zfilter_avail(H5Z_filter_t id)
} /* end if */
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_API(ret_value);
} /* end H5Zfilter_avail() */
@@ -423,7 +423,7 @@ H5Z_append(H5O_pline_t *pline, H5Z_filter_t filter, unsigned flags,
pline->nfilters++;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -458,7 +458,7 @@ H5Z_find(H5Z_filter_t id)
}
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
@@ -586,6 +586,6 @@ H5Z_pipeline(H5F_t UNUSED *f, const H5O_pline_t *pline, unsigned flags,
*filter_mask = failed;
done:
- FUNC_LEAVE(ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
diff --git a/src/H5Zdeflate.c b/src/H5Zdeflate.c
index 09cd7a0..3c91836 100644
--- a/src/H5Zdeflate.c
+++ b/src/H5Zdeflate.c
@@ -127,7 +127,7 @@ H5Z_filter_deflate (unsigned flags, size_t cd_nelmts,
done:
if(outbuf)
H5MM_xfree(outbuf);
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
#endif /* H5_HAVE_FILTER_DEFLATE */
diff --git a/src/H5Zshuffle.c b/src/H5Zshuffle.c
index ffd676f..f25b5ff 100644
--- a/src/H5Zshuffle.c
+++ b/src/H5Zshuffle.c
@@ -109,6 +109,6 @@ H5Z_filter_shuffle(unsigned flags, size_t cd_nelmts,
ret_value = nbytes;
done:
- FUNC_LEAVE (ret_value);
+ FUNC_LEAVE_NOAPI(ret_value);
}
#endif /*H5_HAVE_FILTER_SHUFFLE */
diff --git a/src/H5detect.c b/src/H5detect.c
index 39ee57b..e43ac44 100644
--- a/src/H5detect.c
+++ b/src/H5detect.c
@@ -473,7 +473,7 @@ H5TN_term_interface(void)\n\
interface_initialize_g = 0;\n\
FUNC_ENTER_NOINIT(H5TN_term_interface);\n\
\n\
- FUNC_LEAVE(0);\n\
+ FUNC_LEAVE_NOAPI(0);\n\
}\n");
/* The interface initialization function */
@@ -568,7 +568,7 @@ done:\n\
H5FL_FREE(H5T_t,dt);\n\
}\n\
\n\
- FUNC_LEAVE (ret_value);\n}\n");
+ FUNC_LEAVE_NOAPI(ret_value);\n}\n");
}
diff --git a/src/H5private.h b/src/H5private.h
index 379707d..dc4e110 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -1084,27 +1084,34 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */
#define FUNC_ENTER_COMMON(func_name,asrt) \
CONSTR (FUNC, #func_name); \
- MPE_LOG_VARS(func_name) \
PABLO_SAVE (ID_ ## func_name) \
- H5TRACE_DECL; \
\
/* Check API status */ \
assert(asrt); \
\
/* Start tracing */ \
- PABLO_TRACE_ON (PABLO_MASK, pablo_func_id); \
- \
+ PABLO_TRACE_ON (PABLO_MASK, pablo_func_id)
+
+/* Threadsafety initialization code for API routines */
+#define FUNC_ENTER_API_THREADSAFE \
/* Initialize the thread-safe code */ \
H5_FIRST_THREAD_INIT; \
\
/* Grab the mutex for the library */ \
H5_API_UNSET_CANCEL \
- H5_API_LOCK
+ H5_API_LOCK
+
+/* Local variables for API routines */
+#define FUNC_ENTER_API_VARS \
+ MPE_LOG_VARS(func_name) \
+ H5TRACE_DECL
/* Use this macro for all "normal" API functions */
#define FUNC_ENTER_API(func_name,err) { \
+ FUNC_ENTER_API_VARS; \
FUNC_ENTER_COMMON(func_name,H5_IS_API(FUNC)); \
- FUNC_ENTER_API_COMMON(func_name,INTERFACE_INIT,err); \
+ FUNC_ENTER_API_THREADSAFE; \
+ FUNC_ENTER_API_COMMON(func_name,INTERFACE_INIT,err); \
/* Clear thread error stack entering public functions */ \
H5E_clear(); \
{
@@ -1114,8 +1121,10 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */
* like H5Eprint and H5Ewalk.
*/
#define FUNC_ENTER_API_NOCLEAR(func_name,err) { \
+ FUNC_ENTER_API_VARS; \
FUNC_ENTER_COMMON(func_name,H5_IS_API(FUNC)); \
- FUNC_ENTER_API_COMMON(func_name,INTERFACE_INIT,err); \
+ FUNC_ENTER_API_THREADSAFE; \
+ FUNC_ENTER_API_COMMON(func_name,INTERFACE_INIT,err); \
{
/*
@@ -1124,7 +1133,9 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */
* are: H5close, H5check_version, H5Eget_major, H5Eget_minor.
*/
#define FUNC_ENTER_API_NOINIT(func_name) { \
+ FUNC_ENTER_API_VARS; \
FUNC_ENTER_COMMON(func_name,H5_IS_API(FUNC)); \
+ FUNC_ENTER_API_THREADSAFE; \
BEGIN_MPE_LOG(func_name); \
{
@@ -1195,9 +1206,25 @@ extern hbool_t H5_MPEinit_g; /* Has the MPE Library been initialized? */
*
*-------------------------------------------------------------------------
*/
-#define FUNC_LEAVE(return_value) \
- MPE_LOG_VARS_USE(func_name); \
- HRETURN(return_value) \
+#define FUNC_LEAVE_API(ret_value) \
+ FINISH_MPE_LOG; \
+ PABLO_TRACE_OFF (PABLO_MASK, pablo_func_id); \
+ H5TRACE_RETURN(ret_value); \
+ H5_API_UNLOCK \
+ H5_API_SET_CANCEL \
+ return (ret_value); \
+ } /*end scope from end of FUNC_ENTER*/ \
+} /*end scope from beginning of FUNC_ENTER*/
+
+#define FUNC_LEAVE_NOAPI(ret_value) \
+ PABLO_TRACE_OFF (PABLO_MASK, pablo_func_id); \
+ return (ret_value); \
+ } /*end scope from end of FUNC_ENTER*/ \
+} /*end scope from beginning of FUNC_ENTER*/
+
+#define FUNC_LEAVE_NOAPI_VOID \
+ PABLO_TRACE_OFF (PABLO_MASK, pablo_func_id); \
+ return; \
} /*end scope from end of FUNC_ENTER*/ \
} /*end scope from beginning of FUNC_ENTER*/
diff --git a/src/Makefile.in b/src/Makefile.in
index 76b7152..cb9927b 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -31,8 +31,8 @@ CLEAN=libhdf5.settings
LIB_SRC=H5.c H5A.c H5AC.c H5B.c H5D.c H5E.c H5F.c H5Farray.c H5Fcontig.c \
H5Fcompact.c H5Fistore.c H5Fseq.c H5FD.c H5FDcore.c H5FDfamily.c \
H5FDgass.c H5FDlog.c H5FDmpio.c H5FDmpiposix.c H5FDmulti.c H5FDsec2.c \
- H5FDsrb.c H5FDstdio.c H5FDstream.c H5FL.c H5FP.c H5FPclient.c \
- H5FO.c H5FPserver.c H5G.c H5Gent.c H5Gnode.c H5Gstab.c H5HG.c H5HL.c \
+ H5FDsrb.c H5FDstdio.c H5FDstream.c H5FL.c H5FO.c H5FP.c H5FPclient.c \
+ H5FPserver.c H5G.c H5Gent.c H5Gnode.c H5Gstab.c H5HG.c H5HL.c \
H5I.c H5MF.c H5MM.c H5O.c H5Oattr.c H5Ocont.c H5Odtype.c H5Oefl.c \
H5Ofill.c H5Ofphdf5.c H5Olayout.c H5Omtime.c H5Oname.c H5Onull.c \
H5Opline.c H5Oplist.c H5Osdspace.c H5Oshared.c H5Ostab.c H5P.c \