diff options
| author | Jonathan Kim <jkm@hdfgroup.org> | 2010-01-21 20:01:42 (GMT) |
|---|---|---|
| committer | Jonathan Kim <jkm@hdfgroup.org> | 2010-01-21 20:01:42 (GMT) |
| commit | 3c5dc1a808c1513632786cbf4a0a6d4b257c1953 (patch) | |
| tree | 48df89d21fef89e596a9a49a6d2114da44834451 /tools/lib | |
| parent | e3ccf118bb2f5ef683e248ba7bc7335748bc30cc (diff) | |
| download | hdf5-3c5dc1a808c1513632786cbf4a0a6d4b257c1953.zip hdf5-3c5dc1a808c1513632786cbf4a0a6d4b257c1953.tar.gz hdf5-3c5dc1a808c1513632786cbf4a0a6d4b257c1953.tar.bz2 | |
[svn-r18134] Purpose:
Additional fix relted to the fix of bug1672.
Description:
The fix of bug1672 caused some changes of output which required modifying
some test cases. After some discussion, restoring the changes of the test
cases was decided. After many experiments for the solution, this fix was
made so the code which improved performance can stay.
Tested on Jam.
Diffstat (limited to 'tools/lib')
| -rw-r--r-- | tools/lib/h5diff.c | 8 | ||||
| -rw-r--r-- | tools/lib/h5diff_attr.c | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c index 18dd1ed..ad42a94 100644 --- a/tools/lib/h5diff.c +++ b/tools/lib/h5diff.c @@ -931,11 +931,13 @@ hsize_t diff(hid_t file1_id, /* the rest (-c, none, ...) */ else { - do_print_objname("dataset", path1, path2); nfound = diff_dataset(file1_id, file2_id, path1, path2, options); - /* not comparable, no display the different number */ - if (!options->not_cmp) + /* print info if compatible and difference found */ + if (!options->not_cmp && nfound) + { + do_print_objname("dataset", path1, path2); print_found(nfound); + } } break; diff --git a/tools/lib/h5diff_attr.c b/tools/lib/h5diff_attr.c index 73a7ee7..2cf6539 100644 --- a/tools/lib/h5diff_attr.c +++ b/tools/lib/h5diff_attr.c @@ -242,7 +242,6 @@ hsize_t diff_attr(hid_t loc1_id, /* the rest (-c, none, ...) */ else { - do_print_objname ("attribute", np1, np2); nfound = diff_array(buf1, buf2, nelmts1, @@ -257,8 +256,11 @@ hsize_t diff_attr(hid_t loc1_id, attr2_id); /* not comparable, no display the different number */ - if (!options->not_cmp) + if (!options->not_cmp && nfound) + { + do_print_objname ("attribute", np1, np2); print_found(nfound); + } } |