diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2004-09-01 17:43:30 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2004-09-01 17:43:30 (GMT) |
| commit | cb7f03a26ff906175e5bf37af57547681683770f (patch) | |
| tree | d8d167353c83fe6caebc6df15c33ca1c7f6dc521 /test/h5test.c | |
| parent | 226f162ce75ff63e3d1468d17528ba629c51db58 (diff) | |
| download | hdf5-cb7f03a26ff906175e5bf37af57547681683770f.zip hdf5-cb7f03a26ff906175e5bf37af57547681683770f.tar.gz hdf5-cb7f03a26ff906175e5bf37af57547681683770f.tar.bz2 | |
[svn-r9183] Purpose: New feature
Description: Restore 6 old error API functions back to the library to be backward
compatible with v1.6. They are H5Epush, H5Eprint, H5Ewalk, H5Eclear, H5Eset_auto,
H5Eget_auto. These functions do not have error stack as parameter.
Solution: Internally, these functions use default error stack.
Platforms tested: h5committest and fuss.
Misc. update: RELEASE.txt
Diffstat (limited to 'test/h5test.c')
| -rw-r--r-- | test/h5test.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/test/h5test.c b/test/h5test.c index 1338b5b..042c763 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -89,11 +89,7 @@ MPI_Info h5_io_info_g=MPI_INFO_NULL;/* MPI INFO object for IO */ */ static const char *multi_letters = "msbrglo"; -#ifdef H5_WANT_H5_V1_6_COMPAT -static herr_t h5_errors(void *client_data); -#else /* H5_WANT_H5_V1_6_COMPAT */ static herr_t h5_errors(hid_t err_stack, void *client_data); -#endif /* H5_WANT_H5_V1_6_COMPAT */ /*------------------------------------------------------------------------- @@ -112,20 +108,11 @@ static herr_t h5_errors(hid_t err_stack, void *client_data); * *------------------------------------------------------------------------- */ -#ifdef H5_WANT_H5_V1_6_COMPAT -static herr_t -h5_errors(void UNUSED *client_data) -#else static herr_t h5_errors(hid_t err_stack, void UNUSED *client_data) -#endif /* H5_WANT_H5_V1_6_COMPAT */ { H5_FAILED(); -#ifdef H5_WANT_H5_V1_6_COMPAT - H5Eprint (stdout); -#else - H5Eprint (err_stack, stdout); -#endif /* H5_WANT_H5_V1_6_COMPAT */ + H5Eprint_stack(err_stack, stdout); return 0; } @@ -228,11 +215,8 @@ h5_reset(void) HDfflush(stdout); HDfflush(stderr); H5close(); -#ifdef H5_WANT_H5_V1_6_COMPAT - H5Eset_auto (h5_errors, NULL); -#else - H5Eset_auto (H5E_DEFAULT, h5_errors, NULL); -#endif /* H5_WANT_H5_V1_6_COMPAT */ + + H5Eset_auto_stack(H5E_DEFAULT, h5_errors, NULL); /* * Cause the library to emit some diagnostics early so they don't |