nitpicking:

Remove two spurious newlines in shmlog messages.
Assert that restarts is zero when we begin.

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

diff --git a/varnish-cache/bin/varnishd/cache_center.c b/varnish-cache/bin/varnishd/cache_center.c
index a299a6e0f22d5528b264ffa00fc8bd8978ba8700..de730b10b1d6b0229accc52a18fd345cf2be3608 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_center.c
+++ b/varnish-cache/bin/varnishd/cache_center.c
@@ -465,6 +465,7 @@ cnt_first(struct sess *sp)
         */
 
        assert(sp->xid == 0);
+       assert(sp->restarts == 0);
        VCA_Prep(sp);
 
        /* Record the session watermark */
@@ -1059,7 +1060,7 @@ cli_debug_xid(struct cli *cli, const char * const *av, void *priv)
         (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[] = {

diff --git a/varnish-cache/bin/varnishd/cache_vcl.c b/varnish-cache/bin/varnishd/cache_vcl.c
index ce1b5a9e5c8fe73fda134d48dd3c0cc2bc4f872c..e73d636cdd975144abeb1bd6466f9ffa6b163cee 100644 (file)
--- a/varnish-cache/bin/varnishd/cache_vcl.c
+++ b/varnish-cache/bin/varnishd/cache_vcl.c
@@ -171,7 +171,7 @@ VCL_Load(const char *fn, const char *name, struct cli *cli)
        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++;