]> err.no Git - varnish/commitdiff
Bogons in previous commit. Pass me the pointy hat...
authordes <des@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Mon, 30 Jul 2007 14:22:00 +0000 (14:22 +0000)
committerdes <des@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Mon, 30 Jul 2007 14:22:00 +0000 (14:22 +0000)
git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1789 d4fa192b-c00b-0410-8231-f00ffab90ce4

varnish-cache/bin/varnishd/mgt_child.c

index 65813b273b1d86392258583eac3343baa604af7e..b51294ec3ee7bc147969dc41a94fb1ab1a766779 100644 (file)
@@ -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);