[master] 5bbf8b8 Another three, but these detected as "loop not reachable" because of the while { } do(0) in AZ...
Poul-Henning Kamp
phk at FreeBSD.org
Wed Jan 18 14:23:04 CET 2017
commit 5bbf8b8dc09c3441d649d37754bd1118d1aba981
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date: Wed Jan 18 13:21:54 2017 +0000
Another three, but these detected as "loop not reachable" because
of the while { } do(0) in AZ...
diff --git a/bin/varnishtest/vtc_varnish.c b/bin/varnishtest/vtc_varnish.c
index 48ef3f8..2e93365 100644
--- a/bin/varnishtest/vtc_varnish.c
+++ b/bin/varnishtest/vtc_varnish.c
@@ -475,24 +475,12 @@ varnish_launch(struct varnish *v)
i = poll(fd, 2, 10000);
vtc_log(v->vl, 4, "CLIPOLL %d 0x%x 0x%x",
i, fd[0].revents, fd[1].revents);
- if (i == 0) {
+ if (i == 0)
vtc_fatal(v->vl, "FAIL timeout waiting for CLI connection");
- AZ(close(v->cli_fd));
- v->cli_fd = -1;
- return;
- }
- if (fd[1].revents & POLLHUP) {
+ if (fd[1].revents & POLLHUP)
vtc_fatal(v->vl, "FAIL debug pipe closed");
- AZ(close(v->cli_fd));
- v->cli_fd = -1;
- return;
- }
- if (!(fd[0].revents & POLLIN)) {
+ if (!(fd[0].revents & POLLIN))
vtc_fatal(v->vl, "FAIL CLI connection wait failure");
- AZ(close(v->cli_fd));
- v->cli_fd = -1;
- return;
- }
nfd = accept(v->cli_fd, NULL, NULL);
if (nfd < 0) {
AZ(close(v->cli_fd));
More information about the varnish-commit
mailing list