From 5a1c39b1b7592ffd898dfa480f73fea5bfbe8358 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
Date: Wed, 9 Oct 2024 15:32:07 +0200
Subject: [PATCH] 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.

(cherry picked from commit 65b9eeb39a542e0a094188f387bcf992bad67ef2)
---
 bin/dnssec/dnssec-keygen.c | 2 +-
 bin/named/main.c           | 2 +-
 bin/named/named.rst        | 2 +-
 bin/tests/wire_test.c      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/dnssec/dnssec-keygen.c b/bin/dnssec/dnssec-keygen.c
index 59d0db57a2..b321e0d481 100644
--- a/bin/dnssec/dnssec-keygen.c
+++ b/bin/dnssec/dnssec-keygen.c
@@ -194,7 +194,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 05e34f2ca2..be3c629f30 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -313,7 +313,7 @@ usage(void) {
 			"             [-S sockets] [-t chrootdir] [-u "
 			"username] [-U listeners]\n"
 			"             [-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 ee893faba7..4f6a40b5e8 100644
--- a/bin/named/named.rst
+++ b/bin/named/named.rst
@@ -117,7 +117,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 0b1a867a14..26a84c4bac 100644
--- a/bin/tests/wire_test.c
+++ b/bin/tests/wire_test.c
@@ -62,7 +62,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");