Make the usage message a little neater and more self-consistent.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@4948

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 2cc1e4a4707b7d304fc0fb80090749c24698a2a1..f9ea6c74b6227c3268e4bedb217fe79a80c05af1 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -894,7 +894,7 @@ static void usage_NORETURN ( Bool debug_help )
 "    --xml=yes                 all output is in XML (Memcheck/Nulgrind only)\n"
 "    --xml-user-comment=STR    copy STR verbatim to XML output\n"
 "    --demangle=no|yes         automatically demangle C++ names? [yes]\n"
-"    --num-callers=<number>    show <num> callers in stack traces [12]\n"
+"    --num-callers=<number>    show <number> callers in stack traces [12]\n"
 "    --error-limit=no|yes      stop showing new errors if too many? [yes]\n"
 "    --show-below-main=no|yes  continue stack traces below main() [no]\n"
 "    --suppressions=<filename> suppress errors described in <filename>\n"
@@ -913,7 +913,7 @@ static void usage_NORETURN ( Bool debug_help )
 "    --profile=no|yes          profile? (tool must be built for it) [no]\n"
 "    --trace-flags=<XXXXXXXX>   show generated code? (X = 0|1) [00000000]\n"
 "    --profile-flags=<XXXXXXXX> ditto, but for profiling (X = 0|1) [00000000]\n"
-"    --trace-notbelow=<number>    only show BBs above <number> [0]\n"
+"    --trace-notbelow=<number> only show BBs above <number> [0]\n"
 "    --trace-syscalls=no|yes   show all system calls? [no]\n"
 "    --trace-signals=no|yes    show signal handling details? [no]\n"
 "    --trace-symtab=no|yes     show symbol table details? [no]\n"

diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index bfc79e3c6072ff07e812aa8d6acab9b9819a2080..96ce84d001b67cde77d755cca6a2794ee7479665 100644 (file)
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -2269,7 +2269,7 @@ static void mc_print_usage(void)
 {  
    MAC_(print_common_usage)();
    VG_(printf)(
-"    --avoid-strlen-errors=no|yes  suppress errs from inlined strlen [yes]\n"
+"    --avoid-strlen-errors=no|yes     suppress errs from inlined strlen [yes]\n"
    );
 }
 

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index 939c093bffe09291118194fa429d7c906b2afec3..5ce37a323f2921e59ec563588779e740f4b004c8 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -29,7 +29,7 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
     --xml=yes                 all output is in XML (Memcheck/Nulgrind only)
     --xml-user-comment=STR    copy STR verbatim to XML output
     --demangle=no|yes         automatically demangle C++ names? [yes]
-    --num-callers=<number>    show <num> callers in stack traces [12]
+    --num-callers=<number>    show <number> callers in stack traces [12]
     --error-limit=no|yes      stop showing new errors if too many? [yes]
     --show-below-main=no|yes  continue stack traces below main() [no]
     --suppressions=<filename> suppress errors described in <filename>

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index a14ca310f4d82a8cb3ff223741b5c4675b3c7b1f..896eefade08e8f8ca9d7780e96fca7c160a0250b 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -29,7 +29,7 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
     --xml=yes                 all output is in XML (Memcheck/Nulgrind only)
     --xml-user-comment=STR    copy STR verbatim to XML output
     --demangle=no|yes         automatically demangle C++ names? [yes]
-    --num-callers=<number>    show <num> callers in stack traces [12]
+    --num-callers=<number>    show <number> callers in stack traces [12]
     --error-limit=no|yes      stop showing new errors if too many? [yes]
     --show-below-main=no|yes  continue stack traces below main() [no]
     --suppressions=<filename> suppress errors described in <filename>
@@ -48,7 +48,7 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
     --profile=no|yes          profile? (tool must be built for it) [no]
     --trace-flags=<XXXXXXXX>   show generated code? (X = 0|1) [00000000]
     --profile-flags=<XXXXXXXX> ditto, but for profiling (X = 0|1) [00000000]
-    --trace-notbelow=<number>    only show BBs above <number> [0]
+    --trace-notbelow=<number> only show BBs above <number> [0]
     --trace-syscalls=no|yes   show all system calls? [no]
     --trace-signals=no|yes    show signal handling details? [no]
     --trace-symtab=no|yes     show symbol table details? [no]