From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Fri, 15 Dec 2023 07:52:14 +0000 (+0100)
Subject: kjournalprint: remove legacy option 'no-color'
X-Git-Tag: v3.4.0~221^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb78daaee7bef6f6c0b296e89544d71dc443cd98;p=thirdparty%2Fknot-dns.git

kjournalprint: remove legacy option 'no-color'
---

diff --git a/doc/man/kjournalprint.8in b/doc/man/kjournalprint.8in
index 4924e2afa2..98bcdf8e46 100644
--- a/doc/man/kjournalprint.8in
+++ b/doc/man/kjournalprint.8in
@@ -80,9 +80,6 @@ Debug mode brief output.
 \fB\-x\fP, \fB\-\-mono\fP
 Don\(aqt generate colorized output.
 .TP
-\fB\-n\fP, \fB\-\-no\-color\fP
-An alias for \fB\-x\fP\&. Use of this option is deprecated, it will be removed in the future.
-.TP
 \fB\-X\fP, \fB\-\-color\fP
 Force colorized output.
 .TP
diff --git a/doc/man_kjournalprint.rst b/doc/man_kjournalprint.rst
index 7cd7cc50cb..3b2d024b74 100644
--- a/doc/man_kjournalprint.rst
+++ b/doc/man_kjournalprint.rst
@@ -57,9 +57,6 @@ Options
 **-x**, **--mono**
   Don't generate colorized output.
 
-**-n**, **--no-color**
-  An alias for **-x**. Use of this option is deprecated, it will be removed in the future.
-
 **-X**, **--color**
   Force colorized output.
 
diff --git a/src/utils/kjournalprint/main.c b/src/utils/kjournalprint/main.c
index a5c935b69b..4ffab1a82c 100644
--- a/src/utils/kjournalprint/main.c
+++ b/src/utils/kjournalprint/main.c
@@ -342,7 +342,6 @@ int main(int argc, char *argv[])
 		{ "zone-list", no_argument,       NULL, 'z' },
 		{ "check",     no_argument,       NULL, 'H' },
 		{ "debug",     no_argument,       NULL, 'd' },
-		{ "no-color",  no_argument,       NULL, 'n' },
 		{ "mono",      no_argument,       NULL, 'x' },
 		{ "color",     no_argument,       NULL, 'X' },
 		{ "help",      no_argument,       NULL, 'h' },
@@ -354,7 +353,7 @@ int main(int argc, char *argv[])
 	signal_init_std();
 
 	int opt = 0;
-	while ((opt = getopt_long(argc, argv, "c:C:D:l:s:zHdnxXhV::", opts, NULL)) != -1) {
+	while ((opt = getopt_long(argc, argv, "c:C:D:l:s:zHdxXhV::", opts, NULL)) != -1) {
 		switch (opt) {
 		case 'c':
 			if (util_conf_init_file(optarg) != KNOT_EOK) {
@@ -393,7 +392,6 @@ int main(int argc, char *argv[])
 		case 'd':
 			params.debug = true;
 			break;
-		case 'n':
 		case 'x':
 			params.color = false;
 			break;