diff options
author | Raymond Lu <songyulu@hdfgroup.org> | 2004-09-01 17:43:30 (GMT) |
---|---|---|
committer | Raymond Lu <songyulu@hdfgroup.org> | 2004-09-01 17:43:30 (GMT) |
commit | cb7f03a26ff906175e5bf37af57547681683770f (patch) | |
tree | d8d167353c83fe6caebc6df15c33ca1c7f6dc521 /tools | |
parent | 226f162ce75ff63e3d1468d17528ba629c51db58 (diff) | |
download | hdf5-cb7f03a26ff906175e5bf37af57547681683770f.zip hdf5-cb7f03a26ff906175e5bf37af57547681683770f.tar.gz hdf5-cb7f03a26ff906175e5bf37af57547681683770f.tar.bz2 |
[svn-r9183] Purpose: New feature
Description: Restore 6 old error API functions back to the library to be backward
compatible with v1.6. They are H5Epush, H5Eprint, H5Ewalk, H5Eclear, H5Eset_auto,
H5Eget_auto. These functions do not have error stack as parameter.
Solution: Internally, these functions use default error stack.
Platforms tested: h5committest and fuss.
Misc. update: RELEASE.txt
Diffstat (limited to 'tools')
-rw-r--r-- | tools/h5dump/h5dump.c | 15 | ||||
-rw-r--r-- | tools/h5jam/h5jam.c | 9 | ||||
-rw-r--r-- | tools/h5jam/h5unjam.c | 9 | ||||
-rw-r--r-- | tools/h5jam/tellub.c | 9 | ||||
-rw-r--r-- | tools/h5ls/h5ls.c | 6 |
5 files changed, 10 insertions, 38 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c index add1450..5d12db3 100644 --- a/tools/h5dump/h5dump.c +++ b/tools/h5dump/h5dump.c @@ -3378,13 +3378,8 @@ 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 */ + H5Eget_auto_stack(H5E_DEFAULT, &func, &edata); + H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL); /* Initialize h5tools lib */ h5tools_init(); @@ -3609,11 +3604,7 @@ done: /* To Do: clean up XML table */ -#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 */ + H5Eset_auto_stack(H5E_DEFAULT, func, edata); leave(d_status); } diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c index f5cdfe0..cc64bd3 100644 --- a/tools/h5jam/h5jam.c +++ b/tools/h5jam/h5jam.c @@ -175,13 +175,8 @@ main (int argc, const char *argv[]) int res; /* Disable error reporting */ -#ifdef H5_WANT_H5_V1_6_COMPAT - H5Eget_auto(&func, &edata); - H5Eset_auto(NULL, NULL); -#else /* H5_WANT_H5_V1_6_COMPAT */ - H5Eget_auto (H5E_DEFAULT, &func, &edata); - H5Eset_auto (H5E_DEFAULT, NULL, NULL); -#endif /* H5_WANT_H5_V1_6_COMPAT */ + H5Eget_auto_stack (H5E_DEFAULT, &func, &edata); + H5Eset_auto_stack (H5E_DEFAULT, NULL, NULL); parse_command_line (argc, argv); diff --git a/tools/h5jam/h5unjam.c b/tools/h5jam/h5unjam.c index 0bebda7..36a8d80 100644 --- a/tools/h5jam/h5unjam.c +++ b/tools/h5jam/h5unjam.c @@ -172,13 +172,8 @@ main(int argc, const char *argv[]) struct stat sbuf; /* Disable error reporting */ -#ifdef H5_WANT_H5_V1_6_COMPAT - H5Eget_auto(&func, &edata); - H5Eset_auto(NULL, NULL); -#else /* H5_WANT_H5_V1_6_COMPAT */ - H5Eget_auto(H5E_DEFAULT, &func, &edata); - H5Eset_auto(H5E_DEFAULT, NULL, NULL); -#endif /* H5_WANT_H5_V1_6_COMPAT */ + H5Eget_auto_stack(H5E_DEFAULT, &func, &edata); + H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL); parse_command_line(argc, argv); diff --git a/tools/h5jam/tellub.c b/tools/h5jam/tellub.c index e018eda..2bb457d 100644 --- a/tools/h5jam/tellub.c +++ b/tools/h5jam/tellub.c @@ -135,13 +135,8 @@ main (int argc, const char *argv[]) hid_t plist; /* Disable error reporting */ -#ifdef H5_WANT_H5_V1_6_COMPAT - H5Eget_auto(&func, &edata); - H5Eset_auto(NULL, NULL); -#else /* H5_WANT_H5_V1_6_COMPAT */ - H5Eget_auto (H5E_DEFAULT, &func, &edata); - H5Eset_auto (H5E_DEFAULT, NULL, NULL); -#endif /* H5_WANT_H5_V1_6_COMPAT */ + H5Eget_auto_stack(H5E_DEFAULT, &func, &edata); + H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL); parse_command_line (argc, argv); diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c index 7107162..24cd953 100644 --- a/tools/h5ls/h5ls.c +++ b/tools/h5ls/h5ls.c @@ -2195,11 +2195,7 @@ main (int argc, const 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 */ + if (!show_errors_g) H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL); /* Each remaining argument is an hdf5 file followed by an optional slash |