From de68c607843fbfa55f94a661cf8cf58ad09adc0c Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 8 Apr 2008 11:09:17 -0500 Subject: [svn-r14811] Description: Add "_META" suffix to FUNC_ENTER/FUNC_LEAVE API routines that can modify metadata in the file. This will give us a single place to change to recording the beginning & ending of transactions. Tested on: FreeBSD/32 6.2 (duty) Too simple to require h5committest --- src/H5A.c | 36 ++++++++++++++++++------------------ src/H5Adeprec.c | 4 ++-- src/H5D.c | 16 ++++++++-------- src/H5Ddeprec.c | 8 ++++---- src/H5Dio.c | 4 ++-- src/H5F.c | 20 ++++++++++---------- src/H5Fmount.c | 8 ++++---- src/H5G.c | 12 ++++++------ src/H5Gdeprec.c | 28 ++++++++++++++-------------- src/H5I.c | 8 ++++---- src/H5L.c | 28 ++++++++++++++-------------- src/H5Lexternal.c | 4 ++-- src/H5O.c | 24 ++++++++++++------------ src/H5Ocopy.c | 4 ++-- src/H5R.c | 4 ++-- src/H5T.c | 4 ++-- src/H5Tcommit.c | 8 ++++---- src/H5Tdeprec.c | 4 ++-- src/H5private.h | 29 +++++++++++++++++++++-------- 19 files changed, 133 insertions(+), 120 deletions(-) diff --git a/src/H5A.c b/src/H5A.c index daca5ef..29aa2a2 100644 --- a/src/H5A.c +++ b/src/H5A.c @@ -222,7 +222,7 @@ H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, H5S_t *space; /* Dataspace to use for attribute */ hid_t ret_value; /* Return value */ - FUNC_ENTER_API(H5Acreate2, FAIL) + FUNC_ENTER_API_META(H5Acreate2, FAIL) H5TRACE6("i", "i*siiii", loc_id, attr_name, type_id, space_id, acpl_id, aapl_id); /* check arguments */ @@ -244,7 +244,7 @@ H5Acreate2(hid_t loc_id, const char *attr_name, hid_t type_id, hid_t space_id, HGOTO_ERROR(H5E_ATTR, H5E_CANTINIT, FAIL, "unable to create attribute") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* H5Acreate2() */ @@ -293,7 +293,7 @@ H5Acreate_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, H5S_t *space; /* Dataspace to use for attribute */ hid_t ret_value; /* Return value */ - FUNC_ENTER_API(H5Acreate_by_name, FAIL) + FUNC_ENTER_API_META(H5Acreate_by_name, FAIL) H5TRACE8("i", "i*s*siiiii", loc_id, obj_name, attr_name, type_id, space_id, acpl_id, aapl_id, lapl_id); @@ -332,7 +332,7 @@ done: if(loc_found && H5G_loc_free(&obj_loc) < 0) HDONE_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't free location") - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* H5Acreate_by_name() */ @@ -904,7 +904,7 @@ H5Awrite(hid_t attr_id, hid_t dtype_id, const void *buf) const H5T_t *mem_type = NULL; herr_t ret_value; - FUNC_ENTER_API(H5Awrite, FAIL) + FUNC_ENTER_API_META(H5Awrite, FAIL) H5TRACE3("e", "ii*x", attr_id, dtype_id, buf); /* check arguments */ @@ -920,7 +920,7 @@ H5Awrite(hid_t attr_id, hid_t dtype_id, const void *buf) HGOTO_ERROR(H5E_ATTR, H5E_WRITEERROR, FAIL, "unable to write attribute") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* H5Awrite() */ @@ -1724,7 +1724,7 @@ H5Arename(hid_t loc_id, const char *old_name, const char *new_name) H5G_loc_t loc; /* Object location */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Arename, FAIL) + FUNC_ENTER_API_META(H5Arename, FAIL) H5TRACE3("e", "i*s*s", loc_id, old_name, new_name); /* check arguments */ @@ -1742,7 +1742,7 @@ H5Arename(hid_t loc_id, const char *old_name, const char *new_name) HGOTO_ERROR(H5E_ATTR, H5E_CANTRENAME, FAIL, "can't rename attribute") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* H5Arename() */ @@ -1770,7 +1770,7 @@ H5Arename_by_name(hid_t loc_id, const char *obj_name, const char *old_attr_name, hbool_t loc_found = FALSE; /* Entry at 'obj_name' found */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Arename_by_name, FAIL) + FUNC_ENTER_API_META(H5Arename_by_name, FAIL) H5TRACE5("e", "i*s*s*si", loc_id, obj_name, old_attr_name, new_attr_name, lapl_id); @@ -1813,7 +1813,7 @@ done: if(loc_found && H5G_loc_free(&obj_loc) < 0) HDONE_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't free location") - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* H5Arename_by_name() */ @@ -2036,7 +2036,7 @@ H5Adelete(hid_t loc_id, const char *name) H5G_loc_t loc; /* Object location */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Adelete, FAIL) + FUNC_ENTER_API_META(H5Adelete, FAIL) H5TRACE2("e", "i*s", loc_id, name); /* check arguments */ @@ -2052,7 +2052,7 @@ H5Adelete(hid_t loc_id, const char *name) HGOTO_ERROR(H5E_ATTR, H5E_CANTDELETE, FAIL, "unable to delete attribute") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* H5Adelete() */ @@ -2083,7 +2083,7 @@ H5Adelete_by_name(hid_t loc_id, const char *obj_name, const char *attr_name, hbool_t loc_found = FALSE; /* Entry at 'obj_name' found */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Adelete_by_name, FAIL) + FUNC_ENTER_API_META(H5Adelete_by_name, FAIL) H5TRACE4("e", "i*s*si", loc_id, obj_name, attr_name, lapl_id); /* check arguments */ @@ -2120,7 +2120,7 @@ done: if(loc_found && H5G_loc_free(&obj_loc) < 0) HDONE_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't free location") - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* H5Adelete_by_name() */ @@ -2159,7 +2159,7 @@ H5Adelete_by_idx(hid_t loc_id, const char *obj_name, H5_index_t idx_type, hbool_t loc_found = FALSE; /* Entry at 'obj_name' found */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Adelete_by_idx, FAIL) + FUNC_ENTER_API_META(H5Adelete_by_idx, FAIL) H5TRACE6("e", "i*sIiIohi", loc_id, obj_name, idx_type, order, n, lapl_id); /* check arguments */ @@ -2198,7 +2198,7 @@ done: if(loc_found && H5G_loc_free(&obj_loc) < 0) HDONE_ERROR(H5E_ATTR, H5E_CANTRELEASE, FAIL, "can't free location") - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* H5Adelete_by_idx() */ @@ -2222,7 +2222,7 @@ H5Aclose(hid_t attr_id) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Aclose, FAIL) + FUNC_ENTER_API_META(H5Aclose, FAIL) H5TRACE1("e", "i", attr_id); /* check arguments */ @@ -2234,7 +2234,7 @@ H5Aclose(hid_t attr_id) HGOTO_ERROR(H5E_ATTR, H5E_CANTDEC, FAIL, "can't close attribute") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* H5Aclose() */ diff --git a/src/H5Adeprec.c b/src/H5Adeprec.c index 9f888c8..1e22493 100644 --- a/src/H5Adeprec.c +++ b/src/H5Adeprec.c @@ -143,7 +143,7 @@ H5Acreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, H5S_t *space; /* Dataspace to use for attribute */ hid_t ret_value; /* Return value */ - FUNC_ENTER_API(H5Acreate1, FAIL) + FUNC_ENTER_API_META(H5Acreate1, FAIL) H5TRACE5("i", "i*siii", loc_id, name, type_id, space_id, plist_id); /* check arguments */ @@ -165,7 +165,7 @@ H5Acreate1(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_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* H5Acreate1() */ diff --git a/src/H5D.c b/src/H5D.c index 81872c5..684ccf4 100644 --- a/src/H5D.c +++ b/src/H5D.c @@ -133,7 +133,7 @@ H5Dcreate2(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, const H5S_t *space; /* Dataspace for dataset */ hid_t ret_value; /* Return value */ - FUNC_ENTER_API(H5Dcreate2, FAIL) + FUNC_ENTER_API_META(H5Dcreate2, FAIL) H5TRACE7("i", "i*siiiii", loc_id, name, type_id, space_id, lcpl_id, dcpl_id, dapl_id); @@ -178,7 +178,7 @@ done: if(dset && H5D_close(dset) < 0) HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataset") - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Dcreate2() */ @@ -226,7 +226,7 @@ H5Dcreate_anon(hid_t loc_id, hid_t type_id, hid_t space_id, hid_t dcpl_id, const H5S_t *space; /* Dataspace for dataset */ hid_t ret_value; /* Return value */ - FUNC_ENTER_API(H5Dcreate_anon, FAIL) + FUNC_ENTER_API_META(H5Dcreate_anon, FAIL) H5TRACE5("i", "iiiii", loc_id, type_id, space_id, dcpl_id, dapl_id); /* Check arguments */ @@ -262,7 +262,7 @@ done: if(dset && H5D_close(dset) < 0) HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataset") - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Dcreate_anon() */ @@ -372,7 +372,7 @@ H5Dclose(hid_t dset_id) H5D_t *dset; /* Dataset object to release */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Dclose, FAIL) + FUNC_ENTER_API_META(H5Dclose, FAIL) H5TRACE1("e", "i", dset_id); /* Check args */ @@ -387,7 +387,7 @@ H5Dclose(hid_t dset_id) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "can't free") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Dclose() */ @@ -994,7 +994,7 @@ H5Dset_extent(hid_t dset_id, const hsize_t *size) H5D_t *dset; /* Dataset for this operation */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Dset_extent, FAIL) + FUNC_ENTER_API_META(H5Dset_extent, FAIL) H5TRACE2("e", "i*h", dset_id, size); /* Check args */ @@ -1008,6 +1008,6 @@ 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_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Dset_extent() */ diff --git a/src/H5Ddeprec.c b/src/H5Ddeprec.c index f0d7487..7d6cc02 100644 --- a/src/H5Ddeprec.c +++ b/src/H5Ddeprec.c @@ -147,7 +147,7 @@ H5Dcreate1(hid_t loc_id, const char *name, hid_t type_id, hid_t space_id, const H5S_t *space; /* Dataspace for dataset */ hid_t ret_value; /* Return value */ - FUNC_ENTER_API(H5Dcreate1, FAIL) + FUNC_ENTER_API_META(H5Dcreate1, FAIL) H5TRACE5("i", "i*siii", loc_id, name, type_id, space_id, dcpl_id); /* Check arguments */ @@ -179,7 +179,7 @@ done: if(dset && H5D_close(dset) < 0) HDONE_ERROR(H5E_DATASET, H5E_CLOSEERROR, FAIL, "unable to release dataset") - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Dcreate1() */ @@ -284,7 +284,7 @@ H5Dextend(hid_t dset_id, const hsize_t *size) H5D_t *dset; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Dextend, FAIL) + FUNC_ENTER_API_META(H5Dextend, FAIL) H5TRACE2("e", "i*h", dset_id, size); /* Check args */ @@ -298,7 +298,7 @@ H5Dextend(hid_t dset_id, const hsize_t *size) HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL, "unable to extend dataset") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Dextend() */ diff --git a/src/H5Dio.c b/src/H5Dio.c index 66ccd66..a3148c8 100644 --- a/src/H5Dio.c +++ b/src/H5Dio.c @@ -388,7 +388,7 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id, char fake_char; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Dwrite, FAIL) + FUNC_ENTER_API_META(H5Dwrite, FAIL) H5TRACE6("e", "iiiii*x", dset_id, mem_type_id, mem_space_id, file_space_id, plist_id, buf); @@ -435,7 +435,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_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } diff --git a/src/H5F.c b/src/H5F.c index 0f70009..4bac4a7 100644 --- a/src/H5F.c +++ b/src/H5F.c @@ -1432,7 +1432,7 @@ H5Fcreate(const char *filename, unsigned flags, hid_t fcpl_id, hid_t fapl_id) H5F_t *new_file = NULL; /*file struct for new file */ hid_t ret_value; /*return value */ - FUNC_ENTER_API(H5Fcreate, FAIL) + FUNC_ENTER_API_META(H5Fcreate, FAIL) H5TRACE4("i", "*sIuii", filename, flags, fcpl_id, fapl_id); /* Check/fix arguments */ @@ -1484,7 +1484,7 @@ done: if(H5F_close(new_file) < 0) HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "problems closing file") - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Fcreate() */ @@ -1534,7 +1534,7 @@ H5Fopen(const char *filename, unsigned flags, hid_t fapl_id) H5F_t *new_file = NULL; /*file struct for new file */ hid_t ret_value; /*return value */ - FUNC_ENTER_API(H5Fopen, FAIL) + FUNC_ENTER_API_META(H5Fopen, FAIL) H5TRACE3("i", "*sIui", filename, flags, fapl_id); /* Check/fix arguments. */ @@ -1564,7 +1564,7 @@ done: if(ret_value < 0 && new_file && H5F_try_close(new_file) < 0) HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "problems closing file") - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Fopen() */ @@ -1601,7 +1601,7 @@ H5Fflush(hid_t object_id, H5F_scope_t scope) H5O_loc_t *oloc = NULL; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Fflush, FAIL) + FUNC_ENTER_API_META(H5Fflush, FAIL) H5TRACE2("e", "iFs", object_id, scope); switch(H5I_get_type(object_id)) { @@ -1651,7 +1651,7 @@ H5Fflush(hid_t object_id, H5F_scope_t scope) HGOTO_ERROR(H5E_FILE, H5E_CANTINIT, FAIL, "flush failed") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Fflush() */ @@ -2011,7 +2011,7 @@ H5Fclose(hid_t file_id) { herr_t ret_value = SUCCEED; - FUNC_ENTER_API(H5Fclose, FAIL) + FUNC_ENTER_API_META(H5Fclose, FAIL) H5TRACE1("e", "i", file_id); /* Check/fix arguments. */ @@ -2026,7 +2026,7 @@ H5Fclose(hid_t file_id) HGOTO_ERROR(H5E_ATOM, H5E_CANTCLOSEFILE, FAIL, "decrementing file ID failed") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Fclose() */ @@ -2059,7 +2059,7 @@ H5Freopen(hid_t file_id) H5F_t *new_file = NULL; hid_t ret_value; - FUNC_ENTER_API(H5Freopen, FAIL) + FUNC_ENTER_API_META(H5Freopen, FAIL) H5TRACE1("i", "i", file_id); /* Check arguments */ @@ -2087,7 +2087,7 @@ done: if(H5F_dest(new_file, H5AC_dxpl_id) < 0) HDONE_ERROR(H5E_FILE, H5E_CANTCLOSEFILE, FAIL, "can't close file") - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Freopen() */ diff --git a/src/H5Fmount.c b/src/H5Fmount.c index 470d323..92882ae 100644 --- a/src/H5Fmount.c +++ b/src/H5Fmount.c @@ -482,7 +482,7 @@ H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id) H5F_t *child = NULL; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Fmount, FAIL) + FUNC_ENTER_API_META(H5Fmount, FAIL) H5TRACE4("e", "i*sii", loc_id, name, child_id, plist_id); /* Check arguments */ @@ -503,7 +503,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_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Fmount() */ @@ -532,7 +532,7 @@ H5Funmount(hid_t loc_id, const char *name) H5G_loc_t loc; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Funmount, FAIL) + FUNC_ENTER_API_META(H5Funmount, FAIL) H5TRACE2("e", "i*s", loc_id, name); /* Check args */ @@ -546,7 +546,7 @@ H5Funmount(hid_t loc_id, const char *name) HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "unable to unmount file") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Funmount() */ diff --git a/src/H5G.c b/src/H5G.c index bca0332..8af54d9 100644 --- a/src/H5G.c +++ b/src/H5G.c @@ -146,7 +146,7 @@ H5Gcreate2(hid_t loc_id, const char *name, hid_t lcpl_id, hid_t gcpl_id, H5G_t *grp = NULL; /* New group created */ hid_t ret_value; /* Return value */ - FUNC_ENTER_API(H5Gcreate2, FAIL) + FUNC_ENTER_API_META(H5Gcreate2, FAIL) H5TRACE5("i", "i*siii", loc_id, name, lcpl_id, gcpl_id, gapl_id); /* Check arguments */ @@ -187,7 +187,7 @@ done: if(grp && H5G_close(grp) < 0) HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group") - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Gcreate2() */ @@ -286,7 +286,7 @@ H5Gcreate_anon(hid_t loc_id, hid_t gcpl_id, hid_t gapl_id) H5G_t *grp = NULL; hid_t ret_value; - FUNC_ENTER_API(H5Gcreate_anon, FAIL) + FUNC_ENTER_API_META(H5Gcreate_anon, FAIL) H5TRACE3("i", "iii", loc_id, gcpl_id, gapl_id); /* Check arguments */ @@ -318,7 +318,7 @@ done: if(grp && H5G_close(grp) < 0) HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group") - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Gcreate_anon() */ @@ -661,7 +661,7 @@ H5Gclose(hid_t group_id) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Gclose, FAIL) + FUNC_ENTER_API_META(H5Gclose, FAIL) H5TRACE1("e", "i", group_id); /* Check args */ @@ -676,7 +676,7 @@ H5Gclose(hid_t group_id) HGOTO_ERROR(H5E_SYM, H5E_CANTRELEASE, FAIL, "unable to close group") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Gclose() */ /* diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c index 52b607d..03a380b 100644 --- a/src/H5Gdeprec.c +++ b/src/H5Gdeprec.c @@ -203,7 +203,7 @@ H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint) hid_t tmp_gcpl = (-1); /* Temporary group creation property list */ hid_t ret_value; /* Return value */ - FUNC_ENTER_API(H5Gcreate1, FAIL) + FUNC_ENTER_API_META(H5Gcreate1, FAIL) H5TRACE3("i", "i*sz", loc_id, name, size_hint); /* Check arguments */ @@ -257,7 +257,7 @@ done: if(grp && H5G_close(grp) < 0) HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group") - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Gcreate1() */ @@ -325,7 +325,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Glink, FAIL) + FUNC_ENTER_API_META(H5Glink, FAIL) H5TRACE4("e", "iLl*s*s", cur_loc_id, type, cur_name, new_name); /* Check arguments */ @@ -353,7 +353,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Not a valid link type") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Glink() */ @@ -371,7 +371,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type, { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Glink2, FAIL) + FUNC_ENTER_API_META(H5Glink2, FAIL) H5TRACE5("e", "i*sLli*s", cur_loc_id, cur_name, type, new_loc_id, new_name); /* Check arguments */ @@ -404,7 +404,7 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type, HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "not a valid link type") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Glink2() */ @@ -474,7 +474,7 @@ H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Gmove, FAIL) + FUNC_ENTER_API_META(H5Gmove, FAIL) H5TRACE3("e", "i*s*s", src_loc_id, src_name, dst_name); /* Call common routine to move the link */ @@ -482,7 +482,7 @@ H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name) HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "couldn't move link") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Gmove() */ @@ -499,7 +499,7 @@ H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Gmove2, FAIL) + FUNC_ENTER_API_META(H5Gmove2, FAIL) H5TRACE4("e", "i*si*s", src_loc_id, src_name, dst_loc_id, dst_name); /* Call common routine to move the link */ @@ -507,7 +507,7 @@ H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "couldn't move link") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Gmove2() */ @@ -581,7 +581,7 @@ H5Gunlink(hid_t loc_id, const char *name) H5G_loc_t loc; /* Group's location */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Gunlink, FAIL) + FUNC_ENTER_API_META(H5Gunlink, FAIL) H5TRACE2("e", "i*s", loc_id, name); /* Check arguments */ @@ -595,7 +595,7 @@ H5Gunlink(hid_t loc_id, const char *name) HGOTO_ERROR(H5E_LINK, H5E_CANTDELETE, FAIL, "couldn't delete link") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Gunlink() */ @@ -654,7 +654,7 @@ H5Gset_comment(hid_t loc_id, const char *name, const char *comment) H5G_loc_t loc; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Gset_comment, FAIL) + FUNC_ENTER_API_META(H5Gset_comment, FAIL) H5TRACE3("e", "i*s*s", loc_id, name, comment); if(H5G_loc(loc_id, &loc) < 0) @@ -666,7 +666,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_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Gset_comment() */ diff --git a/src/H5I.c b/src/H5I.c index 2bba730..97e1f99 100644 --- a/src/H5I.c +++ b/src/H5I.c @@ -1261,7 +1261,7 @@ H5Idec_ref(hid_t id) { int ret_value; /* Return value */ - FUNC_ENTER_API(H5Idec_ref, FAIL); + FUNC_ENTER_API_META(H5Idec_ref, FAIL); H5TRACE1("Is", "i", id); /* Check arguments */ @@ -1273,7 +1273,7 @@ H5Idec_ref(hid_t id) HGOTO_ERROR (H5E_ATOM, H5E_CANTDEC, FAIL, "can't decrement ID ref count"); done: - FUNC_LEAVE_API(ret_value); + FUNC_LEAVE_API_META(ret_value); } /* end H5Idec_ref() */ @@ -1386,7 +1386,7 @@ H5Iinc_ref(hid_t id) { int ret_value; /* Return value */ - FUNC_ENTER_API(H5Iinc_ref, FAIL); + FUNC_ENTER_API_META(H5Iinc_ref, FAIL); H5TRACE1("Is", "i", id); /* Check arguments */ @@ -1398,7 +1398,7 @@ H5Iinc_ref(hid_t id) HGOTO_ERROR (H5E_ATOM, H5E_CANTINC, FAIL, "can't increment ID ref count"); done: - FUNC_LEAVE_API(ret_value); + FUNC_LEAVE_API_META(ret_value); } /* end H5Iinc_ref() */ diff --git a/src/H5L.c b/src/H5L.c index 020f7c2..d90bdcc 100644 --- a/src/H5L.c +++ b/src/H5L.c @@ -314,7 +314,7 @@ H5Lmove(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, H5G_loc_t dst_loc, *dst_loc_p; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Lmove, FAIL) + FUNC_ENTER_API_META(H5Lmove, FAIL) H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name, lcpl_id, lapl_id); @@ -346,7 +346,7 @@ H5Lmove(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Lmove() */ @@ -372,7 +372,7 @@ H5Lcopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, H5G_loc_t dst_loc, *dst_loc_p; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Lcopy, FAIL) + FUNC_ENTER_API_META(H5Lcopy, FAIL) H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name, lcpl_id, lapl_id); @@ -404,7 +404,7 @@ H5Lcopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, HGOTO_ERROR(H5E_LINK, H5E_CANTMOVE, FAIL, "unable to move link") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Lcopy() */ @@ -433,7 +433,7 @@ H5Lcreate_soft(const char *link_target, H5G_loc_t link_loc; /* Group location for new link */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Lcreate_soft, FAIL) + FUNC_ENTER_API_META(H5Lcreate_soft, FAIL) H5TRACE5("e", "*si*sii", link_target, link_loc_id, link_name, lcpl_id, lapl_id); /* Check arguments */ @@ -451,7 +451,7 @@ H5Lcreate_soft(const char *link_target, HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Lcreate_soft() */ @@ -479,7 +479,7 @@ H5Lcreate_hard(hid_t cur_loc_id, const char *cur_name, H5G_loc_t new_loc, *new_loc_p; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Lcreate_hard, FAIL) + FUNC_ENTER_API_META(H5Lcreate_hard, FAIL) H5TRACE6("e", "i*si*sii", cur_loc_id, cur_name, new_loc_id, new_name, lcpl_id, lapl_id); @@ -513,7 +513,7 @@ H5Lcreate_hard(hid_t cur_loc_id, const char *cur_name, HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Lcreate_hard() */ @@ -548,7 +548,7 @@ H5Lcreate_ud(hid_t link_loc_id, const char *link_name, H5L_type_t link_type, H5G_loc_t link_loc; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Lcreate_ud, FAIL) + FUNC_ENTER_API_META(H5Lcreate_ud, FAIL) H5TRACE7("e", "i*sLl*xzii", link_loc_id, link_name, link_type, udata, udata_size, lcpl_id, lapl_id); @@ -563,7 +563,7 @@ H5Lcreate_ud(hid_t link_loc_id, const char *link_name, H5L_type_t link_type, HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link") done: - FUNC_LEAVE_API(ret_value); + FUNC_LEAVE_API_META(ret_value); } /* end H5Lcreate_ud() */ @@ -590,7 +590,7 @@ H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id) H5G_loc_t loc; /* Group's location */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Ldelete, FAIL) + FUNC_ENTER_API_META(H5Ldelete, FAIL) H5TRACE3("e", "i*si", loc_id, name, lapl_id); /* Check arguments */ @@ -604,7 +604,7 @@ H5Ldelete(hid_t loc_id, const char *name, hid_t lapl_id) HGOTO_ERROR(H5E_LINK, H5E_CANTDELETE, FAIL, "unable to delete link") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Ldelete() */ @@ -635,7 +635,7 @@ H5Ldelete_by_idx(hid_t loc_id, const char *group_name, H5L_trav_rmbi_t udata; /* User data for callback */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Ldelete_by_idx, FAIL) + FUNC_ENTER_API_META(H5Ldelete_by_idx, FAIL) H5TRACE6("e", "i*sIiIohi", loc_id, group_name, idx_type, order, n, lapl_id); /* Check arguments */ @@ -664,7 +664,7 @@ H5Ldelete_by_idx(hid_t loc_id, const char *group_name, HGOTO_ERROR(H5E_SYM, H5E_EXISTS, FAIL, "name doesn't exist") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Ldelete_by_idx() */ diff --git a/src/H5Lexternal.c b/src/H5Lexternal.c index 5a8eb33..43751b3 100644 --- a/src/H5Lexternal.c +++ b/src/H5Lexternal.c @@ -311,7 +311,7 @@ H5Lcreate_external(const char *file_name, const char *obj_name, uint8_t *p; /* Pointer into external link buffer */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Lcreate_external, FAIL) + FUNC_ENTER_API_META(H5Lcreate_external, FAIL) H5TRACE6("e", "*s*si*sii", file_name, obj_name, link_loc_id, link_name, lcpl_id, lapl_id); @@ -345,7 +345,7 @@ done: if(ext_link_buf != NULL) H5MM_free(ext_link_buf); - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Lcreate_external() */ diff --git a/src/H5O.c b/src/H5O.c index 021b69e..9f666d0 100644 --- a/src/H5O.c +++ b/src/H5O.c @@ -411,7 +411,7 @@ H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, H5G_loc_t obj_loc; herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Olink, FAIL) + FUNC_ENTER_API_META(H5Olink, FAIL) H5TRACE5("e", "ii*sii", obj_id, new_loc_id, new_name, lcpl_id, lapl_id); /* Check arguments */ @@ -433,7 +433,7 @@ H5Olink(hid_t obj_id, hid_t new_loc_id, const char *new_name, hid_t lcpl_id, HGOTO_ERROR(H5E_LINK, H5E_CANTINIT, FAIL, "unable to create link") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Olink() */ @@ -463,7 +463,7 @@ H5Oincr_refcount(hid_t object_id) H5O_loc_t *oloc; herr_t ret_value = SUCCEED; - FUNC_ENTER_API(H5Oincr_refcount, FAIL) + FUNC_ENTER_API_META(H5Oincr_refcount, FAIL) H5TRACE1("e", "i", object_id); /* Get the object's oloc so we can adjust its link count */ @@ -474,7 +474,7 @@ H5Oincr_refcount(hid_t object_id) HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "modifying object link count failed") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5O_incr_refcount() */ @@ -504,7 +504,7 @@ H5Odecr_refcount(hid_t object_id) H5O_loc_t *oloc; herr_t ret_value = SUCCEED; - FUNC_ENTER_API(H5Odecr_refcount, FAIL) + FUNC_ENTER_API_META(H5Odecr_refcount, FAIL) H5TRACE1("e", "i", object_id); /* Get the object's oloc so we can adjust its link count */ @@ -515,7 +515,7 @@ H5Odecr_refcount(hid_t object_id) HGOTO_ERROR(H5E_OHDR, H5E_LINKCOUNT, FAIL, "modifying object link count failed") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Odecr_refcount() */ @@ -692,7 +692,7 @@ H5Oset_comment(hid_t obj_id, const char *comment) H5G_loc_t loc; /* Location of group */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Oset_comment, FAIL) + FUNC_ENTER_API_META(H5Oset_comment, FAIL) H5TRACE2("e", "i*s", obj_id, comment); /* Check args */ @@ -704,7 +704,7 @@ H5Oset_comment(hid_t obj_id, const char *comment) HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Oset_comment() */ @@ -732,7 +732,7 @@ H5Oset_comment_by_name(hid_t loc_id, const char *name, const char *comment, H5G_loc_t loc; /* Location of group */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Oset_comment_by_name, FAIL) + FUNC_ENTER_API_META(H5Oset_comment_by_name, FAIL) H5TRACE4("e", "i*s*si", loc_id, name, comment, lapl_id); /* Check args */ @@ -751,7 +751,7 @@ H5Oset_comment_by_name(hid_t loc_id, const char *name, const char *comment, HGOTO_ERROR(H5E_SYM, H5E_NOTFOUND, FAIL, "object not found") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Oset_comment_by_name() */ @@ -862,7 +862,7 @@ H5Oclose(hid_t object_id) { herr_t ret_value = SUCCEED; - FUNC_ENTER_API(H5Oclose, FAIL) + FUNC_ENTER_API_META(H5Oclose, FAIL) H5TRACE1("e", "i", object_id); /* Get the type of the object and close it in the correct way */ @@ -883,7 +883,7 @@ H5Oclose(hid_t object_id) } /* end switch */ done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Oclose() */ diff --git a/src/H5Ocopy.c b/src/H5Ocopy.c index 4c6092d..334883d 100644 --- a/src/H5Ocopy.c +++ b/src/H5Ocopy.c @@ -185,7 +185,7 @@ H5Ocopy(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id, herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Ocopy, FAIL) + FUNC_ENTER_API_META(H5Ocopy, FAIL) H5TRACE6("e", "i*si*sii", src_loc_id, src_name, dst_loc_id, dst_name, ocpypl_id, lcpl_id); @@ -258,7 +258,7 @@ done: if(obj_open) H5O_close(&src_oloc); - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Ocopy() */ diff --git a/src/H5R.c b/src/H5R.c index ca5d8fe..c68cf5d 100644 --- a/src/H5R.c +++ b/src/H5R.c @@ -311,7 +311,7 @@ H5Rcreate(void *ref, hid_t loc_id, const char *name, H5R_type_t ref_type, hid_t H5S_t *space = NULL; /* Pointer to dataspace containing region */ herr_t ret_value; /* Return value */ - FUNC_ENTER_API(H5Rcreate, FAIL) + FUNC_ENTER_API_META(H5Rcreate, FAIL) H5TRACE5("e", "*xi*sRti", ref, loc_id, name, ref_type, space_id); /* Check args */ @@ -333,7 +333,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_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Rcreate() */ diff --git a/src/H5T.c b/src/H5T.c index 3602e60..e0a7faa 100644 --- a/src/H5T.c +++ b/src/H5T.c @@ -1700,7 +1700,7 @@ H5Tclose(hid_t type_id) H5T_t *dt = NULL; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Tclose, FAIL); + FUNC_ENTER_API_META(H5Tclose, FAIL) H5TRACE1("e", "i", type_id); /* Check args */ @@ -1714,7 +1714,7 @@ H5Tclose(hid_t type_id) HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "problem freeing id"); done: - FUNC_LEAVE_API(ret_value); + FUNC_LEAVE_API_META(ret_value) } diff --git a/src/H5Tcommit.c b/src/H5Tcommit.c index 1e52325..0beeeea 100644 --- a/src/H5Tcommit.c +++ b/src/H5Tcommit.c @@ -80,7 +80,7 @@ H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, H5T_t *type; /* Datatype for ID */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Tcommit2, FAIL) + FUNC_ENTER_API_META(H5Tcommit2, FAIL) H5TRACE6("e", "i*siiii", loc_id, name, type_id, lcpl_id, tcpl_id, tapl_id); /* Check arguments */ @@ -117,7 +117,7 @@ H5Tcommit2(hid_t loc_id, const char *name, hid_t type_id, hid_t lcpl_id, HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Tcommit2() */ @@ -229,7 +229,7 @@ H5Tcommit_anon(hid_t loc_id, hid_t type_id, hid_t tcpl_id, hid_t tapl_id) H5T_t *type = NULL; herr_t ret_value=SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Tcommit_anon, FAIL) + FUNC_ENTER_API_META(H5Tcommit_anon, FAIL) H5TRACE4("e", "iiii", loc_id, type_id, tcpl_id, tapl_id); /* Check arguments */ @@ -257,7 +257,7 @@ H5Tcommit_anon(hid_t loc_id, hid_t type_id, hid_t tcpl_id, hid_t tapl_id) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Tcommit_anon() */ diff --git a/src/H5Tdeprec.c b/src/H5Tdeprec.c index 56ca889..0ddf26e 100644 --- a/src/H5Tdeprec.c +++ b/src/H5Tdeprec.c @@ -128,7 +128,7 @@ H5Tcommit1(hid_t loc_id, const char *name, hid_t type_id) H5T_t *type; /* Datatype for ID */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Tcommit1, FAIL) + FUNC_ENTER_API_META(H5Tcommit1, FAIL) H5TRACE3("e", "i*si", loc_id, name, type_id); /* Check arguments */ @@ -145,7 +145,7 @@ H5Tcommit1(hid_t loc_id, const char *name, hid_t type_id) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to commit datatype") done: - FUNC_LEAVE_API(ret_value) + FUNC_LEAVE_API_META(ret_value) } /* end H5Tcommit1() */ diff --git a/src/H5private.h b/src/H5private.h index e5fa35a..54f99ac1 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -1232,6 +1232,16 @@ static herr_t H5_INTERFACE_INIT_FUNC(void); H5E_clear_stack(NULL); \ { +/* Use this macro for API functions that [could] modify metadata */ +#define FUNC_ENTER_API_META(func_name,err) {{ \ + FUNC_ENTER_API_VARS(func_name) \ + FUNC_ENTER_COMMON(func_name,H5_IS_API(#func_name)); \ + FUNC_ENTER_API_THREADSAFE; \ + FUNC_ENTER_API_COMMON(func_name,err); \ + /* Clear thread error stack entering public functions */ \ + H5E_clear_stack(NULL); \ + { + /* * Use this macro for API functions that shouldn't clear the error stack * like H5Eprint and H5Ewalk. @@ -1357,14 +1367,6 @@ static herr_t H5_INTERFACE_INIT_FUNC(void); * * Programmer: Quincey Koziol * - * Modifications: - * - * Robb Matzke, 4 Aug 1997 - * The pablo mask comes from the constant PABLO_MASK defined on a - * per-file basis. The pablo_func_id comes from an auto variable - * defined by FUNC_ENTER. - * PABLO was deleted on January 21, 2005 EIP - * *------------------------------------------------------------------------- */ #define FUNC_LEAVE_API(ret_value) \ @@ -1376,6 +1378,7 @@ static herr_t H5_INTERFACE_INIT_FUNC(void); } /*end scope from end of FUNC_ENTER*/ \ }} /*end scope from beginning of FUNC_ENTER*/ +/* Use this macro to match the FUNC_ENTER_API_NOFS macro */ #define FUNC_LEAVE_API_NOFS(ret_value) \ FINISH_MPE_LOG; \ H5TRACE_RETURN(ret_value); \ @@ -1384,6 +1387,16 @@ static herr_t H5_INTERFACE_INIT_FUNC(void); } /*end scope from end of FUNC_ENTER*/ \ }} /*end scope from beginning of FUNC_ENTER*/ +/* Use this macro to match the FUNC_ENTER_API_META macro */ +#define FUNC_LEAVE_API_META(ret_value) \ + FINISH_MPE_LOG; \ + H5TRACE_RETURN(ret_value); \ + H5_POP_FUNC; \ + FUNC_LEAVE_API_THREADSAFE \ + return (ret_value); \ + } /*end scope from end of FUNC_ENTER*/ \ +}} /*end scope from beginning of FUNC_ENTER*/ + #define FUNC_LEAVE_NOAPI(ret_value) \ H5_POP_FUNC; \ return (ret_value); \ -- cgit v0.12