Normalizes the public headers (#3292)

* Also brings over the apostrophe fix

3 files changed, 32 insertions, 35 deletions

diff --git a/tools/src/misc/h5clear.c b/tools/src/misc/h5clear.c
index faf7d94..4a2b07d 100644
--- a/tools/src/misc/h5clear.c
+++ b/tools/src/misc/h5clear.c
@@ -61,39 +61,36 @@ static struct h5_long_options l_opts[] = {
 static void
 usage(const char *prog)
 {
-    HDfprintf(stdout, "usage: %s [OPTIONS] file_name\n", prog);
-    HDfprintf(stdout, "  OPTIONS\n");
-    HDfprintf(stdout, "   -h, --help                Print a usage message and exit\n");
-    HDfprintf(stdout, "   -V, --version             Print version number and exit\n");
-    HDfprintf(stdout, "   -s, --status              Clear the status_flags field in the file's superblock\n");
-    HDfprintf(stdout, "   -m, --image               Remove the metadata cache image from the file\n");
-    HDfprintf(stdout, "   --filesize                Print the file's EOA and EOF\n");
-    HDfprintf(stdout,
-              "   --increment=C             Set the file's EOA to the maximum of (EOA, EOF) + C for\n");
-    HDfprintf(stdout, "                             the file <file_name>.\n");
-    HDfprintf(stdout,
-              "                             C is >= 0; C is optional and will default to 1M when not set.\n");
-    HDfprintf(
-        stdout,
-        "                             This option helps to repair a crashed file where the stored EOA\n");
-    HDfprintf(stdout, "                             in the superblock is different from the actual EOF.\n");
-    HDfprintf(stdout,
-              "                             The file’s EOA and EOF will be the same after applying\n");
-    HDfprintf(stdout, "                             this option to the file.\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "Examples of use:\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "h5clear -s file_name\n");
-    HDfprintf(stdout, "  Clear the status_flags field in the superblock of the HDF5 file <file_name>.\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "h5clear -m file_name\n");
-    HDfprintf(stdout, "  Remove the metadata cache image from the HDF5 file <file_name>.\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "h5clear --increment file_name\n");
-    HDfprintf(stdout, "  Set the EOA to the maximum of (EOA, EOF) + 1M for the file <file_name>.\n");
-    HDfprintf(stdout, "\n");
-    HDfprintf(stdout, "h5clear --increment=512 file_name\n");
-    HDfprintf(stdout, "  Set the EOA to the maximum of (EOA, EOF) + 512 for the file <file_name>.\n");
+    fprintf(stdout, "usage: %s [OPTIONS] file_name\n", prog);
+    fprintf(stdout, "  OPTIONS\n");
+    fprintf(stdout, "   -h, --help                Print a usage message and exit\n");
+    fprintf(stdout, "   -V, --version             Print version number and exit\n");
+    fprintf(stdout, "   -s, --status              Clear the status_flags field in the file's superblock\n");
+    fprintf(stdout, "   -m, --image               Remove the metadata cache image from the file\n");
+    fprintf(stdout, "   --filesize                Print the file's EOA and EOF\n");
+    fprintf(stdout, "   --increment=C             Set the file's EOA to the maximum of (EOA, EOF) + C for\n");
+    fprintf(stdout, "                             the file <file_name>.\n");
+    fprintf(stdout,
+            "                             C is >= 0; C is optional and will default to 1M when not set.\n");
+    fprintf(stdout,
+            "                             This option helps to repair a crashed file where the stored EOA\n");
+    fprintf(stdout, "                             in the superblock is different from the actual EOF.\n");
+    fprintf(stdout, "                             The file's EOA and EOF will be the same after applying\n");
+    fprintf(stdout, "                             this option to the file.\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "Examples of use:\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "h5clear -s file_name\n");
+    fprintf(stdout, "  Clear the status_flags field in the superblock of the HDF5 file <file_name>.\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "h5clear -m file_name\n");
+    fprintf(stdout, "  Remove the metadata cache image from the HDF5 file <file_name>.\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "h5clear --increment file_name\n");
+    fprintf(stdout, "  Set the EOA to the maximum of (EOA, EOF) + 1M for the file <file_name>.\n");
+    fprintf(stdout, "\n");
+    fprintf(stdout, "h5clear --increment=512 file_name\n");
+    fprintf(stdout, "  Set the EOA to the maximum of (EOA, EOF) + 512 for the file <file_name>.\n");
 } /* usage() */
 
 /*-------------------------------------------------------------------------
diff --git a/tools/test/misc/testfiles/h5clear_missing_file.ddl b/tools/test/misc/testfiles/h5clear_missing_file.ddl
index c4d21c9..c7a2118 100644
--- a/tools/test/misc/testfiles/h5clear_missing_file.ddl
+++ b/tools/test/misc/testfiles/h5clear_missing_file.ddl
@@ -10,7 +10,7 @@ usage: h5clear [OPTIONS] file_name
                              C is >= 0; C is optional and will default to 1M when not set.
                              This option helps to repair a crashed file where the stored EOA
                              in the superblock is different from the actual EOF.
-                             The file’s EOA and EOF will be the same after applying
+                             The file's EOA and EOF will be the same after applying
                              this option to the file.
 
 Examples of use:
diff --git a/tools/test/misc/testfiles/h5clear_usage.ddl b/tools/test/misc/testfiles/h5clear_usage.ddl
index c4d21c9..c7a2118 100644
--- a/tools/test/misc/testfiles/h5clear_usage.ddl
+++ b/tools/test/misc/testfiles/h5clear_usage.ddl
@@ -10,7 +10,7 @@ usage: h5clear [OPTIONS] file_name
                              C is >= 0; C is optional and will default to 1M when not set.
                              This option helps to repair a crashed file where the stored EOA
                              in the superblock is different from the actual EOF.
-                             The file’s EOA and EOF will be the same after applying
+                             The file's EOA and EOF will be the same after applying
                              this option to the file.
 
 Examples of use: