[svn-r7265] *** empty log message ***

5 files changed, 27 insertions, 27 deletions

diff --git a/tools/h5diff/h5diff.c b/tools/h5diff/h5diff.c
index 79b591a..c24daa5 100644
--- a/tools/h5diff/h5diff.c
+++ b/tools/h5diff/h5diff.c
@@ -185,7 +185,7 @@ int main(int argc, const char *argv[])
  info_t     *info2=NULL;
  options_t  options = {0,0,0,0,0,0,0};
  void       *edata;
- hid_t      (*func)(void*);
+ H5E_auto_t func;
  const char *file1_name = NULL;
  const char *file2_name = NULL;
  const char *obj1_name  = NULL;
@@ -236,8 +236,8 @@ int main(int argc, const char *argv[])
  */
 
  /* disable error reporting */
- H5Eget_auto(&func, &edata);
- H5Eset_auto(NULL, NULL);
+ H5Eget_auto(H5E_DEFAULT, &func, &edata);
+ H5Eset_auto(H5E_DEFAULT, NULL, NULL);
  
  /* Open the files */
  if ((file1_id=H5Fopen(file1_name,H5F_ACC_RDONLY,H5P_DEFAULT))<0 )
@@ -251,7 +251,7 @@ int main(int argc, const char *argv[])
   exit(1);
  }
  /* enable error reporting */
- H5Eset_auto(func, edata);
+ H5Eset_auto(H5E_DEFAULT, func, edata);
 
  
 /*-------------------------------------------------------------------------
@@ -849,7 +849,7 @@ int diff_dataset( hid_t file1_id, hid_t file2_id, const char *obj1_name,
                   const char *obj2_name, options_t options )
 {
  void         *edata;
- hid_t        (*func)(void*);
+ H5E_auto_t   func;
  hid_t        dset1_id  =-1;
  hid_t        dset2_id  =-1;
  hid_t        space1_id =-1;
@@ -875,8 +875,8 @@ int diff_dataset( hid_t file1_id, hid_t file2_id, const char *obj1_name,
 
 
  /* disable error reporting */
- H5Eget_auto(&func, &edata);
- H5Eset_auto(NULL, NULL);
+ H5Eget_auto(H5E_DEFAULT, &func, &edata);
+ H5Eset_auto(H5E_DEFAULT, NULL, NULL);
 
 /*-------------------------------------------------------------------------
  * open the handles
@@ -895,7 +895,7 @@ int diff_dataset( hid_t file1_id, hid_t file2_id, const char *obj1_name,
   goto out;
  }
  /* enable error reporting */
- H5Eset_auto(func, edata);
+ H5Eset_auto(H5E_DEFAULT, func, edata);
 
   /* Get the dataspace handle */
  if ( (space1_id = H5Dget_space(dset1_id)) < 0 )
diff --git a/tools/h5diff/h5trav.c b/tools/h5diff/h5trav.c
index 29171f9..f4ce00f 100644
--- a/tools/h5diff/h5trav.c
+++ b/tools/h5diff/h5trav.c
@@ -238,8 +238,8 @@ int traverse( hid_t loc_id, const char *group_name, table_t *table, info_t *info
  int           inserted_objs=0;
  int           j;
  void          *edata;
- hid_t         (*func)(void*);
- 
+ H5E_auto_t     func;
+
  if (( nobjs = get_nobjects( loc_id, group_name )) < 0 )
   return -1;
  
@@ -259,12 +259,12 @@ int traverse( hid_t loc_id, const char *group_name, table_t *table, info_t *info
   strcat( path, name ); 
 
   /* disable error reporting */
-  H5Eget_auto(&func, &edata);
-  H5Eset_auto(NULL, NULL);
+  H5Eget_auto(H5E_DEFAULT, &func, &edata);
+  H5Eset_auto(H5E_DEFAULT, NULL, NULL);
 
   /* get info */
   H5Gget_objinfo( loc_id, path, TRUE, &statbuf);
-  H5Eset_auto(func, edata);
+  H5Eset_auto(H5E_DEFAULT, &func, edata);
 
   /* add to array */
   if ( info )
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index 3272674..fc39420 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -2744,7 +2744,7 @@ main(int argc, const char *argv[])
     hid_t               fid, gid;
     const char         *fname = NULL;
     void               *edata;
-    hid_t               (*func)(void*);
+    H5E_auto_t          func;
     find_objs_t         info;
     struct handler_t   *hand;
     int                 i;
@@ -2753,8 +2753,8 @@ main(int argc, const char *argv[])
     dump_function_table = &ddl_function_table;
 
     /* Disable error reporting */
-    H5Eget_auto(&func, &edata);
-    H5Eset_auto(NULL, NULL);
+    H5Eget_auto(H5E_DEFAULT, &func, &edata);
+    H5Eset_auto(H5E_DEFAULT, NULL, NULL);
 
     /* Initialize h5tools lib */
     h5tools_init();
@@ -2940,7 +2940,7 @@ done:
     /* To Do:  clean up XML table */
 
     h5tools_close();
-    H5Eset_auto(func, edata);
+    H5Eset_auto(H5E_DEFAULT, func, edata);
     return d_status;
 }
 
diff --git a/tools/h5import/h5import.c b/tools/h5import/h5import.c
index 20dc785..c48b565 100755
--- a/tools/h5import/h5import.c
+++ b/tools/h5import/h5import.c
@@ -2187,10 +2187,10 @@ process(struct Options *opt)
   const char *err4 = "Error in creating or opening external file.\n";  
   const char *err5 = "Error in creating the output data set. Dataset with the same name may exist at the specified path\n";
   const char *err6 = "Error in writing the output data set.\n";
-  H5Eget_auto(&func, &client_data);
+  H5Eget_auto(H5E_DEFAULT, &func, &client_data);
     
     /* disable error reporting */
-    H5Eset_auto(NULL, NULL);
+    H5Eset_auto(H5E_DEFAULT, NULL, NULL);
   if ((file_id = H5Fopen(opt->outfile, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
   if ((file_id = H5Fcreate(opt->outfile, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) == FAIL) 
   {
@@ -2198,7 +2198,7 @@ process(struct Options *opt)
     return (-1);
   }
     /*enable error reporting */
-    H5Eset_auto(func, client_data);
+    H5Eset_auto(H5E_DEFAULT, func, client_data);
     
   for (k = 0; k < opt->fcount; k++)
   {
@@ -2222,10 +2222,10 @@ process(struct Options *opt)
       numOfElements *= in->sizeOfDimension[j];
 
   /* store error reporting parameters */
-    H5Eget_auto(&func, &client_data);
+    H5Eget_auto(H5E_DEFAULT, &func, &client_data);
     
     /* disable error reporting */
-    H5Eset_auto(NULL, NULL);
+    H5Eset_auto(H5E_DEFAULT, NULL, NULL);
     
     /* create parent groups */
     if (in->path.count > 1)
@@ -2253,7 +2253,7 @@ process(struct Options *opt)
     }
 
     /*enable error reporting */
-    H5Eset_auto(func, client_data);
+    H5Eset_auto(H5E_DEFAULT, func, client_data);
     
     /*create data type */
     intype = createInputDataType(*in);
@@ -2297,10 +2297,10 @@ process(struct Options *opt)
     {
       dataspace = H5Screate_simple(in->rank, in->sizeOfDimension, NULL);
     }
-    H5Eget_auto(&func, &client_data);
+    H5Eget_auto(H5E_DEFAULT, &func, &client_data);
     
     /* disable error reporting */
-    H5Eset_auto(NULL, NULL); 
+    H5Eset_auto(H5E_DEFAULT, NULL, NULL); 
     /* create data set */
     if ((dataset = H5Dcreate(handle, in->path.group[j], outtype, dataspace, proplist)) < 0) 
     {
@@ -2312,7 +2312,7 @@ process(struct Options *opt)
     }
  
     /*enable error reporting */
-    H5Eset_auto(func, client_data);
+    H5Eset_auto(H5E_DEFAULT, func, client_data);
 
      /* write dataset */
     if (H5Dwrite(dataset, intype, H5S_ALL, H5S_ALL, H5P_DEFAULT, (VOIDP)in->data) < 0) 
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index e0cf357..b19b7d1 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -2141,7 +2141,7 @@ main (int argc, char *argv[])
     }
 
     /* Turn off HDF5's automatic error printing unless you're debugging h5ls */
-    if (!show_errors_g) H5Eset_auto(NULL, NULL);
+    if (!show_errors_g) H5Eset_auto(H5E_DEFAULT, NULL, NULL);
 
 
     /* Each remaining argument is an hdf5 file followed by an optional slash