14 files changed, 28 insertions, 84 deletions

diff --git a/tools/h5diff/testfiles/h5diff_10.txt b/tools/h5diff/testfiles/h5diff_10.txt
index 8877a75..a74a37c 100644
--- a/tools/h5diff/testfiles/h5diff_10.txt
+++ b/tools/h5diff/testfiles/h5diff_10.txt
@@ -9,7 +9,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
@@ -24,14 +23,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
@@ -40,7 +36,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/h5diff/testfiles/h5diff_600.txt b/tools/h5diff/testfiles/h5diff_600.txt
index 3697279..dcf14f7 100644
--- a/tools/h5diff/testfiles/h5diff_600.txt
+++ b/tools/h5diff/testfiles/h5diff_600.txt
@@ -9,7 +9,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
@@ -24,14 +23,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
@@ -40,7 +36,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/h5diff/testfiles/h5diff_603.txt b/tools/h5diff/testfiles/h5diff_603.txt
index a2f07f2..e274d88 100644
--- a/tools/h5diff/testfiles/h5diff_603.txt
+++ b/tools/h5diff/testfiles/h5diff_603.txt
@@ -10,7 +10,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
@@ -25,14 +24,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
@@ -41,7 +37,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/h5diff/testfiles/h5diff_604.txt b/tools/h5diff/testfiles/h5diff_604.txt
index 90d9bdb..8232c38 100644
--- a/tools/h5diff/testfiles/h5diff_604.txt
+++ b/tools/h5diff/testfiles/h5diff_604.txt
@@ -10,7 +10,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
@@ -25,14 +24,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
@@ -41,7 +37,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/h5diff/testfiles/h5diff_605.txt b/tools/h5diff/testfiles/h5diff_605.txt
index 9e45341..bce2118 100644
--- a/tools/h5diff/testfiles/h5diff_605.txt
+++ b/tools/h5diff/testfiles/h5diff_605.txt
@@ -10,7 +10,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
@@ -25,14 +24,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
@@ -41,7 +37,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/h5diff/testfiles/h5diff_606.txt b/tools/h5diff/testfiles/h5diff_606.txt
index 31053d5..9a0a8cd 100644
--- a/tools/h5diff/testfiles/h5diff_606.txt
+++ b/tools/h5diff/testfiles/h5diff_606.txt
@@ -10,7 +10,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
@@ -25,14 +24,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
@@ -41,7 +37,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/h5diff/testfiles/h5diff_612.txt b/tools/h5diff/testfiles/h5diff_612.txt
index 0a05b7f..16baa7c 100644
--- a/tools/h5diff/testfiles/h5diff_612.txt
+++ b/tools/h5diff/testfiles/h5diff_612.txt
@@ -10,7 +10,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
@@ -25,14 +24,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
@@ -41,7 +37,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/h5diff/testfiles/h5diff_613.txt b/tools/h5diff/testfiles/h5diff_613.txt
index 155d7f6..e57c320 100644
--- a/tools/h5diff/testfiles/h5diff_613.txt
+++ b/tools/h5diff/testfiles/h5diff_613.txt
@@ -10,7 +10,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
@@ -25,14 +24,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
@@ -41,7 +37,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/h5diff/testfiles/h5diff_614.txt b/tools/h5diff/testfiles/h5diff_614.txt
index fac1c6a..828d250 100644
--- a/tools/h5diff/testfiles/h5diff_614.txt
+++ b/tools/h5diff/testfiles/h5diff_614.txt
@@ -10,7 +10,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
@@ -25,14 +24,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
@@ -41,7 +37,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/h5diff/testfiles/h5diff_615.txt b/tools/h5diff/testfiles/h5diff_615.txt
index f40ac2a..654a743 100644
--- a/tools/h5diff/testfiles/h5diff_615.txt
+++ b/tools/h5diff/testfiles/h5diff_615.txt
@@ -10,7 +10,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
@@ -25,14 +24,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
@@ -41,7 +37,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/h5diff/testfiles/h5diff_621.txt b/tools/h5diff/testfiles/h5diff_621.txt
index 93f1714..18acda6 100644
--- a/tools/h5diff/testfiles/h5diff_621.txt
+++ b/tools/h5diff/testfiles/h5diff_621.txt
@@ -10,7 +10,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
@@ -25,14 +24,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
@@ -41,7 +37,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/h5diff/testfiles/h5diff_622.txt b/tools/h5diff/testfiles/h5diff_622.txt
index 0cdc67c..7740b0a 100644
--- a/tools/h5diff/testfiles/h5diff_622.txt
+++ b/tools/h5diff/testfiles/h5diff_622.txt
@@ -10,7 +10,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
@@ -25,14 +24,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
@@ -41,7 +37,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/h5diff/testfiles/h5diff_623.txt b/tools/h5diff/testfiles/h5diff_623.txt
index b821511..e238a6b 100644
--- a/tools/h5diff/testfiles/h5diff_623.txt
+++ b/tools/h5diff/testfiles/h5diff_623.txt
@@ -10,7 +10,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
@@ -25,14 +24,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
@@ -41,7 +37,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/h5diff/testfiles/h5diff_624.txt b/tools/h5diff/testfiles/h5diff_624.txt
index d9ce5e6..7100555 100644
--- a/tools/h5diff/testfiles/h5diff_624.txt
+++ b/tools/h5diff/testfiles/h5diff_624.txt
@@ -10,7 +10,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
@@ -25,14 +24,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
@@ -41,7 +37,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: