diff options
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/h5diff_array.c | 2 | ||||
| -rw-r--r-- | tools/lib/h5diff_attr.c | 4 | ||||
| -rw-r--r-- | tools/lib/h5diff_dset.c | 3 | ||||
| -rw-r--r-- | tools/lib/h5trav.c | 2 | ||||
| -rw-r--r-- | tools/lib/h5trav.h | 17 | ||||
| -rw-r--r-- | tools/lib/h5trav_table.c | 12 |
6 files changed, 26 insertions, 14 deletions
diff --git a/tools/lib/h5diff_array.c b/tools/lib/h5diff_array.c index 38f5ba9..10bba40 100644 --- a/tools/lib/h5diff_array.c +++ b/tools/lib/h5diff_array.c @@ -521,7 +521,7 @@ int diff_datum( void *_mem1, /* compare OID */ if (sb1.objno!=sb2.objno) { - printf("Different OIDs in reference: <%s, %d> and <%s, %d>", + HDfprintf(stdout,"Different OIDs in reference: <%s, %Hu> and <%s, %Hu>", obj1, sb1.objno, obj2, sb2.objno); nfound = 1; } diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c index c2e36ef..c1dc945 100644 --- a/tools/lib/h5diff_attr.c +++ b/tools/lib/h5diff_attr.c @@ -156,9 +156,9 @@ int diff_attr(hid_t loc1_id, goto error; if ((mtype2_id=H5Tget_native_type(ftype2_id,H5T_DIR_DEFAULT))<0) goto error; - if ((msize1=H5Tget_size(mtype1_id))<0) + if ((msize1=H5Tget_size(mtype1_id))==0) goto error; - if ((msize2=H5Tget_size(mtype2_id))<0) + if ((msize2=H5Tget_size(mtype2_id))==0) goto error; assert(msize1==msize2); diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c index 13dfe5f..2e4cd67 100644 --- a/tools/lib/h5diff_dset.c +++ b/tools/lib/h5diff_dset.c @@ -414,9 +414,6 @@ int diff_can_type( hid_t f_type1, /* file data type */ H5T_class_t tclass1; H5T_class_t tclass2; - int nfound=0; /* number of differences found */ - const char *name1=NULL; /* relative names */ - const char *name2=NULL; int maxdim_diff=0; /* maximum dimensions are different */ int dim_diff=0; /* current dimensions are different */ int i; diff --git a/tools/lib/h5trav.c b/tools/lib/h5trav.c index ba74b6c..8d51ac4 100644 --- a/tools/lib/h5trav.c +++ b/tools/lib/h5trav.c @@ -282,7 +282,7 @@ int traverse( hid_t loc_id, { char *name=NULL; - int type; + H5G_obj_t type; int nobjs; int i; char *path=NULL; diff --git a/tools/lib/h5trav.h b/tools/lib/h5trav.h index cb61cd1..15c82ca 100644 --- a/tools/lib/h5trav.h +++ b/tools/lib/h5trav.h @@ -84,10 +84,21 @@ void h5trav_freeinfo( trav_info_t *info, int nobjs ); */ void trav_table_init(trav_table_t **table); + void trav_table_free(trav_table_t *table); -int trav_table_search(haddr_t objno, trav_table_t *table ); -void trav_table_add(haddr_t objno, char *objname, int type, trav_table_t *table); -void trav_table_addflags(unsigned *flags, char *objname, int type, trav_table_t *table); + +int trav_table_search(haddr_t objno, + trav_table_t *table ); + +void trav_table_add(haddr_t objno, + char *objname, + H5G_obj_t type, + trav_table_t *table); + +void trav_table_addflags(unsigned *flags, + char *objname, + H5G_obj_t type, + trav_table_t *table); diff --git a/tools/lib/h5trav_table.c b/tools/lib/h5trav_table.c index 8d29c7c..bbbe2d6 100644 --- a/tools/lib/h5trav_table.c +++ b/tools/lib/h5trav_table.c @@ -56,8 +56,10 @@ int trav_table_search(haddr_t objno, trav_table_t *table ) *------------------------------------------------------------------------- */ -void -trav_table_add(haddr_t objno, char *objname, int type, trav_table_t *table) +void trav_table_add(haddr_t objno, + char *objname, + H5G_obj_t type, + trav_table_t *table) { int i; @@ -98,8 +100,10 @@ trav_table_add(haddr_t objno, char *objname, int type, trav_table_t *table) *------------------------------------------------------------------------- */ -void -trav_table_addflags(unsigned *flags, char *objname, int type, trav_table_t *table) +void trav_table_addflags(unsigned *flags, + char *objname, + H5G_obj_t type, + trav_table_t *table) { int i; |