[master] 0a1cabf A little bit of flexelintery

[Poul-Henning Kamp]

commit 0a1cabfe36862c2d1499aecdff6ec4d09fa3bebe
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon May 7 21:50:25 2018 +0000

    A little bit of flexelintery

diff --git a/bin/varnishtest/flint.lnt b/bin/varnishtest/flint.lnt
index 78c17a9..6e392f2 100644
--- a/bin/varnishtest/flint.lnt
+++ b/bin/varnishtest/flint.lnt
@@ -10,6 +10,8 @@
 -emacro({779}, ENC)		// String constant in comparison operator '!='
 -emacro({506}, CHKFRAME)	// Constant value Boolean
 
+-sem(http_process_cleanup, custodial(1))
+
 -esym(522, teken_subr_*)
 
 -esym(850, av)
diff --git a/bin/varnishtest/vtc_h2_hpack.c b/bin/varnishtest/vtc_h2_hpack.c
index 9b6f250..403db13 100644
--- a/bin/varnishtest/vtc_h2_hpack.c
+++ b/bin/varnishtest/vtc_h2_hpack.c
@@ -259,7 +259,7 @@ str_decode(struct hpk_iter *iter, struct txt *t)
 	if (num > iter->end - iter->buf)
 		return (hpk_err);
 	if (huff) { /*Huffman encoding */
-		t->ptr = malloc((num * 8) / 5L + 1L);
+		t->ptr = malloc((num * 8L) / 5L + 1L);
 		AN(t->ptr);
 		num = huff_decode(t->ptr, (num * 8) / 5, iter, num);
 		if (!num) {
diff --git a/bin/varnishtest/vtc_process.c b/bin/varnishtest/vtc_process.c
index 5e3816b..95f6c05 100644
--- a/bin/varnishtest/vtc_process.c
+++ b/bin/varnishtest/vtc_process.c
@@ -320,7 +320,7 @@ term_expect_text(struct process *pp,
 }
 
 static void
-term_expect_cursor(struct process *pp, const char *lin, const char *col)
+term_expect_cursor(const struct process *pp, const char *lin, const char *col)
 {
 	int x, y;
 	const teken_pos_t *pos;
diff --git a/bin/varnishtest/vtc_server.c b/bin/varnishtest/vtc_server.c
index 2943058..33ead86 100644
--- a/bin/varnishtest/vtc_server.c
+++ b/bin/varnishtest/vtc_server.c
@@ -327,7 +327,7 @@ server_dispatch_thread(void *priv)
 
 	vtc_log(vl, 2, "Dispatch started on %s", s->listen);
 
-	while (1) {
+	while (!vtc_stop) {
 		addr = (void*)&addr_s;
 		l = sizeof addr_s;
 		fd = accept(s->sock, addr, &l);