Skip to content

Commit

Permalink
Merge pull request #12 from byrnHDF/develop
Browse files Browse the repository at this point in the history
HDFFV-11096 fix typo in h5dump usage text
  • Loading branch information
lrknox authored Oct 5, 2020
2 parents 5631b2e + e01430e commit ae0f6f2
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 23 deletions.
8 changes: 4 additions & 4 deletions tools/src/h5dump/h5dump.c
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,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");
Expand Down Expand Up @@ -338,7 +338,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");
Expand Down Expand Up @@ -1132,7 +1132,7 @@ parse_command_line(int argc, const char *argv[])

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) {
Expand Down Expand Up @@ -1205,7 +1205,7 @@ parse_command_line(int argc, const char *argv[])
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;
}

Expand Down
6 changes: 3 additions & 3 deletions tools/src/misc/h5repart.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
4 changes: 2 additions & 2 deletions tools/testfiles/h5dump-help.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down Expand Up @@ -73,7 +73,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
Expand Down
4 changes: 2 additions & 2 deletions tools/testfiles/pbits/tnofilename-with-packed-bits.ddl
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down Expand Up @@ -73,7 +73,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
Expand Down
4 changes: 2 additions & 2 deletions tools/testfiles/pbits/tpbitsIncomplete.ddl
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down Expand Up @@ -73,7 +73,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
Expand Down
4 changes: 2 additions & 2 deletions tools/testfiles/pbits/tpbitsLengthExceeded.ddl
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down Expand Up @@ -73,7 +73,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
Expand Down
4 changes: 2 additions & 2 deletions tools/testfiles/pbits/tpbitsLengthPositive.ddl
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down Expand Up @@ -73,7 +73,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
Expand Down
4 changes: 2 additions & 2 deletions tools/testfiles/pbits/tpbitsMaxExceeded.ddl
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down Expand Up @@ -73,7 +73,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
Expand Down
4 changes: 2 additions & 2 deletions tools/testfiles/pbits/tpbitsOffsetExceeded.ddl
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down Expand Up @@ -73,7 +73,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
Expand Down
4 changes: 2 additions & 2 deletions tools/testfiles/pbits/tpbitsOffsetNegative.ddl
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down Expand Up @@ -73,7 +73,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
Expand Down

0 comments on commit ae0f6f2

Please sign in to comment.