summaryrefslogtreecommitdiffstats
path: root/tools/h5ls/h5ls.c
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2010-09-27 17:53:37 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2010-09-27 17:53:37 (GMT)
commitbb87e6bac6a2d31ab70792eee8ca065860a979f6 (patch)
tree3e97bbfd0ab686c6e09c2e69e4b31116d320f79b /tools/h5ls/h5ls.c
parent84540ce6d1708e98c152276f524c938435da804c (diff)
downloadhdf5-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/h5ls/h5ls.c')
-rw-r--r--tools/h5ls/h5ls.c6
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