diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-27 17:53:37 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-27 17:53:37 (GMT) |
| commit | bb87e6bac6a2d31ab70792eee8ca065860a979f6 (patch) | |
| tree | 3e97bbfd0ab686c6e09c2e69e4b31116d320f79b /tools/h5jam/h5jam.c | |
| parent | 84540ce6d1708e98c152276f524c938435da804c (diff) | |
| download | hdf5-bb87e6bac6a2d31ab70792eee8ca065860a979f6.zip hdf5-bb87e6bac6a2d31ab70792eee8ca065860a979f6.tar.gz hdf5-bb87e6bac6a2d31ab70792eee8ca065860a979f6.tar.bz2 | |
[svn-r19479] I'm backing out my fix for bug 1707 because there're some unresolved issues - r19441 and 19466.
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.
Tested on jam - backing out, simple.
Diffstat (limited to 'tools/h5jam/h5jam.c')
| -rw-r--r-- | tools/h5jam/h5jam.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c index 14d3f6a..17b1384 100644 --- a/tools/h5jam/h5jam.c +++ b/tools/h5jam/h5jam.c @@ -166,7 +166,7 @@ main (int argc, const char *argv[]) int h5fid; int ofid; void *edata; - H5E_auto_t func; + H5E_auto2_t func; hid_t ifile; hid_t plist; herr_t status; @@ -185,13 +185,8 @@ main (int argc, const char *argv[]) h5tools_setstatus(EXIT_SUCCESS); /* Disable error reporting */ -#ifdef H5_USE_16_API_DEFAULT - H5Eget_auto(&func, &edata); - H5Eset_auto(NULL, NULL); -#else /* H5_USE_16_API_DEFAULT */ - H5Eget_auto(H5E_DEFAULT, &func, &edata); - H5Eset_auto(H5E_DEFAULT, NULL, NULL); -#endif /* H5_USE_16_API_DEFAULT */ + H5Eget_auto2(H5E_DEFAULT, &func, &edata); + H5Eset_auto2(H5E_DEFAULT, NULL, NULL); parse_command_line (argc, argv); |