fix formatting glitches in -o mode

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

diff --git a/varnish-cache/bin/varnishlog/varnishlog.c b/varnish-cache/bin/varnishlog/varnishlog.c
index 98315c069312213a497e1fdb98a53572da00d89a..45547d9a2964203b3debbc572b242a43fadcb7c1 100644 (file)
--- a/varnish-cache/bin/varnishlog/varnishlog.c
+++ b/varnish-cache/bin/varnishlog/varnishlog.c
@@ -58,7 +58,7 @@ h_order(void *priv, unsigned tag, unsigned fd, unsigned len, unsigned spec, cons
        switch (tag) {
        case SLT_VCL_call:
                invcl[fd] = 1;
-               vsb_printf(ob[fd], "%5d %-12s %c <%.*s",
+               vsb_printf(ob[fd], "%5d %-12s %c %.*s",
                    fd, VSL_tags[tag],
                    ((spec & VSL_S_CLIENT) ? 'c' : \
                    (spec & VSL_S_BACKEND) ? 'b' : ' '),
@@ -78,8 +78,10 @@ h_order(void *priv, unsigned tag, unsigned fd, unsigned len, unsigned spec, cons
                invcl[fd] = 0;
                break;
        }
-       if (invcl[fd])
+       if (invcl[fd]) {
                vsb_cat(ob[fd], "\n");
+               invcl[fd] = 0;
+       }
        vsb_printf(ob[fd], "%5d %-12s %c %.*s\n",
            fd, VSL_tags[tag],
            ((spec & VSL_S_CLIENT) ? 'c' : (spec & VSL_S_BACKEND) ? 'b' : ' '),