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 /tools/h5ls | |
| 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 'tools/h5ls')
| -rw-r--r-- | tools/h5ls/h5ls.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c index 115a86c..b1d9ee9 100644 --- a/tools/h5ls/h5ls.c +++ b/tools/h5ls/h5ls.c @@ -2417,11 +2417,7 @@ main(int argc, const char *argv[]) /* Turn off HDF5's automatic error printing unless you're debugging h5ls */ if(!show_errors_g) -#ifdef H5_USE_16_API_DEFAULT - H5Eset_auto(NULL, NULL); -#else /* H5_USE_16_API_DEFAULT */ - H5Eset_auto(H5E_DEFAULT, NULL, NULL); -#endif /* H5_USE_16_API_DEFAULT */ + H5Eset_auto2(H5E_DEFAULT, NULL, NULL); /* Each remaining argument is an hdf5 file followed by an optional slash |