[4.1] 41f1673 Mark some more non-literal options

PÃ¥l Hermunn Johansen hermunn at varnish-software.com
Fri Sep 9 13:01:03 CEST 2016

commit 41f1673dd126dfaf93b3852fc3689a4c90a409b1
Author: Pål Hermunn Johansen <hermunn at varnish-software.com>
Date:   Wed Sep 7 14:25:20 2016 +0200

    Mark some more non-literal options
    In the usage section of varnishstat, some non-literal options were not
    caught by the backport.

diff --git a/bin/varnishstat/varnishstat.c b/bin/varnishstat/varnishstat.c
index d9f996d..1a690cf 100644
--- a/bin/varnishstat/varnishstat.c
+++ b/bin/varnishstat/varnishstat.c
@@ -251,7 +251,7 @@ usage(void)
 #define FMT "    %-28s # %s\n"
 	fprintf(stderr, "usage: varnishstat "
-	    "[-1lV] [-f field] [-t seconds|<off>] "
+	    "[-1lV] [-f <glob>] [-t <seconds>|<off>] "
 	    VSC_n_USAGE "\n");
 	fprintf(stderr, FMT, "-1", "Print the statistics to stdout.");
 	fprintf(stderr, FMT, "-f <glob>", "Field inclusion glob");
@@ -259,11 +259,11 @@ usage(void)
 	    "If it starts with '^' it is used as an exclusion list.");
 	fprintf(stderr, FMT, "-l",
 	    "Lists the available fields to use with the -f option.");
-	fprintf(stderr, FMT, "-n varnish_name",
+	fprintf(stderr, FMT, "-n <varnish_name>",
 	    "The varnishd instance to get logs from.");
-	fprintf(stderr, FMT, "-N filename",
+	fprintf(stderr, FMT, "-N <filename>",
 	    "Filename of a stale VSM instance.");
-	fprintf(stderr, FMT, "-t seconds|<off>",
+	fprintf(stderr, FMT, "-t <seconds>|<off>",
 	    "Timeout before returning error on initial VSM connection.");
 	fprintf(stderr, FMT, "-V", "Display the version number and exit.");
 	fprintf(stderr, FMT, "-x",

More information about the varnish-commit mailing list