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 /src/H5.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 'src/H5.c')
| -rw-r--r-- | src/H5.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -214,7 +214,7 @@ H5_term_library(void) int pending, ntries = 0, n; size_t at = 0; char loop[1024]; - H5E_auto2_t func; + H5E_auto_t func; #ifdef H5_HAVE_THREADSAFE /* explicit locking of the API */ @@ -227,8 +227,11 @@ H5_term_library(void) goto done; /* Check if we should display error output */ - (void)H5Eget_auto2(H5E_DEFAULT, &func, NULL); - +#ifdef H5_USE_16_API_DEFAULT + (void)H5Eget_auto(&func, NULL); +#else + (void)H5Eget_auto(H5E_DEFAULT, &func, NULL); +#endif /* * Terminate each interface. The termination functions return a positive * value if they do something that might affect some other interface in a |