From: Tim Duesterhus <duesterhus@woltlab.com>
Date: Thu, 28 Oct 2021 14:36:03 +0000 (+0200)
Subject: MINOR: halog: Rename -qry to -query
X-Git-Tag: v2.3.15~7
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=6d26bce8468023c0fe32b87f3eaacf01297b2c86;p=haproxy-2.3.git

MINOR: halog: Rename -qry to -query

With the query flag moved into the correct help section, there is enough space
for two additional characters.

(cherry picked from commit 385338b30ba7bcd18688b82ad6467014d8b46749)
Signed-off-by: Willy Tarreau <w@1wt.eu>
(cherry picked from commit a88266698bcf0781cfb96daa74bfe89822c0649e)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
---

diff --git a/contrib/halog/halog.c b/contrib/halog/halog.c
index 76e68ce..89590cf 100644
--- a/contrib/halog/halog.c
+++ b/contrib/halog/halog.c
@@ -148,7 +148,7 @@ void usage(FILE *output, const char *msg)
 		"Usage: halog [-h|--help] for long help\n"
 		"       halog [-q] [-c] [-m <lines>]\n"
 		"       {-cc|-gt|-pct|-st|-tc|-srv|-u|-uc|-ue|-ua|-ut|-uao|-uto|-uba|-ubt|-ic}\n"
-		"       [-s <skip>] [-e|-E] [-H] [-rt|-RT <time>] [-ad <delay>] [-ac <count>] [-qry]\n"
+		"       [-s <skip>] [-e|-E] [-H] [-rt|-RT <time>] [-ad <delay>] [-ac <count>] [-query]\n"
 		"       [-v] [-Q|-QS] [-tcn|-TCN <termcode>] [ -hs|-HS [min][:[max]] ] [ -time [min][:[max]] ] < log\n"
 		"\n",
 		msg ? msg : ""
@@ -183,7 +183,7 @@ void help()
 	       " -m <lines>              limit output to the first <lines> lines\n"
                " -s <skip_n_fields>      skip n fields from the beginning of a line (default %d)\n"
                "                         you can also use -n to start from earlier then field %d\n"
-	       " -qry                    preserve the query string for per-URL (-u*) statistics\n"
+	       " -query                  preserve the query string for per-URL (-u*) statistics\n"
                "\n"
 	       "Output filters - only one may be used at a time\n"
 	       " -c    only report the number of lines that would have been printed\n"
@@ -833,7 +833,7 @@ int main(int argc, char **argv)
 			filter |= FILT_COUNT_URL_BAVG;
 		else if (strcmp(argv[0], "-ubt") == 0)
 			filter |= FILT_COUNT_URL_BTOT;
-		else if (strcmp(argv[0], "-qry") == 0)
+		else if (strcmp(argv[0], "-query") == 0)
 			filter2 |= FILT2_PRESERVE_QUERY;
 		else if (strcmp(argv[0], "-ic") == 0)
 			filter |= FILT_COUNT_IP_COUNT;