Merge branch 'hdf5_1_10' of https://github.com/HDFGroup/hdf5 into hdf5_1_10

11 files changed, 25 insertions, 25 deletions

diff --git a/java/test/TestH5E.java b/java/test/TestH5E.java
index ad50d62..ec46095 100644
--- a/java/test/TestH5E.java
+++ b/java/test/TestH5E.java
@@ -94,7 +94,7 @@ public class TestH5E {
                 fail("H5.H5Eget_msg(Throwable): " + err);
             }
             assertNotNull("H5.H5Eget_msg: " + msg, msg);
-            assertEquals("H5.H5Eget_msg: ", "Object atom", msg);
+            assertTrue("H5.H5Eget_msg: ", msg.contains("Object atom"));
             assertEquals("H5.H5Eget_msg: ", HDF5Constants.H5E_MAJOR, error_msg_type[0]);
         }
         catch (Throwable err) {
@@ -121,7 +121,7 @@ public class TestH5E {
                 fail("H5.H5Eget_msg: " + err);
             }
             assertNotNull("H5.H5Eget_msg: " + msg, msg);
-            assertEquals("H5.H5Eget_msg: ", "Unable to find atom information (already closed?)", msg);
+            assertTrue("H5.H5Eget_msg: ", msg.contains("Unable to find atom information (already closed?)"));
             assertEquals("H5.H5Eget_msg: ", HDF5Constants.H5E_MINOR, error_msg_type[0]);
         }
         catch (Throwable err) {
diff --git a/tools/src/h5dump/h5dump.c b/tools/src/h5dump/h5dump.c
index 8bace61..9328490 100644
--- a/tools/src/h5dump/h5dump.c
+++ b/tools/src/h5dump/h5dump.c
@@ -250,7 +250,7 @@ usage(const char *prog)
                    "                          <cred> :: \"(<aws-region>,<access-id>,<access-key>)\"\n");
     PRINTVALSTREAM(rawoutstream,
                    "                          If absent or <cred> -> \"(,,)\", no authentication.\n");
-    PRINTVALSTREAM(rawoutstream, "                          Has no effect is filedriver is not `ros3'.\n");
+    PRINTVALSTREAM(rawoutstream, "                          Has no effect if filedriver is not \"ros3\".\n");
     PRINTVALSTREAM(rawoutstream,
                    "     --hdfs-attrs=<attrs> Supply configuration information for HDFS file access.\n");
     PRINTVALSTREAM(rawoutstream, "                          For use with \"--filedriver=hdfs\"\n");
@@ -323,7 +323,7 @@ usage(const char *prog)
     PRINTVALSTREAM(rawoutstream, "     -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML\n");
     PRINTVALSTREAM(rawoutstream, "                          \":\": no namespace, default: \"hdf5:\"\n");
     PRINTVALSTREAM(rawoutstream,
-                   "                          E.g., to dump a file called `-f', use h5dump -- -f\n");
+                   "                          E.g., to dump a file called \"-f\", use h5dump -- -f\n");
     PRINTVALSTREAM(rawoutstream, "\n");
     PRINTVALSTREAM(rawoutstream, "--------------- Subsetting Options ---------------\n");
     PRINTVALSTREAM(rawoutstream, " Subsetting is available by using the following options with a dataset\n");
@@ -1117,7 +1117,7 @@ parse_start:
 
             case 'M':
                 if (!last_was_dset) {
-                    error_msg("option `-%c' can only be used after --dataset option\n", opt);
+                    error_msg("option \"-%c\" can only be used after --dataset option\n", opt);
                     goto error;
                 }
                 if (parse_mask_list(opt_arg) != SUCCEED) {
@@ -1190,7 +1190,7 @@ parse_start:
                 struct subset_t *s;
 
                 if (!last_was_dset) {
-                    error_msg("option `-%c' can only be used after --dataset option\n", opt);
+                    error_msg("option \"-%c\" can only be used after --dataset option\n", opt);
                     goto error;
                 }
 
diff --git a/tools/src/misc/h5repart.c b/tools/src/misc/h5repart.c
index 6424384..65ceb4f 100644
--- a/tools/src/misc/h5repart.c
+++ b/tools/src/misc/h5repart.c
@@ -64,10 +64,10 @@ usage(const char *progname)
                       "(windows or sec2)\n");
     HDfprintf(stderr, "   SRC    The name of the source file\n");
     HDfprintf(stderr, "   DST    The name of the destination files\n");
-    HDfprintf(stderr, "Sizes may be suffixed with `g' for GB, `m' for MB or "
-                      "`k' for kB.\n");
+    HDfprintf(stderr, "Sizes may be suffixed with 'g' for GB, 'm' for MB or "
+                      "'k' for kB.\n");
     HDfprintf(stderr, "File family names include an integer printf "
-                      "format such as `%%d'\n");
+                      "format such as '%%d'\n");
     HDexit(EXIT_FAILURE);
 }
 
diff --git a/tools/testfiles/h5dump-help.txt b/tools/testfiles/h5dump-help.txt
index 95dfc3b..89160a3 100644
--- a/tools/testfiles/h5dump-help.txt
+++ b/tools/testfiles/h5dump-help.txt
@@ -15,7 +15,7 @@ usage: h5dump [OPTIONS] files
      --s3-cred=<cred>     Supply S3 authentication information to "ros3" vfd.
                           <cred> :: "(<aws-region>,<access-id>,<access-key>)"
                           If absent or <cred> -> "(,,)", no authentication.
-                          Has no effect is filedriver is not `ros3'.
+                          Has no effect if filedriver is not "ros3".
      --hdfs-attrs=<attrs> Supply configuration information for HDFS file access.
                           For use with "--filedriver=hdfs"
                           <attrs> :: (<namenode name>,<namenode port>,
@@ -67,7 +67,7 @@ usage: h5dump [OPTIONS] files
      -D U, --xml-dtd=U    Use the DTD or schema at U
      -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML
                           ":": no namespace, default: "hdf5:"
-                          E.g., to dump a file called `-f', use h5dump -- -f
+                          E.g., to dump a file called "-f", use h5dump -- -f
 
 --------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
diff --git a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
index 95dfc3b..89160a3 100644
--- a/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
+++ b/tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
@@ -15,7 +15,7 @@ usage: h5dump [OPTIONS] files
      --s3-cred=<cred>     Supply S3 authentication information to "ros3" vfd.
                           <cred> :: "(<aws-region>,<access-id>,<access-key>)"
                           If absent or <cred> -> "(,,)", no authentication.
-                          Has no effect is filedriver is not `ros3'.
+                          Has no effect if filedriver is not "ros3".
      --hdfs-attrs=<attrs> Supply configuration information for HDFS file access.
                           For use with "--filedriver=hdfs"
                           <attrs> :: (<namenode name>,<namenode port>,
@@ -67,7 +67,7 @@ usage: h5dump [OPTIONS] files
      -D U, --xml-dtd=U    Use the DTD or schema at U
      -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML
                           ":": no namespace, default: "hdf5:"
-                          E.g., to dump a file called `-f', use h5dump -- -f
+                          E.g., to dump a file called "-f", use h5dump -- -f
 
 --------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
diff --git a/tools/testfiles/pbits/tpbitsIncomplete.ddl b/tools/testfiles/pbits/tpbitsIncomplete.ddl
index 95dfc3b..89160a3 100644
--- a/tools/testfiles/pbits/tpbitsIncomplete.ddl
+++ b/tools/testfiles/pbits/tpbitsIncomplete.ddl
@@ -15,7 +15,7 @@ usage: h5dump [OPTIONS] files
      --s3-cred=<cred>     Supply S3 authentication information to "ros3" vfd.
                           <cred> :: "(<aws-region>,<access-id>,<access-key>)"
                           If absent or <cred> -> "(,,)", no authentication.
-                          Has no effect is filedriver is not `ros3'.
+                          Has no effect if filedriver is not "ros3".
      --hdfs-attrs=<attrs> Supply configuration information for HDFS file access.
                           For use with "--filedriver=hdfs"
                           <attrs> :: (<namenode name>,<namenode port>,
@@ -67,7 +67,7 @@ usage: h5dump [OPTIONS] files
      -D U, --xml-dtd=U    Use the DTD or schema at U
      -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML
                           ":": no namespace, default: "hdf5:"
-                          E.g., to dump a file called `-f', use h5dump -- -f
+                          E.g., to dump a file called "-f", use h5dump -- -f
 
 --------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
diff --git a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
index 95dfc3b..89160a3 100644
--- a/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsLengthExceeded.ddl
@@ -15,7 +15,7 @@ usage: h5dump [OPTIONS] files
      --s3-cred=<cred>     Supply S3 authentication information to "ros3" vfd.
                           <cred> :: "(<aws-region>,<access-id>,<access-key>)"
                           If absent or <cred> -> "(,,)", no authentication.
-                          Has no effect is filedriver is not `ros3'.
+                          Has no effect if filedriver is not "ros3".
      --hdfs-attrs=<attrs> Supply configuration information for HDFS file access.
                           For use with "--filedriver=hdfs"
                           <attrs> :: (<namenode name>,<namenode port>,
@@ -67,7 +67,7 @@ usage: h5dump [OPTIONS] files
      -D U, --xml-dtd=U    Use the DTD or schema at U
      -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML
                           ":": no namespace, default: "hdf5:"
-                          E.g., to dump a file called `-f', use h5dump -- -f
+                          E.g., to dump a file called "-f", use h5dump -- -f
 
 --------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
diff --git a/tools/testfiles/pbits/tpbitsLengthPositive.ddl b/tools/testfiles/pbits/tpbitsLengthPositive.ddl
index 95dfc3b..89160a3 100644
--- a/tools/testfiles/pbits/tpbitsLengthPositive.ddl
+++ b/tools/testfiles/pbits/tpbitsLengthPositive.ddl
@@ -15,7 +15,7 @@ usage: h5dump [OPTIONS] files
      --s3-cred=<cred>     Supply S3 authentication information to "ros3" vfd.
                           <cred> :: "(<aws-region>,<access-id>,<access-key>)"
                           If absent or <cred> -> "(,,)", no authentication.
-                          Has no effect is filedriver is not `ros3'.
+                          Has no effect if filedriver is not "ros3".
      --hdfs-attrs=<attrs> Supply configuration information for HDFS file access.
                           For use with "--filedriver=hdfs"
                           <attrs> :: (<namenode name>,<namenode port>,
@@ -67,7 +67,7 @@ usage: h5dump [OPTIONS] files
      -D U, --xml-dtd=U    Use the DTD or schema at U
      -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML
                           ":": no namespace, default: "hdf5:"
-                          E.g., to dump a file called `-f', use h5dump -- -f
+                          E.g., to dump a file called "-f", use h5dump -- -f
 
 --------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
diff --git a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
index 95dfc3b..89160a3 100644
--- a/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsMaxExceeded.ddl
@@ -15,7 +15,7 @@ usage: h5dump [OPTIONS] files
      --s3-cred=<cred>     Supply S3 authentication information to "ros3" vfd.
                           <cred> :: "(<aws-region>,<access-id>,<access-key>)"
                           If absent or <cred> -> "(,,)", no authentication.
-                          Has no effect is filedriver is not `ros3'.
+                          Has no effect if filedriver is not "ros3".
      --hdfs-attrs=<attrs> Supply configuration information for HDFS file access.
                           For use with "--filedriver=hdfs"
                           <attrs> :: (<namenode name>,<namenode port>,
@@ -67,7 +67,7 @@ usage: h5dump [OPTIONS] files
      -D U, --xml-dtd=U    Use the DTD or schema at U
      -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML
                           ":": no namespace, default: "hdf5:"
-                          E.g., to dump a file called `-f', use h5dump -- -f
+                          E.g., to dump a file called "-f", use h5dump -- -f
 
 --------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
diff --git a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
index 95dfc3b..89160a3 100644
--- a/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
+++ b/tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
@@ -15,7 +15,7 @@ usage: h5dump [OPTIONS] files
      --s3-cred=<cred>     Supply S3 authentication information to "ros3" vfd.
                           <cred> :: "(<aws-region>,<access-id>,<access-key>)"
                           If absent or <cred> -> "(,,)", no authentication.
-                          Has no effect is filedriver is not `ros3'.
+                          Has no effect if filedriver is not "ros3".
      --hdfs-attrs=<attrs> Supply configuration information for HDFS file access.
                           For use with "--filedriver=hdfs"
                           <attrs> :: (<namenode name>,<namenode port>,
@@ -67,7 +67,7 @@ usage: h5dump [OPTIONS] files
      -D U, --xml-dtd=U    Use the DTD or schema at U
      -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML
                           ":": no namespace, default: "hdf5:"
-                          E.g., to dump a file called `-f', use h5dump -- -f
+                          E.g., to dump a file called "-f", use h5dump -- -f
 
 --------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset
diff --git a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
index 95dfc3b..89160a3 100644
--- a/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
+++ b/tools/testfiles/pbits/tpbitsOffsetNegative.ddl
@@ -15,7 +15,7 @@ usage: h5dump [OPTIONS] files
      --s3-cred=<cred>     Supply S3 authentication information to "ros3" vfd.
                           <cred> :: "(<aws-region>,<access-id>,<access-key>)"
                           If absent or <cred> -> "(,,)", no authentication.
-                          Has no effect is filedriver is not `ros3'.
+                          Has no effect if filedriver is not "ros3".
      --hdfs-attrs=<attrs> Supply configuration information for HDFS file access.
                           For use with "--filedriver=hdfs"
                           <attrs> :: (<namenode name>,<namenode port>,
@@ -67,7 +67,7 @@ usage: h5dump [OPTIONS] files
      -D U, --xml-dtd=U    Use the DTD or schema at U
      -X S, --xml-ns=S     (XML Schema) Use qualified names n the XML
                           ":": no namespace, default: "hdf5:"
-                          E.g., to dump a file called `-f', use h5dump -- -f
+                          E.g., to dump a file called "-f", use h5dump -- -f
 
 --------------- Subsetting Options ---------------
  Subsetting is available by using the following options with a dataset