diff options
author | Robb Matzke <matzke@llnl.gov> | 1998-01-28 21:43:08 (GMT) |
---|---|---|
committer | Robb Matzke <matzke@llnl.gov> | 1998-01-28 21:43:08 (GMT) |
commit | d4a3224c0fde991cdf65392aeeae326c46406121 (patch) | |
tree | 462dea6a59f895530173943dcf18930916868a8b /src/H5E.c | |
parent | c131a549dc1a9c8456d8cf0e44a56187dae1c268 (diff) | |
download | hdf5-d4a3224c0fde991cdf65392aeeae326c46406121.zip hdf5-d4a3224c0fde991cdf65392aeeae326c46406121.tar.gz hdf5-d4a3224c0fde991cdf65392aeeae326c46406121.tar.bz2 |
[svn-r193] Changes since 19980128
----------------------
./MANIFEST
Added new config files.
./src/H5private.h
Changed FUNC_ENTER() so it calls H5Eclear() for all API
functions but not for any private functions. It also prints
the names of all API functions on file 55 (just for the
prototype) so we can get a list of API functions called with
the Bourne shell commands like:
./testhdf5 55>api_list or
./testhdf5 55>&1 1>/dev/null 2>&1 | less
Otherwise the names are silently discarded.
./src/H5.c
./src/H5C.c
./src/H5D.c
./src/H5F.c
./src/H5G.c
./src/H5M.c
./src/H5P.c
./src/H5T.c
Removed `H5ECLEAR' from lots of places in the source code.
./src/H5E.c
./src/H5Eprivate.h
Recursion is a problem here, so to disable a call to
H5Eclear() from FUNC_ENTER just define a local variable like
this before you call FUNC_ENTER:
const H5E_clearable_g = FALSE;
Unfortunately this results in a warning: declaration of
`H5E_clearable_g' shadows global declaration. Good thing it's
only used in two places.
Diffstat (limited to 'src/H5E.c')
-rw-r--r-- | src/H5E.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -107,6 +107,7 @@ static intn interface_initialize_g = FALSE; static herr_t H5E_init_interface(void); static void H5E_term_interface(void); +const hbool_t H5E_clearable_g = TRUE; hid_t H5E_thrdid_g = FAIL; /* Thread-specific "global" error-handler ID */ /*-------------------------------------------------------------------------- @@ -184,9 +185,8 @@ H5Ecreate(uintn initial_stack_nelmts) hid_t ret_value = FAIL; FUNC_ENTER(H5Ecreate, FAIL); - H5ECLEAR; - /* check args */ + /* Check args */ initial_stack_nelmts = MAX(10, MIN(initial_stack_nelmts, 1000)); /* Allocate the stack header */ @@ -224,7 +224,6 @@ herr_t H5Eclose(hid_t estack_id) { FUNC_ENTER(H5Eclose, FAIL); - H5ECLEAR; /* check args */ if (H5_ERR != H5A_group(estack_id)) { @@ -329,7 +328,8 @@ DESCRIPTION herr_t H5Eclear(hid_t estack_id) { - H5E_t *estack = NULL; + H5E_t *estack = NULL; + hbool_t H5E_clearable_g = FALSE; /*override global*/ FUNC_ENTER(H5Eclear, FAIL); @@ -373,7 +373,8 @@ H5Eclear(hid_t estack_id) herr_t H5Eprint(hid_t estack_id, FILE * file) { - H5E_t *estack = NULL; + H5E_t *estack = NULL; + hbool_t H5E_clearable_g = FALSE; /*override global*/ FUNC_ENTER(H5Eprint, FAIL); /* |