Finalize removal of memory debug flags size and mctx

Commit 4b3d0c66009d30f5c0bc12ee128fc59f1d853f44 has removed them, but
did not remove few traces in documentation and help. Remove them from
remaining places.

diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index 2eced43479f0aaa87189f86d26c10299b945a729..a79623a1df64b821e4c8ee059da9a6b24b958727 100644 (file)
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -179,7 +179,7 @@ usage(void) {
                        "(default: AUTHCONF)\n");
        fprintf(stderr, "    -h: print usage and exit\n");
        fprintf(stderr, "    -m <memory debugging mode>:\n");
-       fprintf(stderr, "       usage | trace | record | size | mctx\n");
+       fprintf(stderr, "       usage | trace | record\n");
        fprintf(stderr, "    -v <level>: set verbosity level (0 - 10)\n");
        fprintf(stderr, "    -V: print version information\n");
        fprintf(stderr, "Timing options:\n");

diff --git a/bin/named/main.c b/bin/named/main.c
index c8ee00dffeeecca74c3e8aafbb229d134cafdd78..18a310334e6c48676f5e8fefba8a619b25a82ab7 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -318,7 +318,7 @@ usage(void) {
                        "             [-S sockets] [-t chrootdir] [-u "
                        "username] [-U listeners]\n"
                        "             [-X lockfile] [-m "
-                       "{usage|trace|record|size|mctx}]\n"
+                       "{usage|trace|record}]\n"
                        "             [-M fill|nofill]\n"
                        "usage: named [-v|-V|-C]\n");
 }

diff --git a/bin/named/named.rst b/bin/named/named.rst
index b94b5a10fbcbcd7df8f9c65a3dc1d0f46f9b738f..19b57e0fc5f638c426be33b112c1173f3d7e9a97 100644 (file)
--- a/bin/named/named.rst
+++ b/bin/named/named.rst
@@ -111,7 +111,7 @@ Options
 .. option:: -m flag
 
    This option turns on memory usage debugging flags. Possible flags are ``usage``,
-   ``trace``, ``record``, ``size``, and ``mctx``. These correspond to the
+   ``trace`` and ``record``. These correspond to the
    ``ISC_MEM_DEBUGXXXX`` flags described in ``<isc/mem.h>``.
 
 .. option:: -n #cpus

diff --git a/bin/tests/wire_test.c b/bin/tests/wire_test.c
index 321f6f4837181b48f83f824fb593b8c83d6946c8..e042e194dc4f72074935c801ca1554967f797686 100644 (file)
--- a/bin/tests/wire_test.c
+++ b/bin/tests/wire_test.c
@@ -63,7 +63,7 @@ fromhex(char c) {
 static void
 usage(void) {
        fprintf(stderr, "wire_test [-b] [-d] [-p] [-r] [-s]\n");
-       fprintf(stderr, "          [-m {usage|trace|record|size|mctx}]\n");
+       fprintf(stderr, "          [-m {usage|trace|record}]\n");
        fprintf(stderr, "          [filename]\n\n");
        fprintf(stderr, "\t-b\tBest-effort parsing (ignore some errors)\n");
        fprintf(stderr, "\t-d\tRead input as raw binary data\n");