From 202fa2b7e15fc0cd6662c4d77a2486e0b4f442b2 Mon Sep 17 00:00:00 2001 From: phk Date: Tue, 14 Oct 2008 09:16:33 +0000 Subject: [PATCH] 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 --- varnish-cache/bin/varnishd/cache_center.c | 3 ++- varnish-cache/bin/varnishd/cache_vcl.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/varnish-cache/bin/varnishd/cache_center.c b/varnish-cache/bin/varnishd/cache_center.c index a299a6e0..de730b10 100644 --- 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 ce1b5a9e..e73d636c 100644 --- 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++; -- 2.39.5