From 2289c76160ce336ae6308d1bde285278fe52bbb3 Mon Sep 17 00:00:00 2001 From: des Date: Mon, 30 Jul 2007 14:22:00 +0000 Subject: [PATCH] Bogons in previous commit. Pass me the pointy hat... git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1789 d4fa192b-c00b-0410-8231-f00ffab90ce4 --- varnish-cache/bin/varnishd/mgt_child.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/varnish-cache/bin/varnishd/mgt_child.c b/varnish-cache/bin/varnishd/mgt_child.c index 65813b27..b51294ec 100644 --- a/varnish-cache/bin/varnishd/mgt_child.c +++ b/varnish-cache/bin/varnishd/mgt_child.c @@ -197,8 +197,7 @@ start_child(void) /* Redirect stdin/out/err */ AZ(close(0)); - i = open("/dev/null", O_RDONLY); - xxxassert(i == 0); + assert(open("/dev/null", O_RDONLY) == 0); assert(dup2(child_fds[1], 1) == 1); assert(dup2(child_fds[1], 2) == 2); AZ(close(child_fds[0])); @@ -213,7 +212,7 @@ start_child(void) signal(SIGTERM, SIG_DFL); child_main(); - exit (1); + exit(1); } fprintf(stderr, "start child pid %jd\n", (intmax_t)pid); @@ -247,7 +246,7 @@ start_child(void) heritage.fds[1] = -1; AZ(close(heritage.fds[2])); heritage.fds[2] = -1; - child_pid = i; + child_pid = pid; if (mgt_push_vcls_and_start(&u, &p)) { fprintf(stderr, "Pushing vcls failed:\n%s\n", p); free(p); -- 2.39.5