diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2003-07-26 02:55:47 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2003-07-26 02:55:47 (GMT) |
| commit | 0d22a663df367ada055cb3695186c669e1dd6d5e (patch) | |
| tree | 9a3c6588411b63b90ec5d86f65032c0f373eb4e2 /tools/h5diff | |
| parent | b4b2b55d33be1c4f1c33aaf58294281a93b7da39 (diff) | |
| download | hdf5-0d22a663df367ada055cb3695186c669e1dd6d5e.zip hdf5-0d22a663df367ada055cb3695186c669e1dd6d5e.tar.gz hdf5-0d22a663df367ada055cb3695186c669e1dd6d5e.tar.bz2 | |
[svn-r7265] *** empty log message ***
Diffstat (limited to 'tools/h5diff')
| -rw-r--r-- | tools/h5diff/h5diff.c | 16 | ||||
| -rw-r--r-- | tools/h5diff/h5trav.c | 10 |
2 files changed, 13 insertions, 13 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 ) |