diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-27 19:02:48 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-27 19:02:48 (GMT) |
| commit | 1c61b6fe13f6fd9c84c0407f02865568e0a7f638 (patch) | |
| tree | e294883e7a2d7de4ec264d9ea68392c3587ecea3 /test/ttsafe_error.c | |
| parent | 82c6eab1814e1e06ef9472f6f4bbc8522064e0bc (diff) | |
| download | hdf5-1c61b6fe13f6fd9c84c0407f02865568e0a7f638.zip hdf5-1c61b6fe13f6fd9c84c0407f02865568e0a7f638.tar.gz hdf5-1c61b6fe13f6fd9c84c0407f02865568e0a7f638.tar.bz2 | |
[svn-r19481] I'm backing out my fix for bug 1707 because there're some unresolved issues - r19441 and 19467.
Bug 1707 is that H5Eset_auto causes a seg fault when an application uses -DH5_USE_16_API with
the 1.8 library to compile.
I created a branch off the trunk called set_auto to continue working on the problem.
Tested on jam - backing out, simple.
Diffstat (limited to 'test/ttsafe_error.c')
| -rw-r--r-- | test/ttsafe_error.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/test/ttsafe_error.c b/test/ttsafe_error.c index edc5c07..f55afdc 100644 --- a/test/ttsafe_error.c +++ b/test/ttsafe_error.c @@ -158,24 +158,16 @@ void *tts_error_thread(void UNUSED *arg) { hid_t dataspace, datatype, dataset; hsize_t dimsf[1]; /* dataset dimensions */ - H5E_auto_t old_error_cb; + H5E_auto2_t old_error_cb; void *old_error_client_data; int value; int ret; -#ifdef H5_USE_16_API_DEFAULT /* preserve previous error stack handler */ - H5Eget_auto(&old_error_cb, &old_error_client_data); + H5Eget_auto2(H5E_DEFAULT, &old_error_cb, &old_error_client_data); /* set each thread's error stack handler */ - H5Eset_auto(error_callback, NULL); -#else /* H5_USE_16_API_DEFAULT */ - /* preserve previous error stack handler */ - H5Eget_auto(H5E_DEFAULT, &old_error_cb, &old_error_client_data); - - /* set each thread's error stack handler */ - H5Eset_auto(H5E_DEFAULT, error_callback, NULL); -#endif /* H5_USE_16_API_DEFAULT */ + H5Eset_auto2(H5E_DEFAULT, error_callback, NULL); /* define dataspace for dataset */ dimsf[0] = 1; @@ -201,11 +193,7 @@ void *tts_error_thread(void UNUSED *arg) assert(ret >= 0); /* turn our error stack handler off */ -#ifdef H5_USE_16_API_DEFAULT - H5Eset_auto(old_error_cb, old_error_client_data); -#else /* H5_USE_16_API_DEFAULT */ - H5Eset_auto(H5E_DEFAULT, old_error_cb, old_error_client_data); -#endif /* H5_USE_16_API_DEFAULT */ + H5Eset_auto2(H5E_DEFAULT, old_error_cb, old_error_client_data); return NULL; } |