diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2011-09-16 19:29:03 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2011-09-16 19:29:03 (GMT) |
| commit | 86faf0b30252ff752420010fce5a12b0498a2b04 (patch) | |
| tree | e51f37c642e5402e2db78205d93930385857912e /tools/lib/h5diff_attr.c | |
| parent | 35d9b3462131ec2287fc7e74c07584ed0d771067 (diff) | |
| download | hdf5-86faf0b30252ff752420010fce5a12b0498a2b04.zip hdf5-86faf0b30252ff752420010fce5a12b0498a2b04.tar.gz hdf5-86faf0b30252ff752420010fce5a12b0498a2b04.tar.bz2 | |
[svn-r21396] Purpose:
HDFFV-7693 - h5diff produces different behavior between versions: 1.8.3 and 1.8.6
Description:
There were two issues on this.
One was not displaying all the comparable objects if non-comparable
object/attribute exist and compared before comparables ones. This issue
occurred after 1.8.4 release. This is the issue from user.
The other issue was not displaying all the comparable attributes,
if non-comparable object/attribute exist and compared ahead. This issue
were exist even before 1.8.4 release. So it's possible some attribute
comparison may have not displayed correctly in the past, if non-comparable
data were exist in common object.
Fixed h5diff to display all the comparable object and attribute regardless
of non-comparables.
Tested:
jam (linux32-LE), koala (linux64-LE), heiwa (linuxppc64-BE), tejeda (mac32-LE), linew (solaris-BE), Cmake (jam, Windows)
Diffstat (limited to 'tools/lib/h5diff_attr.c')
| -rw-r--r-- | tools/lib/h5diff_attr.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c index e5c5965..d9132e9 100644 --- a/tools/lib/h5diff_attr.c +++ b/tools/lib/h5diff_attr.c @@ -380,9 +380,8 @@ hsize_t diff_attr(hid_t loc1_id, *---------------------------------------------------------------------- */ - if(msize1 != msize2 || - diff_can_type(ftype1_id, ftype2_id, rank1, rank2, dims1, - dims2, NULL, NULL, name1, name2, options, 0) != 1) + if( diff_can_type(ftype1_id, ftype2_id, rank1, rank2, dims1, dims2, + NULL, NULL, name1, name2, options, 0) != 1 ) { if(H5Tclose(ftype1_id) < 0) goto error; @@ -452,8 +451,8 @@ hsize_t diff_attr(hid_t loc1_id, nfound = diff_array(buf1, buf2, nelmts1, (hsize_t)0, rank1, dims1, options, np1, np2, mtype1_id, attr1_id, attr2_id); - /* not comparable, no display the different number */ - if(!options->not_cmp && nfound) { + /* print info if compatible and difference found */ + if(nfound) { do_print_attrname("attribute", np1, np2); print_found(nfound); } /* end if */ |