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

Tested: windows, linux

24 files changed, 60 insertions, 183 deletions

diff --git a/tools/h5diff/h5diff_main.c b/tools/h5diff/h5diff_main.c
index 286ca2ba..058f160 100644
--- a/tools/h5diff/h5diff_main.c
+++ b/tools/h5diff/h5diff_main.c
@@ -16,6 +16,8 @@
 #include "h5diff.h"
 #include "h5tools_utils.h"
 #include <stdlib.h>
+#include <memory.h>
+#include <string.h>
 
 void usage(void);
 void parse_command_line(int argc, const char* argv[], const char** fname1, const char** fname2, const char** objname1, const char** objname2, diff_opt_t* options);
@@ -33,7 +35,7 @@ const char  *progname = "h5diff";
  * Command-line options: The user can specify short or long-named
  * parameters.
  */
-static const char *s_opts = "hVrvqn:d:p:c";
+static const char *s_opts = "hVrvqn:d:p:";
 static struct long_options l_opts[] = {
     { "help", no_arg, 'h' },
     { "version", no_arg, 'V' },
@@ -43,7 +45,6 @@ static struct long_options l_opts[] = {
     { "count", require_arg, 'n' },
     { "delta", require_arg, 'd' },
     { "relative", require_arg, 'p' },
-    { "contents", no_arg, 'c' },
     { NULL, 0, '\0' }
 };
 
@@ -87,13 +88,6 @@ static struct long_options l_opts[] = {
  * February 20, 2008
  *  adopted the syntax h5diff  [OPTIONS]  file1 file2  [obj1[obj2]]
  *
- * Aug 2008 
- *    Added a "contents" mode 
- *    If this mode is present, objects in both files must match (must be exactly the same)
- *    If this does not happen, the tool returns an error code of 1 
- *    (instead of the success code of 0)
- *
- *
  *-------------------------------------------------------------------------
  */
 
@@ -121,11 +115,11 @@ int main(int argc, const char *argv[])
 
     ret = (nfound == 0 ? 0 : 1 );
        
-    if ( options.m_contents && options.contents == 0 )
+    if ( options.contents == 0 )
         ret = 1;
     
     if(options.err_stat)
-        ret = -1;
+        ret = 2;
     return ret;
 }
 
@@ -175,9 +169,6 @@ void parse_command_line(int argc,
         case 'r':
             options->m_report = 1;
             break;
-        case 'c':
-            options->m_contents = 1;
-            break;
         case 'd':
             options->d=1;
             
@@ -259,7 +250,7 @@ void parse_command_line(int argc,
 
 void  print_info(diff_opt_t* options)
 {
-    if (options->m_quiet || options->err_stat || options->m_contents)
+    if (options->m_quiet || options->err_stat )
         return;
     
     if (options->cmn_objs==0)
@@ -408,8 +399,6 @@ void usage(void)
  printf("   -r, --report            Report mode. Print differences\n");
  printf("   -v, --verbose           Verbose mode. Print differences, list of objects\n");
  printf("   -q, --quiet             Quiet mode. Do not do output\n");
- printf("   -c, --contents          Contents mode. Objects in both files must match\n");
-
 
  printf("   -n C, --count=C         Print differences up to C number\n");
  printf("   -d D, --delta=D         Print difference when greater than limit D\n");
@@ -430,16 +419,14 @@ void usage(void)
  printf("  -r Report mode: print the above plus the differences\n");
  printf("  -v Verbose mode: print the above plus a list of objects and warnings\n");
  printf("  -q Quiet mode: do not print output\n");
- printf("  -c Contents mode: objects in both files must match\n");
 
  printf("\n");
 
  printf(" Compare criteria\n");
  printf("\n");
  printf(" If no objects [obj1[obj2]] are specified, h5diff only compares objects\n");
- printf("   with the same absolute path in both files. However,\n");
- printf("   when the -c flag is present, (contents mode) the objects in file1\n");
- printf("   must match exactly the objects in file2\n");
+ printf("   with the same absolute path in both files.\n");
+
  printf("\n");
    
  printf(" The compare criteria is:\n");
@@ -451,7 +438,7 @@ void usage(void)
 
  printf(" Return exit code:\n");
  printf("\n");
- printf("  1 if differences found, 0 if no differences, -1 if error\n");
+ printf("  1 if differences found, 0 if no differences, 2 if error\n");
 
  printf("\n");
 
diff --git a/tools/h5diff/testh5diff.sh b/tools/h5diff/testh5diff.sh
index 890a33a..db1e208 100755
--- a/tools/h5diff/testh5diff.sh
+++ b/tools/h5diff/testh5diff.sh
@@ -303,9 +303,6 @@ TOOLTEST h5diff_17.txt -v $FILE1 $FILE2
 # 1.8 quiet mode 
 TOOLTEST h5diff_18.txt -q $FILE1 $FILE2 
 
-# 1.9 contents mode 
-TOOLTEST h5diff_19.txt -v -c $FILE1 $FILE11 
-
 
 # ##############################################################################
 # # not comparable types
diff --git a/tools/h5repack/h5repack.sh.in b/tools/h5repack/h5repack.sh.in
index dae4df2..88e8a34 100755
--- a/tools/h5repack/h5repack.sh.in
+++ b/tools/h5repack/h5repack.sh.in
@@ -92,9 +92,9 @@ DIFFTEST()
 {
     VERIFY  $@
     if [ "`uname -s`" = "TFLOPS O/S" ]; then
-     $RUNSERIAL $H5DIFF_BIN -q -c $@ 
+     $RUNSERIAL $H5DIFF_BIN -q  $@ 
     else
-     $RUNSERIAL $H5DIFF_BIN -q -c "$@" 
+     $RUNSERIAL $H5DIFF_BIN -q  "$@" 
     fi
     RET=$?
     if [ $RET != 0 ] ; then
diff --git a/tools/h5repack/h5repacktst.c b/tools/h5repack/h5repacktst.c
index 1e51828..0a77f15 100644
--- a/tools/h5repack/h5repacktst.c
+++ b/tools/h5repack/h5repacktst.c
@@ -151,19 +151,9 @@ int main (void)
  memset(&diff_options, 0, sizeof (diff_opt_t));
  memset(&pack_options, 0, sizeof (pack_opt_t));
 
- 
- /* set h5diff "contents" mode */
- diff_options.m_contents = 1;
-
- 
- /* set h5diff "contents" mode */
- diff_options.m_contents = 1;
-
  /* run tests  */
  puts("Testing h5repack:");
 
- 
-
  /* make the test files */
  TESTING("    generating datasets");
  if (make_testfiles()<0)
diff --git a/tools/lib/h5diff.c b/tools/lib/h5diff.c
index f07360f..c91224e 100644
--- a/tools/lib/h5diff.c
+++ b/tools/lib/h5diff.c
@@ -337,31 +337,29 @@ hsize_t diff_match(hid_t file1_id,
     } /* end if */
 
     /*-------------------------------------------------------------------------
-    * 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 ( nobjects1 != nobjects2 )
     {
-        /* assume equal contents initially */
-        options->contents = 1;
-        
-        /* number of different objects */
-        if ( nobjects1 != nobjects2 )
+        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;
-            }
-        }
-        
     }
+        
 
     
     
diff --git a/tools/lib/h5diff.h b/tools/lib/h5diff.h
index 5193470..42f7e54 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;
 
diff --git a/tools/testfiles/h5diff_10.txt b/tools/testfiles/h5diff_10.txt
index a96e00c..ab4d856 100644
--- a/tools/testfiles/h5diff_10.txt
+++ b/tools/testfiles/h5diff_10.txt
@@ -12,7 +12,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D
    -p R, --relative=R      Print difference when greater than relative limit R
@@ -27,14 +26,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
 
  Compare criteria
 
  If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
+   with the same absolute path in both files.
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
@@ -43,7 +39,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  Return exit code:
 
-  1 if differences found, 0 if no differences, -1 if error
+  1 if differences found, 0 if no differences, 2 if error
 
  Examples of use:
 
diff --git a/tools/testfiles/h5diff_19.txt b/tools/testfiles/h5diff_19.txt
deleted file mode 100644
index aebcd0b..0000000
--- a/tools/testfiles/h5diff_19.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-#############################
-Expected output for 'h5diff -v -c h5diff_basic1.h5 h5diff_empty.h5'
-#############################
-
-file1     file2
----------------------------------------
-    x           /g1            
-    x           /g1/d1         
-    x           /g1/d2         
-    x           /g1/dset1      
-    x           /g1/dset10     
-    x           /g1/dset3      
-    x           /g1/dset5      
-    x           /g1/dset6      
-    x           /g1/dset7      
-    x           /g1/dset8      
-    x           /g1/dset9      
-    x           /g1/fp1        
-    x           /g1/fp15       
-    x           /g1/fp16       
-    x           /g1/fp17       
-    x           /g1/fp18       
-    x           /g1/fp2        
-
-group  : </> and </>
-0 differences found
diff --git a/tools/testfiles/h5diff_600.txt b/tools/testfiles/h5diff_600.txt
index abaf5e7..91742f5 100644
--- a/tools/testfiles/h5diff_600.txt
+++ b/tools/testfiles/h5diff_600.txt
@@ -12,7 +12,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D
    -p R, --relative=R      Print difference when greater than relative limit R
@@ -27,14 +26,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
 
  Compare criteria
 
  If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
+   with the same absolute path in both files.
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
@@ -43,7 +39,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  Return exit code:
 
-  1 if differences found, 0 if no differences, -1 if error
+  1 if differences found, 0 if no differences, 2 if error
 
  Examples of use:
 
diff --git a/tools/testfiles/h5diff_602.txt b/tools/testfiles/h5diff_602.txt
index 55cd0e0..c15ae3f 100644
--- a/tools/testfiles/h5diff_602.txt
+++ b/tools/testfiles/h5diff_602.txt
@@ -13,7 +13,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D
    -p R, --relative=R      Print difference when greater than relative limit R
@@ -28,14 +27,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
 
  Compare criteria
 
  If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
+   with the same absolute path in both files.
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
@@ -44,7 +40,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  Return exit code:
 
-  1 if differences found, 0 if no differences, -1 if error
+  1 if differences found, 0 if no differences, 2 if error
 
  Examples of use:
 
diff --git a/tools/testfiles/h5diff_603.txt b/tools/testfiles/h5diff_603.txt
index e786d52..c5f37ba 100644
--- a/tools/testfiles/h5diff_603.txt
+++ b/tools/testfiles/h5diff_603.txt
@@ -13,7 +13,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D
    -p R, --relative=R      Print difference when greater than relative limit R
@@ -28,14 +27,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
 
  Compare criteria
 
  If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
+   with the same absolute path in both files.
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
@@ -44,7 +40,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  Return exit code:
 
-  1 if differences found, 0 if no differences, -1 if error
+  1 if differences found, 0 if no differences, 2 if error
 
  Examples of use:
 
diff --git a/tools/testfiles/h5diff_604.txt b/tools/testfiles/h5diff_604.txt
index eef9847..ed4a32d 100644
--- a/tools/testfiles/h5diff_604.txt
+++ b/tools/testfiles/h5diff_604.txt
@@ -13,7 +13,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D
    -p R, --relative=R      Print difference when greater than relative limit R
@@ -28,14 +27,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
 
  Compare criteria
 
  If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
+   with the same absolute path in both files.
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
@@ -44,7 +40,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  Return exit code:
 
-  1 if differences found, 0 if no differences, -1 if error
+  1 if differences found, 0 if no differences, 2 if error
 
  Examples of use:
 
diff --git a/tools/testfiles/h5diff_605.txt b/tools/testfiles/h5diff_605.txt
index 1052312..baaec0c 100644
--- a/tools/testfiles/h5diff_605.txt
+++ b/tools/testfiles/h5diff_605.txt
@@ -13,7 +13,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D
    -p R, --relative=R      Print difference when greater than relative limit R
@@ -28,14 +27,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
 
  Compare criteria
 
  If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
+   with the same absolute path in both files.
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
@@ -44,7 +40,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  Return exit code:
 
-  1 if differences found, 0 if no differences, -1 if error
+  1 if differences found, 0 if no differences, 2 if error
 
  Examples of use:
 
diff --git a/tools/testfiles/h5diff_606.txt b/tools/testfiles/h5diff_606.txt
index cdf291b..8500f1b 100644
--- a/tools/testfiles/h5diff_606.txt
+++ b/tools/testfiles/h5diff_606.txt
@@ -13,7 +13,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D
    -p R, --relative=R      Print difference when greater than relative limit R
@@ -28,14 +27,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
 
  Compare criteria
 
  If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
+   with the same absolute path in both files.
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
@@ -44,7 +40,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  Return exit code:
 
-  1 if differences found, 0 if no differences, -1 if error
+  1 if differences found, 0 if no differences, 2 if error
 
  Examples of use:
 
diff --git a/tools/testfiles/h5diff_611.txt b/tools/testfiles/h5diff_611.txt
index 07aa0cd..4446d99 100644
--- a/tools/testfiles/h5diff_611.txt
+++ b/tools/testfiles/h5diff_611.txt
@@ -13,7 +13,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D
    -p R, --relative=R      Print difference when greater than relative limit R
@@ -28,14 +27,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
 
  Compare criteria
 
  If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
+   with the same absolute path in both files.
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
@@ -44,7 +40,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  Return exit code:
 
-  1 if differences found, 0 if no differences, -1 if error
+  1 if differences found, 0 if no differences, 2 if error
 
  Examples of use:
 
diff --git a/tools/testfiles/h5diff_612.txt b/tools/testfiles/h5diff_612.txt
index 1cc46c5..4888650 100644
--- a/tools/testfiles/h5diff_612.txt
+++ b/tools/testfiles/h5diff_612.txt
@@ -13,7 +13,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D
    -p R, --relative=R      Print difference when greater than relative limit R
@@ -28,14 +27,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
 
  Compare criteria
 
  If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
+   with the same absolute path in both files.
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
@@ -44,7 +40,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  Return exit code:
 
-  1 if differences found, 0 if no differences, -1 if error
+  1 if differences found, 0 if no differences, 2 if error
 
  Examples of use:
 
diff --git a/tools/testfiles/h5diff_613.txt b/tools/testfiles/h5diff_613.txt
index 194a02d..e753a0a 100644
--- a/tools/testfiles/h5diff_613.txt
+++ b/tools/testfiles/h5diff_613.txt
@@ -13,7 +13,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D
    -p R, --relative=R      Print difference when greater than relative limit R
@@ -28,14 +27,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
 
  Compare criteria
 
  If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
+   with the same absolute path in both files.
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
@@ -44,7 +40,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  Return exit code:
 
-  1 if differences found, 0 if no differences, -1 if error
+  1 if differences found, 0 if no differences, 2 if error
 
  Examples of use:
 
diff --git a/tools/testfiles/h5diff_614.txt b/tools/testfiles/h5diff_614.txt
index 1635e76..3f7916a 100644
--- a/tools/testfiles/h5diff_614.txt
+++ b/tools/testfiles/h5diff_614.txt
@@ -13,7 +13,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D
    -p R, --relative=R      Print difference when greater than relative limit R
@@ -28,14 +27,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
 
  Compare criteria
 
  If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
+   with the same absolute path in both files.
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
@@ -44,7 +40,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  Return exit code:
 
-  1 if differences found, 0 if no differences, -1 if error
+  1 if differences found, 0 if no differences, 2 if error
 
  Examples of use:
 
diff --git a/tools/testfiles/h5diff_615.txt b/tools/testfiles/h5diff_615.txt
index 9948be5..321ff0f 100644
--- a/tools/testfiles/h5diff_615.txt
+++ b/tools/testfiles/h5diff_615.txt
@@ -13,7 +13,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D
    -p R, --relative=R      Print difference when greater than relative limit R
@@ -28,14 +27,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
 
  Compare criteria
 
  If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
+   with the same absolute path in both files.
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
@@ -44,7 +40,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  Return exit code:
 
-  1 if differences found, 0 if no differences, -1 if error
+  1 if differences found, 0 if no differences, 2 if error
 
  Examples of use:
 
diff --git a/tools/testfiles/h5diff_620.txt b/tools/testfiles/h5diff_620.txt
index 03c3e53..0355325 100644
--- a/tools/testfiles/h5diff_620.txt
+++ b/tools/testfiles/h5diff_620.txt
@@ -13,7 +13,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D
    -p R, --relative=R      Print difference when greater than relative limit R
@@ -28,14 +27,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
 
  Compare criteria
 
  If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
+   with the same absolute path in both files.
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
@@ -44,7 +40,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  Return exit code:
 
-  1 if differences found, 0 if no differences, -1 if error
+  1 if differences found, 0 if no differences, 2 if error
 
  Examples of use:
 
diff --git a/tools/testfiles/h5diff_621.txt b/tools/testfiles/h5diff_621.txt
index 570a0cf..6780963 100644
--- a/tools/testfiles/h5diff_621.txt
+++ b/tools/testfiles/h5diff_621.txt
@@ -13,7 +13,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D
    -p R, --relative=R      Print difference when greater than relative limit R
@@ -28,14 +27,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
 
  Compare criteria
 
  If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
+   with the same absolute path in both files.
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
@@ -44,7 +40,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  Return exit code:
 
-  1 if differences found, 0 if no differences, -1 if error
+  1 if differences found, 0 if no differences, 2 if error
 
  Examples of use:
 
diff --git a/tools/testfiles/h5diff_622.txt b/tools/testfiles/h5diff_622.txt
index e4afaef..d58734b 100644
--- a/tools/testfiles/h5diff_622.txt
+++ b/tools/testfiles/h5diff_622.txt
@@ -13,7 +13,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D
    -p R, --relative=R      Print difference when greater than relative limit R
@@ -28,14 +27,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
 
  Compare criteria
 
  If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
+   with the same absolute path in both files.
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
@@ -44,7 +40,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  Return exit code:
 
-  1 if differences found, 0 if no differences, -1 if error
+  1 if differences found, 0 if no differences, 2 if error
 
  Examples of use:
 
diff --git a/tools/testfiles/h5diff_623.txt b/tools/testfiles/h5diff_623.txt
index c2e036f..eba09f9 100644
--- a/tools/testfiles/h5diff_623.txt
+++ b/tools/testfiles/h5diff_623.txt
@@ -13,7 +13,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D
    -p R, --relative=R      Print difference when greater than relative limit R
@@ -28,14 +27,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
 
  Compare criteria
 
  If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
+   with the same absolute path in both files.
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
@@ -44,7 +40,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  Return exit code:
 
-  1 if differences found, 0 if no differences, -1 if error
+  1 if differences found, 0 if no differences, 2 if error
 
  Examples of use:
 
diff --git a/tools/testfiles/h5diff_624.txt b/tools/testfiles/h5diff_624.txt
index e5c6431..b003b8a 100644
--- a/tools/testfiles/h5diff_624.txt
+++ b/tools/testfiles/h5diff_624.txt
@@ -13,7 +13,6 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
    -r, --report            Report mode. Print differences
    -v, --verbose           Verbose mode. Print differences, list of objects
    -q, --quiet             Quiet mode. Do not do output
-   -c, --contents          Contents mode. Objects in both files must match
    -n C, --count=C         Print differences up to C number
    -d D, --delta=D         Print difference when greater than limit D
    -p R, --relative=R      Print difference when greater than relative limit R
@@ -28,14 +27,11 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   -r Report mode: print the above plus the differences
   -v Verbose mode: print the above plus a list of objects and warnings
   -q Quiet mode: do not print output
-  -c Contents mode: objects in both files must match
 
  Compare criteria
 
  If no objects [obj1[obj2]] are specified, h5diff only compares objects
-   with the same absolute path in both files. However,
-   when the -c flag is present, (contents mode) the objects in file1
-   must match exactly the objects in file2
+   with the same absolute path in both files.
 
  The compare criteria is:
    1) datasets: numerical array differences 2) groups: name string difference
@@ -44,7 +40,7 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
 
  Return exit code:
 
-  1 if differences found, 0 if no differences, -1 if error
+  1 if differences found, 0 if no differences, 2 if error
 
  Examples of use: