command line help: move --realloc-zero-bytes-frees

It should be in the section on tools that replace malloc.

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index bb4a0ca96e4ef33907ca5eee2b0a3a032bb349b0..3015a533c9639da255233fe143ff72ba2e0b7a14 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -166,6 +166,10 @@ static void usage_NORETURN ( int need_help )
 "                              size/blocks, full: profile current and cumulative\n"
 "                              allocated size/blocks and freed size/blocks.\n"
 "    --xtree-memory-file=<file>   xtree memory report file [xtmemory.kcg.%%p]\n"
+"    --realloc-zero-bytes-frees=yes|no [yes on Linux glibc, no otherwise]\n"
+"                              should calls to realloc with a size of 0\n"
+"                              free memory and return NULL or\n"
+"                              allocate/resize and return non-NULL\n"
 "\n"
 "  uncommon user options for all Valgrind tools:\n"
 "    --fullpath-after=         (with nothing after the '=')\n"
@@ -243,10 +247,6 @@ static void usage_NORETURN ( int need_help )
 "              attempt to avoid expensive address-space-resync operations\n"
 "    --max-threads=<number>    maximum number of threads that valgrind can\n"
 "                              handle [%d]\n"
-"    --realloc-zero-bytes-frees=yes|no [yes on Linux glibc, no otherwise]\n"
-"                              should calls to realloc with a size of 0\n"
-"                              free memory and return NULL or\n"
-"                              allocate/resize and return non-NULL\n"
 "\n";
 
    const HChar usage2[] =

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index 3b6c1160941aa565d2d0f7be17c5dbf19adafdd9..ce3cdfcf5d482ac19a35c3e7f940e5eff3218cf5 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -79,6 +79,10 @@ usage: valgrind [options] prog-and-args
                               size/blocks, full: profile current and cumulative
                               allocated size/blocks and freed size/blocks.
     --xtree-memory-file=<file>   xtree memory report file [xtmemory.kcg.%p]
+    --realloc-zero-bytes-frees=yes|no [yes on Linux glibc, no otherwise]
+                              should calls to realloc with a size of 0
+                              free memory and return NULL or
+                              allocate/resize and return non-NULL
 
   uncommon user options for all Valgrind tools:
     --fullpath-after=         (with nothing after the '=')
@@ -154,10 +158,6 @@ usage: valgrind [options] prog-and-args
               attempt to avoid expensive address-space-resync operations
     --max-threads=<number>    maximum number of threads that valgrind can
                               handle [500]
-    --realloc-zero-bytes-frees=yes|no [yes on Linux glibc, no otherwise]
-                              should calls to realloc with a size of 0
-                              free memory and return NULL or
-                              allocate/resize and return non-NULL
 
   user options for Nulgrind:
     (none)

diff --git a/none/tests/cmdline1.stdout.exp-non-linux b/none/tests/cmdline1.stdout.exp-non-linux
index e67183efe40261f4c4e817b4ea41233ae985c452..45820cbbc71295db300934484db23564a03deac2 100644 (file)
--- a/none/tests/cmdline1.stdout.exp-non-linux
+++ b/none/tests/cmdline1.stdout.exp-non-linux
@@ -77,6 +77,10 @@ usage: valgrind [options] prog-and-args
                               size/blocks, full: profile current and cumulative
                               allocated size/blocks and freed size/blocks.
     --xtree-memory-file=<file>   xtree memory report file [xtmemory.kcg.%p]
+    --realloc-zero-bytes-frees=yes|no [yes on Linux glibc, no otherwise]
+                              should calls to realloc with a size of 0
+                              free memory and return NULL or
+                              allocate/resize and return non-NULL
 
   uncommon user options for all Valgrind tools:
     --fullpath-after=         (with nothing after the '=')
@@ -152,10 +156,6 @@ usage: valgrind [options] prog-and-args
               attempt to avoid expensive address-space-resync operations
     --max-threads=<number>    maximum number of threads that valgrind can
                               handle [500]
-    --realloc-zero-bytes-frees=yes|no [yes on Linux glibc, no otherwise]
-                              should calls to realloc with a size of 0
-                              free memory and return NULL or
-                              allocate/resize and return non-NULL
 
   user options for Nulgrind:
     (none)

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index 241d33afa52fe802c65b6118d682e54dbba626ee..28323ab061954fffc3de44ed25ed907248008fe8 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -79,6 +79,10 @@ usage: valgrind [options] prog-and-args
                               size/blocks, full: profile current and cumulative
                               allocated size/blocks and freed size/blocks.
     --xtree-memory-file=<file>   xtree memory report file [xtmemory.kcg.%p]
+    --realloc-zero-bytes-frees=yes|no [yes on Linux glibc, no otherwise]
+                              should calls to realloc with a size of 0
+                              free memory and return NULL or
+                              allocate/resize and return non-NULL
 
   uncommon user options for all Valgrind tools:
     --fullpath-after=         (with nothing after the '=')
@@ -154,10 +158,6 @@ usage: valgrind [options] prog-and-args
               attempt to avoid expensive address-space-resync operations
     --max-threads=<number>    maximum number of threads that valgrind can
                               handle [500]
-    --realloc-zero-bytes-frees=yes|no [yes on Linux glibc, no otherwise]
-                              should calls to realloc with a size of 0
-                              free memory and return NULL or
-                              allocate/resize and return non-NULL
 
   user options for Nulgrind:
     (none)

diff --git a/none/tests/cmdline2.stdout.exp-non-linux b/none/tests/cmdline2.stdout.exp-non-linux
index 63af17bf74ab17aa89e6b0daaf8baf798a555c15..0b6ad0cfa97591bd92d6ecfc7227b5e88dce5a01 100644 (file)
--- a/none/tests/cmdline2.stdout.exp-non-linux
+++ b/none/tests/cmdline2.stdout.exp-non-linux
@@ -77,6 +77,10 @@ usage: valgrind [options] prog-and-args
                               size/blocks, full: profile current and cumulative
                               allocated size/blocks and freed size/blocks.
     --xtree-memory-file=<file>   xtree memory report file [xtmemory.kcg.%p]
+    --realloc-zero-bytes-frees=yes|no [yes on Linux glibc, no otherwise]
+                              should calls to realloc with a size of 0
+                              free memory and return NULL or
+                              allocate/resize and return non-NULL
 
   uncommon user options for all Valgrind tools:
     --fullpath-after=         (with nothing after the '=')
@@ -152,10 +156,6 @@ usage: valgrind [options] prog-and-args
               attempt to avoid expensive address-space-resync operations
     --max-threads=<number>    maximum number of threads that valgrind can
                               handle [500]
-    --realloc-zero-bytes-frees=yes|no [yes on Linux glibc, no otherwise]
-                              should calls to realloc with a size of 0
-                              free memory and return NULL or
-                              allocate/resize and return non-NULL
 
   user options for Nulgrind:
     (none)