summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2016-06-06 02:30:16 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2016-06-06 02:30:16 (GMT)
commit03dafc5ebe2f964c4b2bf4af323def564dbb76f6 (patch)
treec1af4fdcbde6cc6fddced1bc99c751bd6f2bc03a /tools
parentdd6c8994c01cd31b5230e98838f11e4c229fdb34 (diff)
downloadhdf5-03dafc5ebe2f964c4b2bf4af323def564dbb76f6.zip
hdf5-03dafc5ebe2f964c4b2bf4af323def564dbb76f6.tar.gz
hdf5-03dafc5ebe2f964c4b2bf4af323def564dbb76f6.tar.bz2
[svn-r30020] Description:
Bring r29992 from revise_chunks branch to trunk: Turn off error reporting for h5debug and hdf2gif. Tested on: MacOSX/64 10.11.5 (amazon) w/serial, parallel & produciton (h5committest forthcoming)
Diffstat (limited to 'tools')
-rw-r--r--tools/misc/h5debug.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c
index 94e9557..ae64952 100644
--- a/tools/misc/h5debug.c
+++ b/tools/misc/h5debug.c
@@ -254,11 +254,13 @@ main(int argc, char *argv[])
haddr_t addr = 0, extra = 0, extra2 = 0, extra3 = 0, extra4 = 0;
uint8_t sig[H5F_SIGNATURE_LEN];
size_t u;
+ H5E_auto2_t func;
+ void *edata;
herr_t status = SUCCEED;
if(argc == 1) {
- HDfprintf(stderr, "Usage: %s filename [signature-addr [extra]]\n", argv[0]);
- HDexit(1);
+ HDfprintf(stderr, "Usage: %s filename [signature-addr [extra]]\n", argv[0]);
+ HDexit(1);
} /* end if */
/* Initialize the library */
@@ -267,6 +269,10 @@ main(int argc, char *argv[])
HDexit(1);
} /* end if */
+ /* Disable error reporting */
+ H5Eget_auto2(H5E_DEFAULT, &func, &edata);
+ H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
+
/*
* Open the file and get the file descriptor.
*/
@@ -710,6 +716,8 @@ main(int argc, char *argv[])
H5Pclose(fapl);
H5Fclose(fid);
+ H5Eset_auto2(H5E_DEFAULT, func, edata);
+
return 0;
} /* main() */