From: phk <phk@d4fa192b-c00b-0410-8231-f00ffab90ce4>
Date: Wed, 11 Apr 2007 09:09:00 +0000 (+0000)
Subject: Remember to initialize C_flag and don't exit in far away code.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bbb5fbddb0e9550221a2434a55d864694b2160f;p=varnish

Remember to initialize C_flag and don't exit in far away code.


git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@1312 d4fa192b-c00b-0410-8231-f00ffab90ce4
---

diff --git a/varnish-cache/bin/varnishd/mgt_vcc.c b/varnish-cache/bin/varnishd/mgt_vcc.c
index f7b4e169..d7156f89 100644
--- a/varnish-cache/bin/varnishd/mgt_vcc.c
+++ b/varnish-cache/bin/varnishd/mgt_vcc.c
@@ -315,14 +315,14 @@ mgt_vcc_default(const char *b_arg, const char *f_arg, int C_flag)
 		if (C_flag) {
 			csrc = VCC_Compile(sb, buf, NULL);
 			fputs(csrc, stdout);
-			exit (0);
+			return (0);
 		}
 		vf = mgt_VccCompile(sb, buf, NULL);
 		free(buf);
 	} else if (C_flag) {
 		csrc = VCC_CompileFile(sb, f_arg);
 		fputs(csrc, stdout);
-		exit (0);
+		return (0);
 	} else {
 		vf = mgt_VccCompileFile(sb, f_arg);
 	}
diff --git a/varnish-cache/bin/varnishd/varnishd.c b/varnish-cache/bin/varnishd/varnishd.c
index b4283996..e547bec3 100644
--- a/varnish-cache/bin/varnishd/varnishd.c
+++ b/varnish-cache/bin/varnishd/varnishd.c
@@ -398,7 +398,7 @@ main(int argc, char *argv[])
 	const char *h_flag = "classic";
 	const char *s_arg = "file";
 	const char *T_arg = NULL;
-	unsigned C_flag;
+	unsigned C_flag = 0;
 	char *p;
 	struct params param;
 	struct cli cli[1];
@@ -501,6 +501,8 @@ main(int argc, char *argv[])
 
 	if (mgt_vcc_default(b_arg, f_arg, C_flag))
 		exit (2);
+	if (C_flag)
+		exit (0);
 
 	setup_storage(s_arg);
 	setup_hash(h_flag);