r3295 - trunk/varnish-cache/bin/varnishd

[phk at projects.linpro.no]

Author: phk
Date: 2008-10-14 11:16:33 +0200 (Tue, 14 Oct 2008)
New Revision: 3295

Modified:
   trunk/varnish-cache/bin/varnishd/cache_center.c
   trunk/varnish-cache/bin/varnishd/cache_vcl.c
Log:
nitpicking:
Remove two spurious newlines in shmlog messages.
Assert that restarts is zero when we begin.



Modified: trunk/varnish-cache/bin/varnishd/cache_center.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_center.c	2008-10-14 09:15:50 UTC (rev 3294)
+++ trunk/varnish-cache/bin/varnishd/cache_center.c	2008-10-14 09:16:33 UTC (rev 3295)
@@ -465,6 +465,7 @@
 	 */
 
 	assert(sp->xid == 0);
+	assert(sp->restarts == 0);
 	VCA_Prep(sp);
 
 	/* Record the session watermark */
@@ -1059,7 +1060,7 @@
         (void)priv;
 	if (av[2] != NULL) 
 		xids = strtoul(av[2], NULL, 0);
-	cli_out(cli, "XID is %u\n", xids);
+	cli_out(cli, "XID is %u", xids);
 }
 
 static struct cli_proto debug_cmds[] = {

Modified: trunk/varnish-cache/bin/varnishd/cache_vcl.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/cache_vcl.c	2008-10-14 09:15:50 UTC (rev 3294)
+++ trunk/varnish-cache/bin/varnishd/cache_vcl.c	2008-10-14 09:16:33 UTC (rev 3295)
@@ -171,7 +171,7 @@
 	if (vcl_active == NULL)
 		vcl_active = vcl;
 	UNLOCK(&vcl_mtx);
-	cli_out(cli, "Loaded \"%s\" as \"%s\"\n", fn , name);
+	cli_out(cli, "Loaded \"%s\" as \"%s\"", fn , name);
 	vcl->conf->init_func(cli);
 	VSL_stats->n_vcl++;
 	VSL_stats->n_vcl_avail++;