diff options
Diffstat (limited to 'tools/h5dump/h5dump.c')
| -rw-r--r-- | tools/h5dump/h5dump.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c index e304a41..261fe15 100644 --- a/tools/h5dump/h5dump.c +++ b/tools/h5dump/h5dump.c @@ -4312,7 +4312,7 @@ main(int argc, const char *argv[]) hid_t fid, gid; char *fname = NULL; void *edata; - H5E_auto_t func; + H5E_auto2_t func; H5O_info_t oi; struct handler_t *hand; int i; @@ -4324,13 +4324,8 @@ main(int argc, const char *argv[]) dump_function_table = &ddl_function_table; /* Disable error reporting */ -#ifdef H5_USE_16_API_DEFAULT - H5Eget_auto(&func, &edata); - H5Eset_auto(NULL, NULL); -#else /* H5_USE_16_API_DEFAULT */ - H5Eget_auto(H5E_DEFAULT, &func, &edata); - H5Eset_auto(H5E_DEFAULT, NULL, NULL); -#endif /* H5_USE_16_API_DEFAULT */ + H5Eget_auto2(H5E_DEFAULT, &func, &edata); + H5Eset_auto2(H5E_DEFAULT, NULL, NULL); /* Initialize h5tools lib */ h5tools_init(); @@ -4538,11 +4533,8 @@ done: HDfree(fname); /* To Do: clean up XML table */ -#ifdef H5_USE_16_API_DEFAULT - H5Eset_auto(func, edata); -#else /* H5_USE_16_API_DEFAULT */ - H5Eset_auto(H5E_DEFAULT, func, edata); -#endif /* H5_USE_16_API_DEFAULT */ + + H5Eset_auto2(H5E_DEFAULT, func, edata); leave(h5tools_getstatus()); } |