Recategorise options in the usage message.

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

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 23b8e503f1d34532f769d256132fed44ae1dcd00..30a10f32d5b98351af6491e4ac784129cf128885 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -1263,6 +1263,11 @@ static void usage ( Bool debug_help )
 "    --trace-children=no|yes   Valgrind-ise child processes? [no]\n"
 "    --track-fds=no|yes        track open file descriptors? [no]\n"
 "    --time-stamp=no|yes       add timestamps to log messages? [no]\n"
+"    --log-fd=<number>         log messages to file descriptor [2=stderr]\n"
+"    --log-file=<file>         log messages to <file>.pid<pid>\n"
+"    --log-file-exactly=<file> log messages to <file>\n"
+"    --log-file-qualifier=<VAR> incorporate $VAR in logfile name [none]\n"
+"    --log-socket=ipaddr:port  log messages to socket ipaddr:port\n"
 "\n"
 "  uncommon user options for all Valgrind tools:\n"
 "    --run-libc-freeres=no|yes free up glibc memory at exit? [yes]\n"
@@ -1273,13 +1278,8 @@ static void usage ( Bool debug_help )
 "                              only for code found in stacks, or all [stack]\n"
 "\n"
 "  user options for Valgrind tools that report errors:\n"
-"    --xml=yes                 all output is in XML (Memcheck only)\n"
+"    --xml=yes                 all output is in XML (Memcheck/Nulgrind only)\n"
 "    --xml-user-comment=STR    copy STR verbatim to XML output\n"
-"    --log-fd=<number>         log messages to file descriptor [2=stderr]\n"
-"    --log-file=<file>         log messages to <file>.pid<pid>\n"
-"    --log-file-exactly=<file> log messages to <file>\n"
-"    --log-file-qualifier=<VAR> incorporate $VAR in logfile name [none]\n"
-"    --log-socket=ipaddr:port  log messages to socket ipaddr:port\n"
 "    --demangle=no|yes         automatically demangle C++ names? [yes]\n"
 "    --num-callers=<number>    show <num> callers in stack traces [12]\n"
 "    --error-limit=no|yes      stop showing new errors if too many? [yes]\n"

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index d4b1d8a14d106b55c2411461b194948afeae7ff7..80222fd655adc06b8bf65eaa0a6ba5cdda459683 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -10,6 +10,11 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
     --trace-children=no|yes   Valgrind-ise child processes? [no]
     --track-fds=no|yes        track open file descriptors? [no]
     --time-stamp=no|yes       add timestamps to log messages? [no]
+    --log-fd=<number>         log messages to file descriptor [2=stderr]
+    --log-file=<file>         log messages to <file>.pid<pid>
+    --log-file-exactly=<file> log messages to <file>
+    --log-file-qualifier=<VAR> incorporate $VAR in logfile name [none]
+    --log-socket=ipaddr:port  log messages to socket ipaddr:port
 
   uncommon user options for all Valgrind tools:
     --run-libc-freeres=no|yes free up glibc memory at exit? [yes]
@@ -20,13 +25,8 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
                               only for code found in stacks, or all [stack]
 
   user options for Valgrind tools that report errors:
-    --xml=yes                 all output is in XML (Memcheck only)
+    --xml=yes                 all output is in XML (Memcheck/Nulgrind only)
     --xml-user-comment=STR    copy STR verbatim to XML output
-    --log-fd=<number>         log messages to file descriptor [2=stderr]
-    --log-file=<file>         log messages to <file>.pid<pid>
-    --log-file-exactly=<file> log messages to <file>
-    --log-file-qualifier=<VAR> incorporate $VAR in logfile name [none]
-    --log-socket=ipaddr:port  log messages to socket ipaddr:port
     --demangle=no|yes         automatically demangle C++ names? [yes]
     --num-callers=<number>    show <num> callers in stack traces [12]
     --error-limit=no|yes      stop showing new errors if too many? [yes]

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index fa3e6e909afda420c3bd42d860acccd45738ab73..761ad269d14c5bef3213a241a282662014659413 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -10,6 +10,11 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
     --trace-children=no|yes   Valgrind-ise child processes? [no]
     --track-fds=no|yes        track open file descriptors? [no]
     --time-stamp=no|yes       add timestamps to log messages? [no]
+    --log-fd=<number>         log messages to file descriptor [2=stderr]
+    --log-file=<file>         log messages to <file>.pid<pid>
+    --log-file-exactly=<file> log messages to <file>
+    --log-file-qualifier=<VAR> incorporate $VAR in logfile name [none]
+    --log-socket=ipaddr:port  log messages to socket ipaddr:port
 
   uncommon user options for all Valgrind tools:
     --run-libc-freeres=no|yes free up glibc memory at exit? [yes]
@@ -20,13 +25,8 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
                               only for code found in stacks, or all [stack]
 
   user options for Valgrind tools that report errors:
-    --xml=yes                 all output is in XML (Memcheck only)
+    --xml=yes                 all output is in XML (Memcheck/Nulgrind only)
     --xml-user-comment=STR    copy STR verbatim to XML output
-    --log-fd=<number>         log messages to file descriptor [2=stderr]
-    --log-file=<file>         log messages to <file>.pid<pid>
-    --log-file-exactly=<file> log messages to <file>
-    --log-file-qualifier=<VAR> incorporate $VAR in logfile name [none]
-    --log-socket=ipaddr:port  log messages to socket ipaddr:port
     --demangle=no|yes         automatically demangle C++ names? [yes]
     --num-callers=<number>    show <num> callers in stack traces [12]
     --error-limit=no|yes      stop showing new errors if too many? [yes]