summaryrefslogtreecommitdiffstats
path: root/tools/h5jam
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2004-09-01 17:43:30 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2004-09-01 17:43:30 (GMT)
commitcb7f03a26ff906175e5bf37af57547681683770f (patch)
treed8d167353c83fe6caebc6df15c33ca1c7f6dc521 /tools/h5jam
parent226f162ce75ff63e3d1468d17528ba629c51db58 (diff)
downloadhdf5-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/h5jam')
-rw-r--r--tools/h5jam/h5jam.c9
-rw-r--r--tools/h5jam/h5unjam.c9
-rw-r--r--tools/h5jam/tellub.c9
3 files changed, 6 insertions, 21 deletions
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);