r666 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2006-08-05 14:24:25 +0200 (Sat, 05 Aug 2006)
New Revision: 666

Modified:
   trunk/varnish-cache/bin/varnishd/mgt_child.c
Log:
Style cleanup.

remove two unused variables.



Modified: trunk/varnish-cache/bin/varnishd/mgt_child.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/mgt_child.c	2006-08-05 12:24:05 UTC (rev 665)
+++ trunk/varnish-cache/bin/varnishd/mgt_child.c	2006-08-05 12:24:25 UTC (rev 666)
@@ -30,8 +30,6 @@
 
 static int		child_fds[2];
 static unsigned 	child_should_run;
-static unsigned		child_ticker;
-static unsigned		dstarts;
 
 struct evbase		*mgt_evb;
 
@@ -142,7 +140,6 @@
 		free(p);
 		exit (2);
 	}
-	child_ticker = 0;
 }
 
 /*--------------------------------------------------------------------*/
@@ -232,7 +229,7 @@
 mgt_run(int dflag)
 {
 	struct sigaction sac;
-	struct ev *ev_sigchld, *ev_sigint;
+	struct ev *e;
 
 	mgt_pid = getpid();
 
@@ -242,19 +239,20 @@
 	if (dflag)
 		mgt_cli_setup(0, 1, 1);
 
-	ev_sigint = ev_new();
-	assert(ev_sigint != NULL);
-	ev_sigint->sig = SIGINT;
-	ev_sigint->callback = mgt_sigint;
-	ev_sigint->name = "mgt_sigint";
-	AZ(ev_add(mgt_evb, ev_sigint));
+	e = ev_new();
+	assert(e != NULL);
+	e->sig = SIGINT;
+	e->callback = mgt_sigint;
+	e->name = "mgt_sigint";
+	AZ(ev_add(mgt_evb, e));
 
-	ev_sigchld = ev_new();
-	ev_sigchld->sig = SIGCHLD;
-	ev_sigchld->sig_flags = SA_NOCLDSTOP;
-	ev_sigchld->callback = mgt_sigchld;
-	ev_sigchld->name = "mgt_sigchild";
-	AZ(ev_add(mgt_evb, ev_sigchld));
+	e = ev_new();
+	assert(e != NULL);
+	e->sig = SIGCHLD;
+	e->sig_flags = SA_NOCLDSTOP;
+	e->callback = mgt_sigchld;
+	e->name = "mgt_sigchild";
+	AZ(ev_add(mgt_evb, e));
 
 	setproctitle("Varnish-Mgr");
 
@@ -285,6 +283,5 @@
 		stop_child();
 		return;
 	} 
-	dstarts = 0;
 	start_child();
 }