From a3204d77e7e8f7b15b01a424ac1789e1f29ad210 Mon Sep 17 00:00:00 2001 From: Allen Byrne Date: Mon, 12 Aug 2013 15:53:54 -0500 Subject: [svn-r23994] Correct printf % handling --- tools/h5dump/h5dump.c | 2 +- tools/testfiles/h5dump-help.txt | 2 +- tools/testfiles/tnofilename-with-packed-bits.ddl | 2 +- tools/testfiles/tpbitsIncomplete.ddl | 2 +- tools/testfiles/tpbitsLengthExceeded.ddl | 2 +- tools/testfiles/tpbitsLengthPositive.ddl | 2 +- tools/testfiles/tpbitsMaxExceeded.ddl | 2 +- tools/testfiles/tpbitsOffsetExceeded.ddl | 2 +- tools/testfiles/tpbitsOffsetNegative.ddl | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c index be6ee7f..8a2e503 100644 --- a/tools/h5dump/h5dump.c +++ b/tools/h5dump/h5dump.c @@ -358,7 +358,7 @@ usage(const char *prog) PRINTVALSTREAM(rawoutstream, "\n"); PRINTVALSTREAM(rawoutstream, " 8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5\n"); PRINTVALSTREAM(rawoutstream, "\n"); - PRINTVALSTREAM(rawoutstream, " h5dump -d /foo -f family fam%05d.h5\n"); + PRINTVALSTREAM(rawoutstream, " h5dump -d /foo -f family fam%%05d.h5\n"); PRINTVALSTREAM(rawoutstream, "\n"); } diff --git a/tools/testfiles/h5dump-help.txt b/tools/testfiles/h5dump-help.txt index 82b7323..4367cb5 100644 --- a/tools/testfiles/h5dump-help.txt +++ b/tools/testfiles/h5dump-help.txt @@ -129,5 +129,5 @@ usage: h5dump [OPTIONS] files 8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5 - h5dump -d /foo -f family fam-574932464.h5 + h5dump -d /foo -f family fam%05d.h5 diff --git a/tools/testfiles/tnofilename-with-packed-bits.ddl b/tools/testfiles/tnofilename-with-packed-bits.ddl index bb0a876..e22cd82 100644 --- a/tools/testfiles/tnofilename-with-packed-bits.ddl +++ b/tools/testfiles/tnofilename-with-packed-bits.ddl @@ -129,6 +129,6 @@ usage: h5dump [OPTIONS] files 8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5 - h5dump -d /foo -f family fam-574932464.h5 + h5dump -d /foo -f family fam%05d.h5 h5dump error: missing file name diff --git a/tools/testfiles/tpbitsIncomplete.ddl b/tools/testfiles/tpbitsIncomplete.ddl index 1292049..a7e1d02 100644 --- a/tools/testfiles/tpbitsIncomplete.ddl +++ b/tools/testfiles/tpbitsIncomplete.ddl @@ -129,6 +129,6 @@ usage: h5dump [OPTIONS] files 8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5 - h5dump -d /foo -f family fam-574932464.h5 + h5dump -d /foo -f family fam%05d.h5 h5dump error: Bad mask list(0,2,2,1,0,2,2,) diff --git a/tools/testfiles/tpbitsLengthExceeded.ddl b/tools/testfiles/tpbitsLengthExceeded.ddl index 12f2f2a..62ca870 100644 --- a/tools/testfiles/tpbitsLengthExceeded.ddl +++ b/tools/testfiles/tpbitsLengthExceeded.ddl @@ -129,6 +129,6 @@ usage: h5dump [OPTIONS] files 8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5 - h5dump -d /foo -f family fam-574932464.h5 + h5dump -d /foo -f family fam%05d.h5 h5dump error: Packed Bit offset+length value(65) too large. Max is 64 diff --git a/tools/testfiles/tpbitsLengthPositive.ddl b/tools/testfiles/tpbitsLengthPositive.ddl index c98ce67..2a69f14 100644 --- a/tools/testfiles/tpbitsLengthPositive.ddl +++ b/tools/testfiles/tpbitsLengthPositive.ddl @@ -129,6 +129,6 @@ usage: h5dump [OPTIONS] files 8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5 - h5dump -d /foo -f family fam-574932464.h5 + h5dump -d /foo -f family fam%05d.h5 h5dump error: Packed Bit length value(0) must be positive. diff --git a/tools/testfiles/tpbitsMaxExceeded.ddl b/tools/testfiles/tpbitsMaxExceeded.ddl index 46319d1..aafdd91 100644 --- a/tools/testfiles/tpbitsMaxExceeded.ddl +++ b/tools/testfiles/tpbitsMaxExceeded.ddl @@ -129,6 +129,6 @@ usage: h5dump [OPTIONS] files 8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5 - h5dump -d /foo -f family fam-574932464.h5 + h5dump -d /foo -f family fam%05d.h5 h5dump error: Too many masks requested (max. 8). Mask list(0,1,0,1,1,1,2,1,3,1,4,1,5,1,6,1,7,1) diff --git a/tools/testfiles/tpbitsOffsetExceeded.ddl b/tools/testfiles/tpbitsOffsetExceeded.ddl index 8f240c5..960f62b 100644 --- a/tools/testfiles/tpbitsOffsetExceeded.ddl +++ b/tools/testfiles/tpbitsOffsetExceeded.ddl @@ -129,6 +129,6 @@ usage: h5dump [OPTIONS] files 8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5 - h5dump -d /foo -f family fam-574932464.h5 + h5dump -d /foo -f family fam%05d.h5 h5dump error: Packed Bit offset value(64) must be between 0 and 63 diff --git a/tools/testfiles/tpbitsOffsetNegative.ddl b/tools/testfiles/tpbitsOffsetNegative.ddl index 593d980..c113866 100644 --- a/tools/testfiles/tpbitsOffsetNegative.ddl +++ b/tools/testfiles/tpbitsOffsetNegative.ddl @@ -129,6 +129,6 @@ usage: h5dump [OPTIONS] files 8) Dataset foo in family files fam00000.h5 fam00001.h5 and fam00002.h5 - h5dump -d /foo -f family fam-574932464.h5 + h5dump -d /foo -f family fam%05d.h5 h5dump error: Bad mask list(-1,1) -- cgit v0.12