summaryrefslogtreecommitdiffstats
path: root/tools/h5jam
diff options
context:
space:
mode:
authorRaymond Lu <songyulu@hdfgroup.org>2010-09-27 19:02:48 (GMT)
committerRaymond Lu <songyulu@hdfgroup.org>2010-09-27 19:02:48 (GMT)
commit1c61b6fe13f6fd9c84c0407f02865568e0a7f638 (patch)
treee294883e7a2d7de4ec264d9ea68392c3587ecea3 /tools/h5jam
parent82c6eab1814e1e06ef9472f6f4bbc8522064e0bc (diff)
downloadhdf5-1c61b6fe13f6fd9c84c0407f02865568e0a7f638.zip
hdf5-1c61b6fe13f6fd9c84c0407f02865568e0a7f638.tar.gz
hdf5-1c61b6fe13f6fd9c84c0407f02865568e0a7f638.tar.bz2
[svn-r19481] I'm backing out my fix for bug 1707 because there're some unresolved issues - r19441 and 19467.
Bug 1707 is that H5Eset_auto causes a seg fault when an application uses -DH5_USE_16_API with the 1.8 library to compile. I created a branch off the trunk called set_auto to continue working on the problem. Tested on jam - backing out, simple.
Diffstat (limited to 'tools/h5jam')
-rw-r--r--tools/h5jam/h5jam.c11
-rw-r--r--tools/h5jam/h5unjam.c11
-rw-r--r--tools/h5jam/tellub.c11
3 files changed, 9 insertions, 24 deletions
diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c
index 14d3f6a..17b1384 100644
--- a/tools/h5jam/h5jam.c
+++ b/tools/h5jam/h5jam.c
@@ -166,7 +166,7 @@ main (int argc, const char *argv[])
int h5fid;
int ofid;
void *edata;
- H5E_auto_t func;
+ H5E_auto2_t func;
hid_t ifile;
hid_t plist;
herr_t status;
@@ -185,13 +185,8 @@ main (int argc, const char *argv[])
h5tools_setstatus(EXIT_SUCCESS);
/* 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);
parse_command_line (argc, argv);
diff --git a/tools/h5jam/h5unjam.c b/tools/h5jam/h5unjam.c
index c5a337d..8e31ce1 100644
--- a/tools/h5jam/h5unjam.c
+++ b/tools/h5jam/h5unjam.c
@@ -169,7 +169,7 @@ main(int argc, const char *argv[])
int ufid;
int h5fid;
void *edata;
- H5E_auto_t func;
+ H5E_auto2_t func;
hid_t ifile;
off_t fsize;
hsize_t usize;
@@ -183,13 +183,8 @@ main(int argc, const char *argv[])
h5tools_setstatus(EXIT_SUCCESS);
/* 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);
parse_command_line(argc, argv);
diff --git a/tools/h5jam/tellub.c b/tools/h5jam/tellub.c
index ba71712..f1b6756 100644
--- a/tools/h5jam/tellub.c
+++ b/tools/h5jam/tellub.c
@@ -129,7 +129,7 @@ main (int argc, const char *argv[])
{
char *ifname;
void *edata;
- H5E_auto_t func;
+ H5E_auto2_t func;
hid_t ifile;
hsize_t usize;
htri_t testval;
@@ -140,13 +140,8 @@ main (int argc, const char *argv[])
h5tools_setstatus(EXIT_SUCCESS);
/* 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);
parse_command_line (argc, argv);