diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-09-30 16:20:46 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-09-30 16:20:46 (GMT) |
| commit | c58d85f10eb0f7da7ac920b0655937f7521e9d8c (patch) | |
| tree | 5920e9682efd3a548fa78ed67735efa153dfcef0 /test/ttsafe_error.c | |
| parent | c48165cb11b0cb9a06239a0268c1c97336ffe6fd (diff) | |
| download | hdf5-c58d85f10eb0f7da7ac920b0655937f7521e9d8c.zip hdf5-c58d85f10eb0f7da7ac920b0655937f7521e9d8c.tar.gz hdf5-c58d85f10eb0f7da7ac920b0655937f7521e9d8c.tar.bz2 | |
[svn-r7527] Purpose:
Code cleanup
Description:
Clean up a few loose ends and warnings for the 1.6 compatibility changes
to the error API.
Platforms tested:
FreeBSD 4.9 (sleipnir)
too minor to require h5committest
Diffstat (limited to 'test/ttsafe_error.c')
| -rw-r--r-- | test/ttsafe_error.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/test/ttsafe_error.c b/test/ttsafe_error.c index ac54a50..2cf5a92 100644 --- a/test/ttsafe_error.c +++ b/test/ttsafe_error.c @@ -57,10 +57,11 @@ #ifdef H5_WANT_H5_V1_6_COMPAT static herr_t error_callback(void *); +static herr_t walk_error_callback(int, H5E_error_t *, void *); #else /*H5_WANT_H5_V1_6_COMPAT*/ static herr_t error_callback(hid_t, void *); +static herr_t walk_error_callback(unsigned, const H5E_error_t *, void *); #endif /* H5_WANT_H5_V1_6_COMPAT */ -static herr_t walk_error_callback(unsigned, H5E_error_t *, void *); static void *tts_error_thread(void *); /* Global variables */ @@ -228,8 +229,13 @@ herr_t error_callback(hid_t estack, void *client_data) } #endif /* H5_WANT_H5_V1_6_COMPAT */ +#ifdef H5_WANT_H5_V1_6_COMPAT +static +herr_t walk_error_callback(int n, H5E_error_t *err_desc, void UNUSED *client_data) +#else /* H5_WANT_H5_V1_6_COMPAT */ static -herr_t walk_error_callback(unsigned n, H5E_error_t *err_desc, void UNUSED *client_data) +herr_t walk_error_callback(unsigned n, const H5E_error_t *err_desc, void UNUSED *client_data) +#endif /* H5_WANT_H5_V1_6_COMPAT */ { hid_t maj_num, min_num; |