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/H5Eint.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/H5Eint.c')
| -rw-r--r-- | src/H5Eint.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5Eint.c b/src/H5Eint.c index 584ba40..75aadda 100644 --- a/src/H5Eint.c +++ b/src/H5Eint.c @@ -1013,15 +1013,15 @@ H5E_dump_api_stack(hbool_t is_api) HDassert(estack); if(estack->auto_op.vers == 1) { #ifndef H5_NO_DEPRECATED_SYMBOLS - if(estack->auto_op.u.func1) - (void)((estack->auto_op.u.func1)(estack->auto_data)); + if(estack->auto_op.func1) + (void)((estack->auto_op.func1)(estack->auto_data)); #else /* H5_NO_DEPRECATED_SYMBOLS */ HDassert(0 && "version 1 error stack dump without deprecated symbols!"); #endif /* H5_NO_DEPRECATED_SYMBOLS */ } /* end if */ else { - if(estack->auto_op.u.func2) - (void)((estack->auto_op.u.func2)(H5E_DEFAULT, estack->auto_data)); + if(estack->auto_op.func2) + (void)((estack->auto_op.func2)(H5E_DEFAULT, estack->auto_data)); } /* end else */ } /* end if */ |