diff options
| author | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2003-12-04 19:35:33 (GMT) |
|---|---|---|
| committer | Pedro Vicente Nunes <pvn@hdfgroup.org> | 2003-12-04 19:35:33 (GMT) |
| commit | 28e43d818f105e2b93caa1b39a0ea056d8f3393e (patch) | |
| tree | 69d9ba95cc9389609e87e17ff6f54d1a2a436caf /tools/lib | |
| parent | 967a04fdec8aa15d93978cd201cd4ba0a583d6e2 (diff) | |
| download | hdf5-28e43d818f105e2b93caa1b39a0ea056d8f3393e.zip hdf5-28e43d818f105e2b93caa1b39a0ea056d8f3393e.tar.gz hdf5-28e43d818f105e2b93caa1b39a0ea056d8f3393e.tar.bz2 | |
[svn-r7913] Purpose:
code clean
Description:
separated the h5repack code in several modules
Solution:
Platforms tested:
linux
IRIX
solaris
Misc. update:
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/h5diff.c | 18 | ||||
| -rw-r--r-- | tools/lib/h5diff_dset.c | 4 |
2 files changed, 17 insertions, 5 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 9c9d8aa..1a5e1f3 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -417,8 +417,13 @@ int diff( hid_t file1_id, /* if H5Tequal is > 0 then the datatypes refer to the same datatype */ nfound = (ret>0) ? 0 : 1; - /* compare attributes */ - nfound=diff_attr(type1_id,type2_id,path1,path2,options); +/*------------------------------------------------------------------------- + * compare attributes + * the if condition refers to cases when the dataset is a referenced object + *------------------------------------------------------------------------- + */ + if (path1) + nfound=diff_attr(type1_id,type2_id,path1,path2,options); if ( H5Tclose(type1_id)<0) goto out; @@ -445,8 +450,13 @@ int diff( hid_t file1_id, /* if "path1" != "path2" then the groups are "different" */ nfound = (ret!=0) ? 1 : 0; - /* compare attributes */ - nfound=diff_attr(grp1_id,grp2_id,path1,path2,options); + /*------------------------------------------------------------------------- + * compare attributes + * the if condition refers to cases when the dataset is a referenced object + *------------------------------------------------------------------------- + */ + if (path1) + nfound=diff_attr(grp1_id,grp2_id,path1,path2,options); if ( H5Gclose(grp1_id)<0) goto out; diff --git a/tools/lib/h5diff_dset.c b/tools/lib/h5diff_dset.c index 9088c3a..767db68 100644 --- a/tools/lib/h5diff_dset.c +++ b/tools/lib/h5diff_dset.c @@ -347,10 +347,12 @@ int diff_datasetid( hid_t dset1_id, /*------------------------------------------------------------------------- * compare attributes + * the if condition refers to cases when the dataset is a referenced object *------------------------------------------------------------------------- */ - nfound=diff_attr(dset1_id,dset2_id,obj1_name,obj2_name,options); + if (obj1_name) + nfound=diff_attr(dset1_id,dset2_id,obj1_name,obj2_name,options); /*------------------------------------------------------------------------- * close |