[svn-r9234] Purpose:

    Code cleanup

Description:
    Tweak recent "forward compatibility" changes to the H5E* API (which allowed
for the old H5E API functions to remain unchanged) by allowing for the error
stack callback function (H5E_auto_t) to also remain unchanged from the 1.6
branch.  This required changing the H5E{get|set}_auto routines to have the
old style H5E_auto_t type (which didn't have a stack ID parameter) and the new
H5E{get|set}_auto_stack routines to have a newer "H5E_auto_stack_t" type (which
has a stack ID parameter).  This should make the H5E API changes as forwardly
compatible as possible.
    One side-affect of this change was that it was impossible to determine if
the current auto error callback was the old style (H5E_auto_t) or the new style
(H5E_auto_stack_t) of callback, so a new API function (H5Eauto_is_stack) was
adde to query this.

Platforms tested:
    FreeBSD 4.10 (sleipnir)
    IRIX64 6.5 (modi4)
    h5committest

4 files changed, 4 insertions, 4 deletions

diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 5d12db3..e370478 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -3369,7 +3369,7 @@ main(int argc, const char *argv[])
     hid_t               fid, gid;
     const char         *fname = NULL;
     void               *edata;
-    H5E_auto_t          func;
+    H5E_auto_stack_t    func;
     find_objs_t         info;
     struct handler_t   *hand;
     int                 i;
diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c
index cc64bd3..d78e28c 100644
--- a/tools/h5jam/h5jam.c
+++ b/tools/h5jam/h5jam.c
@@ -159,7 +159,7 @@ main (int argc, const char *argv[])
   int h5fid;
   int ofid;
   void *edata;
-  H5E_auto_t func;
+  H5E_auto_stack_t func;
   hid_t ifile;
   hid_t plist;
   herr_t status;
diff --git a/tools/h5jam/h5unjam.c b/tools/h5jam/h5unjam.c
index 36a8d80..20378e5 100644
--- a/tools/h5jam/h5unjam.c
+++ b/tools/h5jam/h5unjam.c
@@ -161,7 +161,7 @@ main(int argc, const char *argv[])
     int   ufid;
     int   h5fid;
     void               *edata;
-    H5E_auto_t          func;
+    H5E_auto_stack_t          func;
     hid_t               ifile;
     off_t fsize;
     hsize_t usize;
diff --git a/tools/h5jam/tellub.c b/tools/h5jam/tellub.c
index 2bb457d..ab88f4d 100644
--- a/tools/h5jam/tellub.c
+++ b/tools/h5jam/tellub.c
@@ -127,7 +127,7 @@ main (int argc, const char *argv[])
 {
   char *ifname;
   void *edata;
-  H5E_auto_t func;
+  H5E_auto_stack_t func;
   hid_t ifile;
   hsize_t usize;
   htri_t testval;