Slightly change the help text for some options that involve

user-supplied enumeration values.

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

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 7aa874625288ca331f1f046b6d0b2714ed4f8d1c..65928bf8cc9c5566b708105087a4a0f4dfcc440c 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -109,7 +109,8 @@ static void usage_NORETURN ( Bool debug_help )
 "                              to get started quickly, use --vgdb-error=0\n"
 "                              and follow the on-screen directions\n"
 "    --vgdb-stop-at=event1,event2,... invoke gdbserver for given events [none]\n"
-"         where event is one of startup exit valgrindabexit all none\n"
+"         where event is one of:\n"
+"           startup exit valgrindabexit all none\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"
@@ -176,7 +177,8 @@ static void usage_NORETURN ( Bool debug_help )
 "    --vgdb-prefix=<prefix>    prefix for vgdb FIFOs [%s]\n"
 "    --run-libc-freeres=no|yes free up glibc memory at exit on Linux? [yes]\n"
 "    --sim-hints=hint1,hint2,...  activate unusual sim behaviours [none] \n"
-"         where hint is one of lax-ioctls fuse-compatible enable-outer\n"
+"         where hint is one of:\n"
+"           lax-ioctls fuse-compatible enable-outer\n"
 "           no-inner-prefix no-nptl-pthread-stackcache none\n"
 "    --fair-sched=no|yes|try   schedule threads fairly on multicore systems [no]\n"
 "    --kernel-variant=variant1,variant2,...\n"

diff --git a/gdbserver_tests/mchelp.stdoutB.exp b/gdbserver_tests/mchelp.stdoutB.exp
index aa5862289b332c9fab536b28ec58f12dd82296e5..d3c61a1c86d634ffb5ec38516aa17e273f75fffa 100644 (file)
--- a/gdbserver_tests/mchelp.stdoutB.exp
+++ b/gdbserver_tests/mchelp.stdoutB.exp
@@ -29,13 +29,14 @@ memcheck monitor commands:
                 [increased*|changed|any]
                 [unlimited*|limited <max_loss_records_output>]
             * = defaults
-       where kind is one of definite indirect possible reachable all none
-       where heur is one of stdstring length64 newarray
-                               multipleinheritance all none*
-        Examples: leak_check
-                  leak_check summary any
-                  leak_check full kinds indirect,possible
-                  leak_check full reachable any limited 100
+       where kind is one of:
+         definite indirect possible reachable all none
+       where heur is one of:
+         stdstring length64 newarray multipleinheritance all none*
+       Examples: leak_check
+                 leak_check summary any
+                 leak_check full kinds indirect,possible
+                 leak_check full reachable any limited 100
   block_list <loss_record_nr>
         after a leak search, shows the list of blocks of <loss_record_nr>
   who_points_at <addr> [<len>]
@@ -87,13 +88,14 @@ memcheck monitor commands:
                 [increased*|changed|any]
                 [unlimited*|limited <max_loss_records_output>]
             * = defaults
-       where kind is one of definite indirect possible reachable all none
-       where heur is one of stdstring length64 newarray
-                               multipleinheritance all none*
-        Examples: leak_check
-                  leak_check summary any
-                  leak_check full kinds indirect,possible
-                  leak_check full reachable any limited 100
+       where kind is one of:
+         definite indirect possible reachable all none
+       where heur is one of:
+         stdstring length64 newarray multipleinheritance all none*
+       Examples: leak_check
+                 leak_check summary any
+                 leak_check full kinds indirect,possible
+                 leak_check full reachable any limited 100
   block_list <loss_record_nr>
         after a leak search, shows the list of blocks of <loss_record_nr>
   who_points_at <addr> [<len>]

diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index 9146064fb13de895fab23724d349abee08e42298..69370eba24aa915562813356c4ac4e843e6afb6c 100644 (file)
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -5367,11 +5367,12 @@ static void mc_print_usage(void)
 "                                            [definite,possible]\n"
 "    --errors-for-leak-kinds=kind1,kind2,..  which leak kinds are errors?\n"
 "                                            [definite,possible]\n"
-"        where kind is one of definite indirect possible reachable all none\n"
+"        where kind is one of:\n"
+"          definite indirect possible reachable all none\n"
 "    --leak-check-heuristics=heur1,heur2,... which heuristics to use for\n"
 "        improving leak search false positive [none]\n"
-"        where heur is one of stdstring length64 newarray\n"
-"                                multipleinheritance all none\n"
+"        where heur is one of:\n"
+"          stdstring length64 newarray multipleinheritance all none\n"
 "    --show-reachable=yes             same as --show-leak-kinds=all\n"
 "    --show-reachable=no --show-possibly-lost=yes\n"
 "                                     same as --show-leak-kinds=definite,possible\n"
@@ -5509,13 +5510,14 @@ static void print_monitor_help ( void )
 "                [increased*|changed|any]\n"
 "                [unlimited*|limited <max_loss_records_output>]\n"
 "            * = defaults\n"
-"       where kind is one of definite indirect possible reachable all none\n"
-"       where heur is one of stdstring length64 newarray\n"
-"                               multipleinheritance all none*\n"
-"        Examples: leak_check\n"
-"                  leak_check summary any\n"
-"                  leak_check full kinds indirect,possible\n"
-"                  leak_check full reachable any limited 100\n"
+"       where kind is one of:\n"
+"         definite indirect possible reachable all none\n"
+"       where heur is one of:\n"
+"         stdstring length64 newarray multipleinheritance all none*\n"
+"       Examples: leak_check\n"
+"                 leak_check summary any\n"
+"                 leak_check full kinds indirect,possible\n"
+"                 leak_check full reachable any limited 100\n"
 "  block_list <loss_record_nr>\n"
 "        after a leak search, shows the list of blocks of <loss_record_nr>\n"
 "  who_points_at <addr> [<len>]\n"

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index 8d10737c61c3cdc2f3d8935aaec677ad127f3d36..c232ccaa5e9ed4d579fba223678643236d0eb9e2 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -22,7 +22,8 @@ usage: valgrind [options] prog-and-args
                               to get started quickly, use --vgdb-error=0
                               and follow the on-screen directions
     --vgdb-stop-at=event1,event2,... invoke gdbserver for given events [none]
-         where event is one of startup exit valgrindabexit all none
+         where event is one of:
+           startup exit valgrindabexit all none
     --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]
@@ -89,7 +90,8 @@ usage: valgrind [options] prog-and-args
     --vgdb-prefix=<prefix>    prefix for vgdb FIFOs [/tmp/vgdb-pipe]
     --run-libc-freeres=no|yes free up glibc memory at exit on Linux? [yes]
     --sim-hints=hint1,hint2,...  activate unusual sim behaviours [none] 
-         where hint is one of lax-ioctls fuse-compatible enable-outer
+         where hint is one of:
+           lax-ioctls fuse-compatible enable-outer
            no-inner-prefix no-nptl-pthread-stackcache none
     --fair-sched=no|yes|try   schedule threads fairly on multicore systems [no]
     --kernel-variant=variant1,variant2,...

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index 2049ec5d7643df15786b149b43592694c42d2a85..59414d79c27d17047b679d1249c3ebee1ce84f2f 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -22,7 +22,8 @@ usage: valgrind [options] prog-and-args
                               to get started quickly, use --vgdb-error=0
                               and follow the on-screen directions
     --vgdb-stop-at=event1,event2,... invoke gdbserver for given events [none]
-         where event is one of startup exit valgrindabexit all none
+         where event is one of:
+           startup exit valgrindabexit all none
     --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]
@@ -89,7 +90,8 @@ usage: valgrind [options] prog-and-args
     --vgdb-prefix=<prefix>    prefix for vgdb FIFOs [/tmp/vgdb-pipe]
     --run-libc-freeres=no|yes free up glibc memory at exit on Linux? [yes]
     --sim-hints=hint1,hint2,...  activate unusual sim behaviours [none] 
-         where hint is one of lax-ioctls fuse-compatible enable-outer
+         where hint is one of:
+           lax-ioctls fuse-compatible enable-outer
            no-inner-prefix no-nptl-pthread-stackcache none
     --fair-sched=no|yes|try   schedule threads fairly on multicore systems [no]
     --kernel-variant=variant1,variant2,...