12 files changed, 9 insertions, 17 deletions
diff --git a/tools/h5diff/testfiles/h5diff_200.txt b/tools/h5diff/testfiles/h5diff_200.txt
index 5a4d02e..56d723d 100644
--- a/tools/h5diff/testfiles/h5diff_200.txt
+++ b/tools/h5diff/testfiles/h5diff_200.txt
@@ -1,4 +1,3 @@
-dataset: </g2/dset1> and </g2/dset2>
 --------------------------------
 Some objects are not comparable
 --------------------------------
diff --git a/tools/h5diff/testfiles/h5diff_201.txt b/tools/h5diff/testfiles/h5diff_201.txt
index da916ea..84d6766 100644
--- a/tools/h5diff/testfiles/h5diff_201.txt
+++ b/tools/h5diff/testfiles/h5diff_201.txt
@@ -1,2 +1 @@
-dataset: </g2/dset1> and </g2/dset2>
 Not comparable: </g2/dset1> or </g2/dset2> is an empty dataset
diff --git a/tools/h5diff/testfiles/h5diff_202.txt b/tools/h5diff/testfiles/h5diff_202.txt
index 8e3c7ac..fd4a191 100644
--- a/tools/h5diff/testfiles/h5diff_202.txt
+++ b/tools/h5diff/testfiles/h5diff_202.txt
@@ -1,3 +1,2 @@
-dataset: </g2/dset2> and </g2/dset3>
 Not comparable: </g2/dset2> is of class H5T_FLOAT and </g2/dset3> is of class H5T_INTEGER
 Not comparable: </g2/dset2> has sign H5T_SGN_ERROR and </g2/dset3> has sign H5T_SGN_2
diff --git a/tools/h5diff/testfiles/h5diff_203.txt b/tools/h5diff/testfiles/h5diff_203.txt
index 90294e3..496523c 100644
--- a/tools/h5diff/testfiles/h5diff_203.txt
+++ b/tools/h5diff/testfiles/h5diff_203.txt
@@ -1,3 +1,2 @@
-dataset: </g2/dset3> and </g2/dset4>
 Not comparable: </g2/dset3> has rank 1, dimensions [6], max dimensions [6]
 and </g2/dset4> has rank 2, dimensions [3x2], max dimensions [3x2]
diff --git a/tools/h5diff/testfiles/h5diff_204.txt b/tools/h5diff/testfiles/h5diff_204.txt
index a94091d..098a203 100644
--- a/tools/h5diff/testfiles/h5diff_204.txt
+++ b/tools/h5diff/testfiles/h5diff_204.txt
@@ -1,3 +1,2 @@
-dataset: </g2/dset4> and </g2/dset5>
 Not comparable: </g2/dset4> has rank 2, dimensions [3x2], max dimensions [3x2]
 and </g2/dset5> has rank 2, dimensions [2x2], max dimensions [2x2]
diff --git a/tools/h5diff/testfiles/h5diff_205.txt b/tools/h5diff/testfiles/h5diff_205.txt
index c3708cb..3e2d1f2 100644
--- a/tools/h5diff/testfiles/h5diff_205.txt
+++ b/tools/h5diff/testfiles/h5diff_205.txt
@@ -1,4 +1,3 @@
-dataset: </g2/dset5> and </g2/dset6>
 Not comparable: </g2/dset5> has rank 2, dimensions [2x2], max dimensions [2x2]
 and </g2/dset6> has rank 2, dimensions [3x2], max dimensions [3x2]
 Not comparable: </g2/dset5> has sign H5T_SGN_2 and </g2/dset6> has sign H5T_SGN_NONE
diff --git a/tools/h5diff/testfiles/h5diff_206.txt b/tools/h5diff/testfiles/h5diff_206.txt
index 3557b1e..164aed9 100644
--- a/tools/h5diff/testfiles/h5diff_206.txt
+++ b/tools/h5diff/testfiles/h5diff_206.txt
@@ -1,2 +1 @@
-dataset: </g2/dset7> and </g2/dset8>
 Not comparable: </g2/dset7> has a class H5T_FLOAT and </g2/dset8> has a class H5T_INTEGER
diff --git a/tools/h5diff/testfiles/h5diff_207.txt b/tools/h5diff/testfiles/h5diff_207.txt
index 4dfcbb7..bb8e23f 100644
--- a/tools/h5diff/testfiles/h5diff_207.txt
+++ b/tools/h5diff/testfiles/h5diff_207.txt
@@ -1,3 +1,2 @@
-dataset: </g2/dset8> and </g2/dset9>
 Not comparable: </g2/dset8> or </g2/dset9> is an empty dataset
 Not comparable: </g2/dset8> has 2 members </g2/dset9> has 1 members 
diff --git a/tools/h5diff/testfiles/h5diff_609.txt b/tools/h5diff/testfiles/h5diff_609.txt
index 9369dd9..e69de29 100644
--- a/tools/h5diff/testfiles/h5diff_609.txt
+++ b/tools/h5diff/testfiles/h5diff_609.txt
@@ -1,2 +0,0 @@
-dataset: </g1/dset3> and </g1/dset4>
-0 differences found
diff --git a/tools/h5diff/testfiles/h5diff_618.txt b/tools/h5diff/testfiles/h5diff_618.txt
index 9369dd9..e69de29 100644
--- a/tools/h5diff/testfiles/h5diff_618.txt
+++ b/tools/h5diff/testfiles/h5diff_618.txt
@@ -1,2 +0,0 @@
-dataset: </g1/dset3> and </g1/dset4>
-0 differences found
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);
+                }
         }