diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2003-09-24 19:26:50 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2003-09-24 19:26:50 (GMT) |
| commit | 7e79a8d71e6a579710e0fc2c677dfc32336d058f (patch) | |
| tree | d9b4f93046b8c2930fd35b3ec75953eccf1c1a47 /tools | |
| parent | 52f3545bde417a7eaeb996bfc97b58ab32075c73 (diff) | |
| download | hdf5-7e79a8d71e6a579710e0fc2c677dfc32336d058f.zip hdf5-7e79a8d71e6a579710e0fc2c677dfc32336d058f.tar.gz hdf5-7e79a8d71e6a579710e0fc2c677dfc32336d058f.tar.bz2 | |
[svn-r7507] *** empty log message ***
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5dump/h5dump.c | 9 | ||||
| -rw-r--r-- | tools/h5ls/h5ls.c | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c index c0841cc..37c67a2 100644 --- a/tools/h5dump/h5dump.c +++ b/tools/h5dump/h5dump.c @@ -2767,8 +2767,13 @@ main(int argc, const char *argv[]) dump_function_table = &ddl_function_table; /* Disable error reporting */ +#ifdef H5_WANT_H5_V1_6_COMPAT + H5Eget_auto(&func, &edata); + H5Eset_auto(NULL, NULL); +#else H5Eget_auto(H5E_DEFAULT, &func, &edata); H5Eset_auto(H5E_DEFAULT, NULL, NULL); +#endif /* H5_WANT_H5_V1_6_COMPAT */ /* Initialize h5tools lib */ h5tools_init(); @@ -2981,7 +2986,11 @@ done: /* To Do: clean up XML table */ h5tools_close(); +#ifdef H5_WANT_H5_V1_6_COMPAT + H5Eset_auto(func, edata); +#else H5Eset_auto(H5E_DEFAULT, func, edata); +#endif /* H5_WANT_H5_V1_6_COMPAT */ return d_status; } diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c index 0cb64fe..0ee57ed 100644 --- a/tools/h5ls/h5ls.c +++ b/tools/h5ls/h5ls.c @@ -2137,7 +2137,11 @@ main (int argc, char *argv[]) } /* Turn off HDF5's automatic error printing unless you're debugging h5ls */ +#ifdef H5_WANT_H5_V1_6_COMPAT + if (!show_errors_g) H5Eset_auto(NULL, NULL); +#else if (!show_errors_g) H5Eset_auto(H5E_DEFAULT, NULL, NULL); +#endif /* H5_WANT_H5_V1_6_COMPAT */ /* Each remaining argument is an hdf5 file followed by an optional slash |