[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.

7 files changed, 17 insertions, 53 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());
 }
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);
 
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 115a86c..b1d9ee9 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -2417,11 +2417,7 @@ main(int argc, const char *argv[])
 
     /* Turn off HDF5's automatic error printing unless you're debugging h5ls */
     if(!show_errors_g)
-#ifdef H5_USE_16_API_DEFAULT
-        H5Eset_auto(NULL, NULL);
-#else /* H5_USE_16_API_DEFAULT */
-        H5Eset_auto(H5E_DEFAULT, NULL, NULL);
-#endif /* H5_USE_16_API_DEFAULT */
+        H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
 
 
     /* Each remaining argument is an hdf5 file followed by an optional slash
diff --git a/tools/h5stat/h5stat.c b/tools/h5stat/h5stat.c
index 7cc098d..fd21266 100644
--- a/tools/h5stat/h5stat.c
+++ b/tools/h5stat/h5stat.c
@@ -1544,11 +1544,7 @@ main(int argc, const char *argv[])
     h5tools_setstatus(EXIT_SUCCESS);
 
     /* Disable error reporting */
-#ifdef H5_USE_16_API_DEFAULT
-    H5Eset_auto(NULL, NULL);
-#else /* H5_USE_16_API_DEFAULT */
-    H5Eset_auto(H5E_DEFAULT, NULL, NULL);
-#endif /* H5_USE_16_API_DEFAULT */
+    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
 
     /* Initialize h5tools lib */
     h5tools_init();
diff --git a/tools/misc/h5mkgrp.c b/tools/misc/h5mkgrp.c
index 6d8a869..09f23ef 100644
--- a/tools/misc/h5mkgrp.c
+++ b/tools/misc/h5mkgrp.c
@@ -216,12 +216,7 @@ main(int argc, const char *argv[])
     h5tools_setstatus(EXIT_SUCCESS);
 
     /* Disable the HDF5 library's error reporting */
-#ifdef H5_USE_16_API_DEFAULT
-    H5Eset_auto(NULL, NULL);
-#else /* H5_USE_16_API_DEFAULT */
-    H5Eset_auto(H5E_DEFAULT, NULL, NULL);
-#endif /* H5_USE_16_API_DEFAULT */
-
+    H5Eset_auto2(H5E_DEFAULT, NULL, NULL);
 
     /* Initialize h5tools lib */
     h5tools_init();