[svn-r15987] Merge with 1.8 rev 15871

Eliminate -c option and make that behavior the default and return 2 instead of -1 on error status

tested: linux

2 files changed, 15 insertions, 18 deletions

diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index f0c6048..df479de 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -450,33 +450,31 @@ hsize_t diff_match(hid_t file1_id,
 
 
     /*-------------------------------------------------------------------------
-    * contents mode. we do an "absolute" compare criteria, the number of objects
+    * the number of objects
     * in file1 must be the same as in file2
     *-------------------------------------------------------------------------
     */
-    if ( options->m_contents )
+   
+    /* assume equal contents initially */
+    options->contents = 1;
+    
+    /* number of different objects */
+    if ( info1->nused != info2->nused )
     {
-        /* assume equal contents initially */
-        options->contents = 1;
-
-        /* number of different objects */
-        if ( info1->nused != info2->nused )
+        options->contents = 0;
+    }
+    
+    
+    for( i = 0; i < table->nobjs; i++)
+    {
+        if( table->objs[i].flags[0] != table->objs[i].flags[1] )
         {
             options->contents = 0;
         }
-
-
-        for( i = 0; i < table->nobjs; i++)
-        {
-            if( table->objs[i].flags[0] != table->objs[i].flags[1] )
-            {
-                options->contents = 0;
-            }
-        }
-
     }
 
 
+
     /*-------------------------------------------------------------------------
     * do the diff for common objects
     *-------------------------------------------------------------------------
diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h
index 4b1a892..c013ba5 100644
--- a/tools/lib/h5diff.h
+++ b/tools/lib/h5diff.h
@@ -37,7 +37,6 @@ typedef struct {
     int    err_stat;  /* an error ocurred (1, error, 0, no error) */
     int    cmn_objs;  /* do we have comparable objects */
     int    not_cmp;   /* are the objects comparable */
-    int    m_contents;/* contents mode */
     int    contents;  /* equal contents */
 } diff_opt_t;