[svn-r14267] enhancement: formatted h5diff usage

tested: linux

19 files changed, 456 insertions, 293 deletions

diff --git a/tools/h5diff/h5diff_common.c b/tools/h5diff/h5diff_common.c
index 569cd00..802cc37 100644
--- a/tools/h5diff/h5diff_common.c
+++ b/tools/h5diff/h5diff_common.c
@@ -567,36 +567,46 @@ void usage(void)
 
  printf("\n");
 
- printf("h5diff has four modes of output:\n");
- printf(" Normal mode: print the number of differences found and where they occured\n");
- printf(" Report mode: print the above plus the differences\n");
- printf(" Verbose mode: print the above plus a list of objects and warnings\n");
- printf(" Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)\n");
+ printf(" Modes of output:\n");
  printf("\n");
- printf("Examples of use:\n");
+ printf("  Default mode: print the number of differences found and where they occured\n");
+ 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("\n");
- printf("1) h5diff file1 file2 /g1/dset1 /g1/dset2\n");
+
+ printf(" Return exit code:\n");
  printf("\n");
- printf("   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2\n");
+ printf("  1 if differences found, 0 if no differences, -1 if error\n");
+
  printf("\n");
- printf("2) h5diff file1 file2 /g1/dset1\n");
+
+ printf(" Examples of use:\n");
  printf("\n");
- printf("   Compares object '/g1/dset1' in both files\n");
+ printf(" 1) h5diff file1 file2 /g1/dset1 /g1/dset2\n");
  printf("\n");
- printf("3) h5diff file1 file2\n");
+ printf("    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2\n");
  printf("\n");
- printf("   Compares all objects in both files\n");
+ printf(" 2) h5diff file1 file2 /g1/dset1\n");
  printf("\n");
- printf("Note)  file1 and file2 can be the same file. Use\n");
+ printf("    Compares object '/g1/dset1' in both files\n");
  printf("\n");
- printf("   h5diff file1 file1 /g1/dset1 /g1/dset2\n");
+ printf(" 3) h5diff file1 file2\n");
  printf("\n");
- printf("   to compare '/g1/dset1' and '/g1/dset2' in the same file\n");
+ printf("    Compares all objects in both files\n");
  printf("\n");
- printf("If no objects are specified, h5diff only compares objects with the same ");
- printf("absolute path in both files. The compare criteria is: ");
- printf("1) datasets: numerical array differences 2) groups: name string difference ");
- printf("3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value\n");
+ printf(" Note)  file1 and file2 can be the same file. Use\n");
+ printf("\n");
+ printf("    h5diff file1 file1 /g1/dset1 /g1/dset2\n");
+ printf("\n");
+ printf("    to compare '/g1/dset1' and '/g1/dset2' in the same file\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. The compare criteria is:\n");
+ printf("   1) datasets: numerical array differences 2) groups: name string difference\n");
+ printf("   3) datatypes: the return value of H5Tequal 2) links: name string difference\n");
+ printf("   of the linked value\n");
 
 }
 
diff --git a/tools/h5diff/h5diff_main.c b/tools/h5diff/h5diff_main.c
index e7795c6..06d4d11 100644
--- a/tools/h5diff/h5diff_main.c
+++ b/tools/h5diff/h5diff_main.c
@@ -79,9 +79,9 @@ int main(int argc, const char *argv[])
 
     print_info(&options);
 
-    /*-------------------------------------------------------------------------
+   /*-------------------------------------------------------------------------
     * exit code
-    *   >0 if differences, 0 if no differences, <0 if error
+    *   1 if differences, 0 if no differences, -1 if error
     *-------------------------------------------------------------------------
     */
 
diff --git a/tools/testfiles/h5diff_10.txt b/tools/testfiles/h5diff_10.txt
index cc20357..6a6dbae 100644
--- a/tools/testfiles/h5diff_10.txt
+++ b/tools/testfiles/h5diff_10.txt
@@ -20,30 +20,39 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   D - is a positive number. Compare criteria is |a - b| > D
   R - is a positive number. Compare criteria is |(b-a)/a| > R
 
-h5diff has four modes of output:
- Normal mode: print the number of differences found and where they occured
- Report mode: print the above plus the differences
- Verbose mode: print the above plus a list of objects and warnings
- Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
+ Modes of output:
 
-Examples of use:
+  Default mode: print the number of differences found and where they occured
+  -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
 
-1) h5diff file1 file2 /g1/dset1 /g1/dset2
+ Return exit code:
 
-   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
+  1 if differences found, 0 if no differences, -1 if error
 
-2) h5diff file1 file2 /g1/dset1
+ Examples of use:
 
-   Compares object '/g1/dset1' in both files
+ 1) h5diff file1 file2 /g1/dset1 /g1/dset2
 
-3) h5diff file1 file2
+    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
 
-   Compares all objects in both files
+ 2) h5diff file1 file2 /g1/dset1
 
-Note)  file1 and file2 can be the same file. Use
+    Compares object '/g1/dset1' in both files
 
-   h5diff file1 file1 /g1/dset1 /g1/dset2
+ 3) h5diff file1 file2
 
-   to compare '/g1/dset1' and '/g1/dset2' in the same file
+    Compares all objects in both files
 
-If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value
+ Note)  file1 and file2 can be the same file. Use
+
+    h5diff file1 file1 /g1/dset1 /g1/dset2
+
+    to compare '/g1/dset1' and '/g1/dset2' in the same file
+
+ If no objects [obj1[obj2]] are specified, h5diff only compares objects
+   with the same absolute path in both files. The compare criteria is:
+   1) datasets: numerical array differences 2) groups: name string difference
+   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   of the linked value
diff --git a/tools/testfiles/h5diff_600.txt b/tools/testfiles/h5diff_600.txt
index d108d9a..56cc052 100644
--- a/tools/testfiles/h5diff_600.txt
+++ b/tools/testfiles/h5diff_600.txt
@@ -20,31 +20,40 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   D - is a positive number. Compare criteria is |a - b| > D
   R - is a positive number. Compare criteria is |(b-a)/a| > R
 
-h5diff has four modes of output:
- Normal mode: print the number of differences found and where they occured
- Report mode: print the above plus the differences
- Verbose mode: print the above plus a list of objects and warnings
- Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
+ Modes of output:
 
-Examples of use:
+  Default mode: print the number of differences found and where they occured
+  -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
 
-1) h5diff file1 file2 /g1/dset1 /g1/dset2
+ Return exit code:
 
-   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
+  1 if differences found, 0 if no differences, -1 if error
 
-2) h5diff file1 file2 /g1/dset1
+ Examples of use:
 
-   Compares object '/g1/dset1' in both files
+ 1) h5diff file1 file2 /g1/dset1 /g1/dset2
 
-3) h5diff file1 file2
+    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
 
-   Compares all objects in both files
+ 2) h5diff file1 file2 /g1/dset1
 
-Note)  file1 and file2 can be the same file. Use
+    Compares object '/g1/dset1' in both files
 
-   h5diff file1 file1 /g1/dset1 /g1/dset2
+ 3) h5diff file1 file2
 
-   to compare '/g1/dset1' and '/g1/dset2' in the same file
+    Compares all objects in both files
 
-If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value
+ Note)  file1 and file2 can be the same file. Use
+
+    h5diff file1 file1 /g1/dset1 /g1/dset2
+
+    to compare '/g1/dset1' and '/g1/dset2' in the same file
+
+ If no objects [obj1[obj2]] are specified, h5diff only compares objects
+   with the same absolute path in both files. The compare criteria is:
+   1) datasets: numerical array differences 2) groups: name string difference
+   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   of the linked value
 h5diff error: missing file names
diff --git a/tools/testfiles/h5diff_602.txt b/tools/testfiles/h5diff_602.txt
index 318e91b..cc522bd 100644
--- a/tools/testfiles/h5diff_602.txt
+++ b/tools/testfiles/h5diff_602.txt
@@ -21,30 +21,39 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   D - is a positive number. Compare criteria is |a - b| > D
   R - is a positive number. Compare criteria is |(b-a)/a| > R
 
-h5diff has four modes of output:
- Normal mode: print the number of differences found and where they occured
- Report mode: print the above plus the differences
- Verbose mode: print the above plus a list of objects and warnings
- Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
+ Modes of output:
 
-Examples of use:
+  Default mode: print the number of differences found and where they occured
+  -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
 
-1) h5diff file1 file2 /g1/dset1 /g1/dset2
+ Return exit code:
 
-   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
+  1 if differences found, 0 if no differences, -1 if error
 
-2) h5diff file1 file2 /g1/dset1
+ Examples of use:
 
-   Compares object '/g1/dset1' in both files
+ 1) h5diff file1 file2 /g1/dset1 /g1/dset2
 
-3) h5diff file1 file2
+    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
 
-   Compares all objects in both files
+ 2) h5diff file1 file2 /g1/dset1
 
-Note)  file1 and file2 can be the same file. Use
+    Compares object '/g1/dset1' in both files
 
-   h5diff file1 file1 /g1/dset1 /g1/dset2
+ 3) h5diff file1 file2
 
-   to compare '/g1/dset1' and '/g1/dset2' in the same file
+    Compares all objects in both files
 
-If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value
+ Note)  file1 and file2 can be the same file. Use
+
+    h5diff file1 file1 /g1/dset1 /g1/dset2
+
+    to compare '/g1/dset1' and '/g1/dset2' in the same file
+
+ If no objects [obj1[obj2]] are specified, h5diff only compares objects
+   with the same absolute path in both files. The compare criteria is:
+   1) datasets: numerical array differences 2) groups: name string difference
+   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   of the linked value
diff --git a/tools/testfiles/h5diff_603.txt b/tools/testfiles/h5diff_603.txt
index c1f1af2..352e75e 100644
--- a/tools/testfiles/h5diff_603.txt
+++ b/tools/testfiles/h5diff_603.txt
@@ -21,30 +21,39 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   D - is a positive number. Compare criteria is |a - b| > D
   R - is a positive number. Compare criteria is |(b-a)/a| > R
 
-h5diff has four modes of output:
- Normal mode: print the number of differences found and where they occured
- Report mode: print the above plus the differences
- Verbose mode: print the above plus a list of objects and warnings
- Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
+ Modes of output:
 
-Examples of use:
+  Default mode: print the number of differences found and where they occured
+  -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
 
-1) h5diff file1 file2 /g1/dset1 /g1/dset2
+ Return exit code:
 
-   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
+  1 if differences found, 0 if no differences, -1 if error
 
-2) h5diff file1 file2 /g1/dset1
+ Examples of use:
 
-   Compares object '/g1/dset1' in both files
+ 1) h5diff file1 file2 /g1/dset1 /g1/dset2
 
-3) h5diff file1 file2
+    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
 
-   Compares all objects in both files
+ 2) h5diff file1 file2 /g1/dset1
 
-Note)  file1 and file2 can be the same file. Use
+    Compares object '/g1/dset1' in both files
 
-   h5diff file1 file1 /g1/dset1 /g1/dset2
+ 3) h5diff file1 file2
 
-   to compare '/g1/dset1' and '/g1/dset2' in the same file
+    Compares all objects in both files
 
-If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value
+ Note)  file1 and file2 can be the same file. Use
+
+    h5diff file1 file1 /g1/dset1 /g1/dset2
+
+    to compare '/g1/dset1' and '/g1/dset2' in the same file
+
+ If no objects [obj1[obj2]] are specified, h5diff only compares objects
+   with the same absolute path in both files. The compare criteria is:
+   1) datasets: numerical array differences 2) groups: name string difference
+   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   of the linked value
diff --git a/tools/testfiles/h5diff_604.txt b/tools/testfiles/h5diff_604.txt
index 898e32b..dde3f37 100644
--- a/tools/testfiles/h5diff_604.txt
+++ b/tools/testfiles/h5diff_604.txt
@@ -21,30 +21,39 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   D - is a positive number. Compare criteria is |a - b| > D
   R - is a positive number. Compare criteria is |(b-a)/a| > R
 
-h5diff has four modes of output:
- Normal mode: print the number of differences found and where they occured
- Report mode: print the above plus the differences
- Verbose mode: print the above plus a list of objects and warnings
- Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
+ Modes of output:
 
-Examples of use:
+  Default mode: print the number of differences found and where they occured
+  -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
 
-1) h5diff file1 file2 /g1/dset1 /g1/dset2
+ Return exit code:
 
-   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
+  1 if differences found, 0 if no differences, -1 if error
 
-2) h5diff file1 file2 /g1/dset1
+ Examples of use:
 
-   Compares object '/g1/dset1' in both files
+ 1) h5diff file1 file2 /g1/dset1 /g1/dset2
 
-3) h5diff file1 file2
+    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
 
-   Compares all objects in both files
+ 2) h5diff file1 file2 /g1/dset1
 
-Note)  file1 and file2 can be the same file. Use
+    Compares object '/g1/dset1' in both files
 
-   h5diff file1 file1 /g1/dset1 /g1/dset2
+ 3) h5diff file1 file2
 
-   to compare '/g1/dset1' and '/g1/dset2' in the same file
+    Compares all objects in both files
 
-If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value
+ Note)  file1 and file2 can be the same file. Use
+
+    h5diff file1 file1 /g1/dset1 /g1/dset2
+
+    to compare '/g1/dset1' and '/g1/dset2' in the same file
+
+ If no objects [obj1[obj2]] are specified, h5diff only compares objects
+   with the same absolute path in both files. The compare criteria is:
+   1) datasets: numerical array differences 2) groups: name string difference
+   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   of the linked value
diff --git a/tools/testfiles/h5diff_605.txt b/tools/testfiles/h5diff_605.txt
index be291ba..8047b46 100644
--- a/tools/testfiles/h5diff_605.txt
+++ b/tools/testfiles/h5diff_605.txt
@@ -21,30 +21,39 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   D - is a positive number. Compare criteria is |a - b| > D
   R - is a positive number. Compare criteria is |(b-a)/a| > R
 
-h5diff has four modes of output:
- Normal mode: print the number of differences found and where they occured
- Report mode: print the above plus the differences
- Verbose mode: print the above plus a list of objects and warnings
- Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
+ Modes of output:
 
-Examples of use:
+  Default mode: print the number of differences found and where they occured
+  -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
 
-1) h5diff file1 file2 /g1/dset1 /g1/dset2
+ Return exit code:
 
-   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
+  1 if differences found, 0 if no differences, -1 if error
 
-2) h5diff file1 file2 /g1/dset1
+ Examples of use:
 
-   Compares object '/g1/dset1' in both files
+ 1) h5diff file1 file2 /g1/dset1 /g1/dset2
 
-3) h5diff file1 file2
+    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
 
-   Compares all objects in both files
+ 2) h5diff file1 file2 /g1/dset1
 
-Note)  file1 and file2 can be the same file. Use
+    Compares object '/g1/dset1' in both files
 
-   h5diff file1 file1 /g1/dset1 /g1/dset2
+ 3) h5diff file1 file2
 
-   to compare '/g1/dset1' and '/g1/dset2' in the same file
+    Compares all objects in both files
 
-If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value
+ Note)  file1 and file2 can be the same file. Use
+
+    h5diff file1 file1 /g1/dset1 /g1/dset2
+
+    to compare '/g1/dset1' and '/g1/dset2' in the same file
+
+ If no objects [obj1[obj2]] are specified, h5diff only compares objects
+   with the same absolute path in both files. The compare criteria is:
+   1) datasets: numerical array differences 2) groups: name string difference
+   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   of the linked value
diff --git a/tools/testfiles/h5diff_606.txt b/tools/testfiles/h5diff_606.txt
index c59f386..d1d83a1 100644
--- a/tools/testfiles/h5diff_606.txt
+++ b/tools/testfiles/h5diff_606.txt
@@ -21,30 +21,39 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   D - is a positive number. Compare criteria is |a - b| > D
   R - is a positive number. Compare criteria is |(b-a)/a| > R
 
-h5diff has four modes of output:
- Normal mode: print the number of differences found and where they occured
- Report mode: print the above plus the differences
- Verbose mode: print the above plus a list of objects and warnings
- Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
+ Modes of output:
 
-Examples of use:
+  Default mode: print the number of differences found and where they occured
+  -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
 
-1) h5diff file1 file2 /g1/dset1 /g1/dset2
+ Return exit code:
 
-   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
+  1 if differences found, 0 if no differences, -1 if error
 
-2) h5diff file1 file2 /g1/dset1
+ Examples of use:
 
-   Compares object '/g1/dset1' in both files
+ 1) h5diff file1 file2 /g1/dset1 /g1/dset2
 
-3) h5diff file1 file2
+    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
 
-   Compares all objects in both files
+ 2) h5diff file1 file2 /g1/dset1
 
-Note)  file1 and file2 can be the same file. Use
+    Compares object '/g1/dset1' in both files
 
-   h5diff file1 file1 /g1/dset1 /g1/dset2
+ 3) h5diff file1 file2
 
-   to compare '/g1/dset1' and '/g1/dset2' in the same file
+    Compares all objects in both files
 
-If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value
+ Note)  file1 and file2 can be the same file. Use
+
+    h5diff file1 file1 /g1/dset1 /g1/dset2
+
+    to compare '/g1/dset1' and '/g1/dset2' in the same file
+
+ If no objects [obj1[obj2]] are specified, h5diff only compares objects
+   with the same absolute path in both files. The compare criteria is:
+   1) datasets: numerical array differences 2) groups: name string difference
+   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   of the linked value
diff --git a/tools/testfiles/h5diff_611.txt b/tools/testfiles/h5diff_611.txt
index dc861ab..0b148a0 100644
--- a/tools/testfiles/h5diff_611.txt
+++ b/tools/testfiles/h5diff_611.txt
@@ -21,30 +21,39 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   D - is a positive number. Compare criteria is |a - b| > D
   R - is a positive number. Compare criteria is |(b-a)/a| > R
 
-h5diff has four modes of output:
- Normal mode: print the number of differences found and where they occured
- Report mode: print the above plus the differences
- Verbose mode: print the above plus a list of objects and warnings
- Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
+ Modes of output:
 
-Examples of use:
+  Default mode: print the number of differences found and where they occured
+  -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
 
-1) h5diff file1 file2 /g1/dset1 /g1/dset2
+ Return exit code:
 
-   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
+  1 if differences found, 0 if no differences, -1 if error
 
-2) h5diff file1 file2 /g1/dset1
+ Examples of use:
 
-   Compares object '/g1/dset1' in both files
+ 1) h5diff file1 file2 /g1/dset1 /g1/dset2
 
-3) h5diff file1 file2
+    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
 
-   Compares all objects in both files
+ 2) h5diff file1 file2 /g1/dset1
 
-Note)  file1 and file2 can be the same file. Use
+    Compares object '/g1/dset1' in both files
 
-   h5diff file1 file1 /g1/dset1 /g1/dset2
+ 3) h5diff file1 file2
 
-   to compare '/g1/dset1' and '/g1/dset2' in the same file
+    Compares all objects in both files
 
-If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value
+ Note)  file1 and file2 can be the same file. Use
+
+    h5diff file1 file1 /g1/dset1 /g1/dset2
+
+    to compare '/g1/dset1' and '/g1/dset2' in the same file
+
+ If no objects [obj1[obj2]] are specified, h5diff only compares objects
+   with the same absolute path in both files. The compare criteria is:
+   1) datasets: numerical array differences 2) groups: name string difference
+   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   of the linked value
diff --git a/tools/testfiles/h5diff_612.txt b/tools/testfiles/h5diff_612.txt
index a694dde..2aa4804 100644
--- a/tools/testfiles/h5diff_612.txt
+++ b/tools/testfiles/h5diff_612.txt
@@ -21,30 +21,39 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   D - is a positive number. Compare criteria is |a - b| > D
   R - is a positive number. Compare criteria is |(b-a)/a| > R
 
-h5diff has four modes of output:
- Normal mode: print the number of differences found and where they occured
- Report mode: print the above plus the differences
- Verbose mode: print the above plus a list of objects and warnings
- Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
+ Modes of output:
 
-Examples of use:
+  Default mode: print the number of differences found and where they occured
+  -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
 
-1) h5diff file1 file2 /g1/dset1 /g1/dset2
+ Return exit code:
 
-   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
+  1 if differences found, 0 if no differences, -1 if error
 
-2) h5diff file1 file2 /g1/dset1
+ Examples of use:
 
-   Compares object '/g1/dset1' in both files
+ 1) h5diff file1 file2 /g1/dset1 /g1/dset2
 
-3) h5diff file1 file2
+    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
 
-   Compares all objects in both files
+ 2) h5diff file1 file2 /g1/dset1
 
-Note)  file1 and file2 can be the same file. Use
+    Compares object '/g1/dset1' in both files
 
-   h5diff file1 file1 /g1/dset1 /g1/dset2
+ 3) h5diff file1 file2
 
-   to compare '/g1/dset1' and '/g1/dset2' in the same file
+    Compares all objects in both files
 
-If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value
+ Note)  file1 and file2 can be the same file. Use
+
+    h5diff file1 file1 /g1/dset1 /g1/dset2
+
+    to compare '/g1/dset1' and '/g1/dset2' in the same file
+
+ If no objects [obj1[obj2]] are specified, h5diff only compares objects
+   with the same absolute path in both files. The compare criteria is:
+   1) datasets: numerical array differences 2) groups: name string difference
+   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   of the linked value
diff --git a/tools/testfiles/h5diff_613.txt b/tools/testfiles/h5diff_613.txt
index 4e36094..dff7f7c 100644
--- a/tools/testfiles/h5diff_613.txt
+++ b/tools/testfiles/h5diff_613.txt
@@ -21,30 +21,39 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   D - is a positive number. Compare criteria is |a - b| > D
   R - is a positive number. Compare criteria is |(b-a)/a| > R
 
-h5diff has four modes of output:
- Normal mode: print the number of differences found and where they occured
- Report mode: print the above plus the differences
- Verbose mode: print the above plus a list of objects and warnings
- Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
+ Modes of output:
 
-Examples of use:
+  Default mode: print the number of differences found and where they occured
+  -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
 
-1) h5diff file1 file2 /g1/dset1 /g1/dset2
+ Return exit code:
 
-   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
+  1 if differences found, 0 if no differences, -1 if error
 
-2) h5diff file1 file2 /g1/dset1
+ Examples of use:
 
-   Compares object '/g1/dset1' in both files
+ 1) h5diff file1 file2 /g1/dset1 /g1/dset2
 
-3) h5diff file1 file2
+    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
 
-   Compares all objects in both files
+ 2) h5diff file1 file2 /g1/dset1
 
-Note)  file1 and file2 can be the same file. Use
+    Compares object '/g1/dset1' in both files
 
-   h5diff file1 file1 /g1/dset1 /g1/dset2
+ 3) h5diff file1 file2
 
-   to compare '/g1/dset1' and '/g1/dset2' in the same file
+    Compares all objects in both files
 
-If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value
+ Note)  file1 and file2 can be the same file. Use
+
+    h5diff file1 file1 /g1/dset1 /g1/dset2
+
+    to compare '/g1/dset1' and '/g1/dset2' in the same file
+
+ If no objects [obj1[obj2]] are specified, h5diff only compares objects
+   with the same absolute path in both files. The compare criteria is:
+   1) datasets: numerical array differences 2) groups: name string difference
+   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   of the linked value
diff --git a/tools/testfiles/h5diff_614.txt b/tools/testfiles/h5diff_614.txt
index f0530e3..6090f4a 100644
--- a/tools/testfiles/h5diff_614.txt
+++ b/tools/testfiles/h5diff_614.txt
@@ -21,30 +21,39 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   D - is a positive number. Compare criteria is |a - b| > D
   R - is a positive number. Compare criteria is |(b-a)/a| > R
 
-h5diff has four modes of output:
- Normal mode: print the number of differences found and where they occured
- Report mode: print the above plus the differences
- Verbose mode: print the above plus a list of objects and warnings
- Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
+ Modes of output:
 
-Examples of use:
+  Default mode: print the number of differences found and where they occured
+  -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
 
-1) h5diff file1 file2 /g1/dset1 /g1/dset2
+ Return exit code:
 
-   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
+  1 if differences found, 0 if no differences, -1 if error
 
-2) h5diff file1 file2 /g1/dset1
+ Examples of use:
 
-   Compares object '/g1/dset1' in both files
+ 1) h5diff file1 file2 /g1/dset1 /g1/dset2
 
-3) h5diff file1 file2
+    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
 
-   Compares all objects in both files
+ 2) h5diff file1 file2 /g1/dset1
 
-Note)  file1 and file2 can be the same file. Use
+    Compares object '/g1/dset1' in both files
 
-   h5diff file1 file1 /g1/dset1 /g1/dset2
+ 3) h5diff file1 file2
 
-   to compare '/g1/dset1' and '/g1/dset2' in the same file
+    Compares all objects in both files
 
-If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value
+ Note)  file1 and file2 can be the same file. Use
+
+    h5diff file1 file1 /g1/dset1 /g1/dset2
+
+    to compare '/g1/dset1' and '/g1/dset2' in the same file
+
+ If no objects [obj1[obj2]] are specified, h5diff only compares objects
+   with the same absolute path in both files. The compare criteria is:
+   1) datasets: numerical array differences 2) groups: name string difference
+   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   of the linked value
diff --git a/tools/testfiles/h5diff_615.txt b/tools/testfiles/h5diff_615.txt
index eb45442..fe7f9a4 100644
--- a/tools/testfiles/h5diff_615.txt
+++ b/tools/testfiles/h5diff_615.txt
@@ -21,30 +21,39 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   D - is a positive number. Compare criteria is |a - b| > D
   R - is a positive number. Compare criteria is |(b-a)/a| > R
 
-h5diff has four modes of output:
- Normal mode: print the number of differences found and where they occured
- Report mode: print the above plus the differences
- Verbose mode: print the above plus a list of objects and warnings
- Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
+ Modes of output:
 
-Examples of use:
+  Default mode: print the number of differences found and where they occured
+  -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
 
-1) h5diff file1 file2 /g1/dset1 /g1/dset2
+ Return exit code:
 
-   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
+  1 if differences found, 0 if no differences, -1 if error
 
-2) h5diff file1 file2 /g1/dset1
+ Examples of use:
 
-   Compares object '/g1/dset1' in both files
+ 1) h5diff file1 file2 /g1/dset1 /g1/dset2
 
-3) h5diff file1 file2
+    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
 
-   Compares all objects in both files
+ 2) h5diff file1 file2 /g1/dset1
 
-Note)  file1 and file2 can be the same file. Use
+    Compares object '/g1/dset1' in both files
 
-   h5diff file1 file1 /g1/dset1 /g1/dset2
+ 3) h5diff file1 file2
 
-   to compare '/g1/dset1' and '/g1/dset2' in the same file
+    Compares all objects in both files
 
-If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value
+ Note)  file1 and file2 can be the same file. Use
+
+    h5diff file1 file1 /g1/dset1 /g1/dset2
+
+    to compare '/g1/dset1' and '/g1/dset2' in the same file
+
+ If no objects [obj1[obj2]] are specified, h5diff only compares objects
+   with the same absolute path in both files. The compare criteria is:
+   1) datasets: numerical array differences 2) groups: name string difference
+   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   of the linked value
diff --git a/tools/testfiles/h5diff_620.txt b/tools/testfiles/h5diff_620.txt
index 1707bb7..9221c76 100644
--- a/tools/testfiles/h5diff_620.txt
+++ b/tools/testfiles/h5diff_620.txt
@@ -21,30 +21,39 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   D - is a positive number. Compare criteria is |a - b| > D
   R - is a positive number. Compare criteria is |(b-a)/a| > R
 
-h5diff has four modes of output:
- Normal mode: print the number of differences found and where they occured
- Report mode: print the above plus the differences
- Verbose mode: print the above plus a list of objects and warnings
- Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
+ Modes of output:
 
-Examples of use:
+  Default mode: print the number of differences found and where they occured
+  -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
 
-1) h5diff file1 file2 /g1/dset1 /g1/dset2
+ Return exit code:
 
-   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
+  1 if differences found, 0 if no differences, -1 if error
 
-2) h5diff file1 file2 /g1/dset1
+ Examples of use:
 
-   Compares object '/g1/dset1' in both files
+ 1) h5diff file1 file2 /g1/dset1 /g1/dset2
 
-3) h5diff file1 file2
+    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
 
-   Compares all objects in both files
+ 2) h5diff file1 file2 /g1/dset1
 
-Note)  file1 and file2 can be the same file. Use
+    Compares object '/g1/dset1' in both files
 
-   h5diff file1 file1 /g1/dset1 /g1/dset2
+ 3) h5diff file1 file2
 
-   to compare '/g1/dset1' and '/g1/dset2' in the same file
+    Compares all objects in both files
 
-If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value
+ Note)  file1 and file2 can be the same file. Use
+
+    h5diff file1 file1 /g1/dset1 /g1/dset2
+
+    to compare '/g1/dset1' and '/g1/dset2' in the same file
+
+ If no objects [obj1[obj2]] are specified, h5diff only compares objects
+   with the same absolute path in both files. The compare criteria is:
+   1) datasets: numerical array differences 2) groups: name string difference
+   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   of the linked value
diff --git a/tools/testfiles/h5diff_621.txt b/tools/testfiles/h5diff_621.txt
index 39e4c48..e27b486 100644
--- a/tools/testfiles/h5diff_621.txt
+++ b/tools/testfiles/h5diff_621.txt
@@ -21,30 +21,39 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   D - is a positive number. Compare criteria is |a - b| > D
   R - is a positive number. Compare criteria is |(b-a)/a| > R
 
-h5diff has four modes of output:
- Normal mode: print the number of differences found and where they occured
- Report mode: print the above plus the differences
- Verbose mode: print the above plus a list of objects and warnings
- Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
+ Modes of output:
 
-Examples of use:
+  Default mode: print the number of differences found and where they occured
+  -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
 
-1) h5diff file1 file2 /g1/dset1 /g1/dset2
+ Return exit code:
 
-   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
+  1 if differences found, 0 if no differences, -1 if error
 
-2) h5diff file1 file2 /g1/dset1
+ Examples of use:
 
-   Compares object '/g1/dset1' in both files
+ 1) h5diff file1 file2 /g1/dset1 /g1/dset2
 
-3) h5diff file1 file2
+    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
 
-   Compares all objects in both files
+ 2) h5diff file1 file2 /g1/dset1
 
-Note)  file1 and file2 can be the same file. Use
+    Compares object '/g1/dset1' in both files
 
-   h5diff file1 file1 /g1/dset1 /g1/dset2
+ 3) h5diff file1 file2
 
-   to compare '/g1/dset1' and '/g1/dset2' in the same file
+    Compares all objects in both files
 
-If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value
+ Note)  file1 and file2 can be the same file. Use
+
+    h5diff file1 file1 /g1/dset1 /g1/dset2
+
+    to compare '/g1/dset1' and '/g1/dset2' in the same file
+
+ If no objects [obj1[obj2]] are specified, h5diff only compares objects
+   with the same absolute path in both files. The compare criteria is:
+   1) datasets: numerical array differences 2) groups: name string difference
+   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   of the linked value
diff --git a/tools/testfiles/h5diff_622.txt b/tools/testfiles/h5diff_622.txt
index aff6dee..4b6c1a1 100644
--- a/tools/testfiles/h5diff_622.txt
+++ b/tools/testfiles/h5diff_622.txt
@@ -21,30 +21,39 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   D - is a positive number. Compare criteria is |a - b| > D
   R - is a positive number. Compare criteria is |(b-a)/a| > R
 
-h5diff has four modes of output:
- Normal mode: print the number of differences found and where they occured
- Report mode: print the above plus the differences
- Verbose mode: print the above plus a list of objects and warnings
- Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
+ Modes of output:
 
-Examples of use:
+  Default mode: print the number of differences found and where they occured
+  -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
 
-1) h5diff file1 file2 /g1/dset1 /g1/dset2
+ Return exit code:
 
-   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
+  1 if differences found, 0 if no differences, -1 if error
 
-2) h5diff file1 file2 /g1/dset1
+ Examples of use:
 
-   Compares object '/g1/dset1' in both files
+ 1) h5diff file1 file2 /g1/dset1 /g1/dset2
 
-3) h5diff file1 file2
+    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
 
-   Compares all objects in both files
+ 2) h5diff file1 file2 /g1/dset1
 
-Note)  file1 and file2 can be the same file. Use
+    Compares object '/g1/dset1' in both files
 
-   h5diff file1 file1 /g1/dset1 /g1/dset2
+ 3) h5diff file1 file2
 
-   to compare '/g1/dset1' and '/g1/dset2' in the same file
+    Compares all objects in both files
 
-If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value
+ Note)  file1 and file2 can be the same file. Use
+
+    h5diff file1 file1 /g1/dset1 /g1/dset2
+
+    to compare '/g1/dset1' and '/g1/dset2' in the same file
+
+ If no objects [obj1[obj2]] are specified, h5diff only compares objects
+   with the same absolute path in both files. The compare criteria is:
+   1) datasets: numerical array differences 2) groups: name string difference
+   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   of the linked value
diff --git a/tools/testfiles/h5diff_623.txt b/tools/testfiles/h5diff_623.txt
index 4d1c6fa..f4edf37 100644
--- a/tools/testfiles/h5diff_623.txt
+++ b/tools/testfiles/h5diff_623.txt
@@ -21,30 +21,39 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   D - is a positive number. Compare criteria is |a - b| > D
   R - is a positive number. Compare criteria is |(b-a)/a| > R
 
-h5diff has four modes of output:
- Normal mode: print the number of differences found and where they occured
- Report mode: print the above plus the differences
- Verbose mode: print the above plus a list of objects and warnings
- Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
+ Modes of output:
 
-Examples of use:
+  Default mode: print the number of differences found and where they occured
+  -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
 
-1) h5diff file1 file2 /g1/dset1 /g1/dset2
+ Return exit code:
 
-   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
+  1 if differences found, 0 if no differences, -1 if error
 
-2) h5diff file1 file2 /g1/dset1
+ Examples of use:
 
-   Compares object '/g1/dset1' in both files
+ 1) h5diff file1 file2 /g1/dset1 /g1/dset2
 
-3) h5diff file1 file2
+    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
 
-   Compares all objects in both files
+ 2) h5diff file1 file2 /g1/dset1
 
-Note)  file1 and file2 can be the same file. Use
+    Compares object '/g1/dset1' in both files
 
-   h5diff file1 file1 /g1/dset1 /g1/dset2
+ 3) h5diff file1 file2
 
-   to compare '/g1/dset1' and '/g1/dset2' in the same file
+    Compares all objects in both files
 
-If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value
+ Note)  file1 and file2 can be the same file. Use
+
+    h5diff file1 file1 /g1/dset1 /g1/dset2
+
+    to compare '/g1/dset1' and '/g1/dset2' in the same file
+
+ If no objects [obj1[obj2]] are specified, h5diff only compares objects
+   with the same absolute path in both files. The compare criteria is:
+   1) datasets: numerical array differences 2) groups: name string difference
+   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   of the linked value
diff --git a/tools/testfiles/h5diff_624.txt b/tools/testfiles/h5diff_624.txt
index 1cba110..babc43f 100644
--- a/tools/testfiles/h5diff_624.txt
+++ b/tools/testfiles/h5diff_624.txt
@@ -21,30 +21,39 @@ usage: h5diff [OPTIONS] file1 file2 [obj1[obj2]]
   D - is a positive number. Compare criteria is |a - b| > D
   R - is a positive number. Compare criteria is |(b-a)/a| > R
 
-h5diff has four modes of output:
- Normal mode: print the number of differences found and where they occured
- Report mode: print the above plus the differences
- Verbose mode: print the above plus a list of objects and warnings
- Quiet mode: do not print output (h5diff always returns an exit code of 1 when differences are found)
+ Modes of output:
 
-Examples of use:
+  Default mode: print the number of differences found and where they occured
+  -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
 
-1) h5diff file1 file2 /g1/dset1 /g1/dset2
+ Return exit code:
 
-   Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
+  1 if differences found, 0 if no differences, -1 if error
 
-2) h5diff file1 file2 /g1/dset1
+ Examples of use:
 
-   Compares object '/g1/dset1' in both files
+ 1) h5diff file1 file2 /g1/dset1 /g1/dset2
 
-3) h5diff file1 file2
+    Compares object '/g1/dset1' in file1 with '/g1/dset2' in file2
 
-   Compares all objects in both files
+ 2) h5diff file1 file2 /g1/dset1
 
-Note)  file1 and file2 can be the same file. Use
+    Compares object '/g1/dset1' in both files
 
-   h5diff file1 file1 /g1/dset1 /g1/dset2
+ 3) h5diff file1 file2
 
-   to compare '/g1/dset1' and '/g1/dset2' in the same file
+    Compares all objects in both files
 
-If no objects are specified, h5diff only compares objects with the same absolute path in both files. The compare criteria is: 1) datasets: numerical array differences 2) groups: name string difference 3) datatypes: the return value of H5Tequal 2) links: name string difference of the linked value
+ Note)  file1 and file2 can be the same file. Use
+
+    h5diff file1 file1 /g1/dset1 /g1/dset2
+
+    to compare '/g1/dset1' and '/g1/dset2' in the same file
+
+ If no objects [obj1[obj2]] are specified, h5diff only compares objects
+   with the same absolute path in both files. The compare criteria is:
+   1) datasets: numerical array differences 2) groups: name string difference
+   3) datatypes: the return value of H5Tequal 2) links: name string difference
+   of the linked value