diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-21 16:46:38 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-21 16:46:38 (GMT) |
| commit | d6c6a34a8f5876d21dee052c74426b0606b62d13 (patch) | |
| tree | 67b0dddc97926eae54a6fd23a563a4e2296dabab /test/ttsafe_error.c | |
| parent | ba71366f9867bd2d817abf6715a5445237023c6f (diff) | |
| download | hdf5-d6c6a34a8f5876d21dee052c74426b0606b62d13.zip hdf5-d6c6a34a8f5876d21dee052c74426b0606b62d13.tar.gz hdf5-d6c6a34a8f5876d21dee052c74426b0606b62d13.tar.bz2 | |
[svn-r19457] Bug fix for 1707 - H5Eset_auto causes a seg fault when an application uses -DH5_USE_16_API with the 1.8 library to compile. The cause is from the mismatch of H5Eprint1 and H5Eprint2 set
through H5Eset_auto. I changed the union in the structure H5E_auto_t. Another change is to
make H5Eget_auto fail if H5Eset_auto is called to set the printing function. I'll write a
document for it.
Tested on heiwa, jam, and amani.
The property change in configure.in, config, and Makefile.am came from the merge of the 1.8
library change.
Diffstat (limited to 'test/ttsafe_error.c')
| -rw-r--r-- | test/ttsafe_error.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/test/ttsafe_error.c b/test/ttsafe_error.c index f55afdc..edc5c07 100644 --- a/test/ttsafe_error.c +++ b/test/ttsafe_error.c @@ -158,16 +158,24 @@ void *tts_error_thread(void UNUSED *arg) { hid_t dataspace, datatype, dataset; hsize_t dimsf[1]; /* dataset dimensions */ - H5E_auto2_t old_error_cb; + H5E_auto_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_auto2(H5E_DEFAULT, &old_error_cb, &old_error_client_data); + H5Eget_auto(&old_error_cb, &old_error_client_data); /* set each thread's error stack handler */ - H5Eset_auto2(H5E_DEFAULT, error_callback, NULL); + 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 */ /* define dataspace for dataset */ dimsf[0] = 1; @@ -193,7 +201,11 @@ void *tts_error_thread(void UNUSED *arg) assert(ret >= 0); /* turn our error stack handler off */ - H5Eset_auto2(H5E_DEFAULT, old_error_cb, old_error_client_data); +#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 */ return NULL; } |