[master] b31580e In the vtc_thread vtc_log(0) doesn't terminate, so add a return.

Poul-Henning Kamp phk at FreeBSD.org
Mon Mar 16 13:16:07 CET 2015


commit b31580e848d5424f45db0e2ecc5ad27e5c4bb838
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Mar 16 11:59:14 2015 +0000

    In the vtc_thread vtc_log(0) doesn't terminate, so add a return.

diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 95086a9..9f3a305 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -769,6 +769,10 @@ varnish_expect(const struct varnish *v, char * const *av) {
 	if (r[0] == '!') {
 		not = 1;
 		r++;
+		AZ(av[1]);
+	} else {
+		AN(av[1]);
+		AN(av[2]);
 	}
 	p = strchr(r, '.');
 	if (p == NULL) {
@@ -804,8 +808,10 @@ varnish_expect(const struct varnish *v, char * const *av) {
 			continue;
 		}
 
-		if (not)
+		if (not) {
 			vtc_log(v->vl, 0, "Found (not expected): %s", av[0]+1);
+			return;
+		}
 
 		good = 0;
 		ref = strtoumax(av[2], &p, 0);



More information about the varnish-commit mailing list