diff options
| author | David Young <dyoung@hdfgroup.org> | 2020-07-30 23:15:09 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-07-30 23:15:09 (GMT) |
| commit | 0bb87534a6a78d5a5bddd84b9aa4867826368d8b (patch) | |
| tree | 830d41498d87478ea8cc22e2f6e36011008e8c6e /tools/src/h5repack | |
| parent | 3e91eeb270efaa2075c80e81895066bccf1b1a47 (diff) | |
| parent | 88aa0d5c76545eabf08be069a684fd7328eb4185 (diff) | |
| download | hdf5-0bb87534a6a78d5a5bddd84b9aa4867826368d8b.zip hdf5-0bb87534a6a78d5a5bddd84b9aa4867826368d8b.tar.gz hdf5-0bb87534a6a78d5a5bddd84b9aa4867826368d8b.tar.bz2 | |
Merge remote-tracking branch 'hdffv/develop' into rebased-fprintf-experiment
Diffstat (limited to 'tools/src/h5repack')
| -rw-r--r-- | tools/src/h5repack/h5repack_main.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/tools/src/h5repack/h5repack_main.c b/tools/src/h5repack/h5repack_main.c index f7822ca..0ad61c0 100644 --- a/tools/src/h5repack/h5repack_main.c +++ b/tools/src/h5repack/h5repack_main.c @@ -804,10 +804,6 @@ done: int main(int argc, const char **argv) { pack_opt_t options; /*the global options */ - H5E_auto2_t func; - H5E_auto2_t tools_func; - void *edata; - void *tools_edata; int parse_ret; HDmemset(&options, 0, sizeof(pack_opt_t)); @@ -818,14 +814,6 @@ int main(int argc, const char **argv) h5tools_setprogname(PROGRAMNAME); h5tools_setstatus(EXIT_SUCCESS); - /* Disable error reporting */ - H5Eget_auto2(H5E_DEFAULT, &func, &edata); - H5Eset_auto2(H5E_DEFAULT, NULL, NULL); - - /* Disable tools error reporting */ - H5Eget_auto2(H5tools_ERR_STACK_g, &tools_func, &tools_edata); - H5Eset_auto2(H5tools_ERR_STACK_g, NULL, NULL); - /* update hyperslab buffer size from H5TOOLS_BUFSIZE env if exist */ if (h5tools_getenv_update_hyperslab_bufsize() < 0) { HDprintf("Error occurred while retrieving H5TOOLS_BUFSIZE value\n"); @@ -855,10 +843,8 @@ int main(int argc, const char **argv) goto done; } - if (enable_error_stack > 0) { - H5Eset_auto2(H5E_DEFAULT, func, edata); - H5Eset_auto2(H5tools_ERR_STACK_g, tools_func, tools_edata); - } + /* enable error reporting if command line option */ + h5tools_error_report(); /* pack it */ if (h5repack(infile, outfile, &options) < 0) { |