[master] 466985b More unreachable code

[Poul-Henning Kamp]

commit 466985b56de15055846d39c864d5dc7f4e368fa7
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Jan 18 13:13:35 2017 +0000

    More unreachable code

diff --git a/bin/varnishtest/vtc_http2.c b/bin/varnishtest/vtc_http2.c
index 449208e..da9e540 100644
--- a/bin/varnishtest/vtc_http2.c
+++ b/bin/varnishtest/vtc_http2.c
@@ -830,14 +830,12 @@ receive_frame(void *priv)
 	return (NULL);
 }
 
-#define STRTOU32(n, s, p, v, c) \
-	do { \
-	n = strtoul(s, &p, 0); \
-	if (*p != '\0') { \
-		vtc_fatal(v, "%s takes an integer as argument" \
-			"(found %s)", c, s); \
-		WRONG("Couldn't convert to integer");\
-	} \
+#define STRTOU32(n, s, p, v, c)						\
+	do {								\
+		n = strtoul(s, &p, 0);					\
+		if (*p != '\0')						\
+			vtc_fatal(v, "%s takes an integer as argument"	\
+				"(found %s)", c, s);			\
 	} while (0)
 
 #define STRTOU32_CHECK(n, sp, p, v, c, l)				\
@@ -851,7 +849,7 @@ do {									\
 } while (0)
 
 #define CHECK_LAST_FRAME(TYPE) \
-	if (!f || f->type != TYPE_ ## TYPE) { \
+	if (!f || f->type != TYPE_ ## TYPE) {				   \
 		vtc_fatal(s->hp->vl, "Last frame was not of type " #TYPE); \
 	}
 
diff --git a/bin/varnishtest/vtc_logexp.c b/bin/varnishtest/vtc_logexp.c
index 81396b5..e042e89 100644
--- a/bin/varnishtest/vtc_logexp.c
+++ b/bin/varnishtest/vtc_logexp.c
@@ -578,7 +578,7 @@ cmd_logexpect(CMD_ARGS)
 			if (av[1] == NULL)
 				vtc_fatal(le->vl, "Missing -g argument");
 			le->g_arg = VSLQ_Name2Grouping(av[1], strlen(av[1]));
-			if (le->g_arg < 0) 
+			if (le->g_arg < 0)
 				vtc_fatal(le->vl, "Unknown grouping '%s'",
 				    av[1]);
 			av++;