[master] d8c5ada6c Move to -E option for ESI output.

[Poul-Henning Kamp]

commit d8c5ada6c90db32e39f016c98290c4ed6ef968fe
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Aug 19 11:17:04 2019 +0000

    Move to -E option for ESI output.

diff --git a/bin/varnishncsa/varnishncsa.c b/bin/varnishncsa/varnishncsa.c
index ff554d23e..0dc640237 100644
--- a/bin/varnishncsa/varnishncsa.c
+++ b/bin/varnishncsa/varnishncsa.c
@@ -140,7 +140,7 @@ static struct ctx {
 	int			a_opt;
 	int			b_opt;
 	int			c_opt;
-	int			e_opt;
+	int			E_opt;
 	char			*w_arg;
 
 	FILE			*fo;
@@ -892,7 +892,7 @@ dispatch_f(struct VSL_data *vsl, struct VSL_transaction * const pt[],
 			be_mark = BACKEND_MARKER;
 		} else
 			continue;
-		if (t->reason == VSL_r_esi && !CTX.e_opt)
+		if (t->reason == VSL_r_esi && !CTX.E_opt)
 			/* Skip ESI requests */
 			continue;
 		CTX.hitmiss = "-";
@@ -1112,9 +1112,9 @@ main(int argc, char * const *argv)
 			/* client mode */
 			CTX.c_opt = 1;
 			break;
-		case 'e':
+		case 'E':
 			/* show ESI */
-			CTX.e_opt = 1;
+			CTX.E_opt = 1;
 			break;
 		case 'F':
 			if (format != NULL)
diff --git a/bin/varnishncsa/varnishncsa_options.h b/bin/varnishncsa/varnishncsa_options.h
index b372647bc..896b33da0 100644
--- a/bin/varnishncsa/varnishncsa_options.h
+++ b/bin/varnishncsa/varnishncsa_options.h
@@ -72,18 +72,18 @@
 	    "Log client requests. This is the default. If -b is"	\
 	    " specified, then -c is needed to also log client requests"	\
 	)
-#define NCSA_OPT_e							\
-	VOPT("e", "[-e]", "Show ESI request",				\
+#define NCSA_OPT_E							\
+	VOPT("E", "[-E]", "Show ESI request",				\
 	    "Show ESI request."	\
 	)
 
 NCSA_OPT_a
 NCSA_OPT_b
 NCSA_OPT_c
-NCSA_OPT_e
 VSL_OPT_C
 VUT_OPT_d
 VUT_GLOBAL_OPT_D
+NCSA_OPT_E
 NCSA_OPT_F
 NCSA_OPT_f
 NCSA_OPT_g