[master] 9e25fff More minor tweaks on panic output

[Federico G. Schwindt]

commit 9e25fff1593472fdfd5e3f4cd9fe78c9a5ec6b2b
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Mar 14 00:35:54 2016 +0000

    More minor tweaks on panic output

diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 55fab6a..e0c5268 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -145,19 +145,19 @@ pan_ws(struct vsb *vsb, const struct ws *ws)
 	if (!(ws->id[0] & 0x20))
 		VSB_printf(vsb, "OVERFLOWED ");
 	VSB_printf(vsb, "id = \"%s\",\n",  ws->id);
-	VSB_printf(vsb, "{s,f,r,e} = {%p",  ws->s);
+	VSB_printf(vsb, "{s, f, r, e} = {%p",  ws->s);
 	if (ws->f > ws->s)
-		VSB_printf(vsb, ",+%ld", (long) (ws->f - ws->s));
+		VSB_printf(vsb, ", +%ld", (long) (ws->f - ws->s));
 	else
-		VSB_printf(vsb, ",%p", ws->f);
+		VSB_printf(vsb, ", %p", ws->f);
 	if (ws->r > ws->s)
-		VSB_printf(vsb, ",+%ld", (long) (ws->r - ws->s));
+		VSB_printf(vsb, ", +%ld", (long) (ws->r - ws->s));
 	else
-		VSB_printf(vsb, ",%p", ws->r);
+		VSB_printf(vsb, ", %p", ws->r);
 	if (ws->e > ws->s)
-		VSB_printf(vsb, ",+%ld", (long) (ws->e - ws->s));
+		VSB_printf(vsb, ", +%ld", (long) (ws->e - ws->s));
 	else
-		VSB_printf(vsb, ",%p", ws->e);
+		VSB_printf(vsb, ", %p", ws->e);
 	VSB_printf(vsb, "},\n");
 	VSB_indent(vsb, -2);
 	VSB_printf(vsb, "},\n");
@@ -249,7 +249,7 @@ pan_objcore(struct vsb *vsb, const char *typ, const struct objcore *oc)
 	VSB_printf(vsb, "exp_flags = 0x%x,\n", oc->exp_flags);
 	if (oc->boc != NULL)
 		pan_boc(vsb, oc->boc);
-	VSB_printf(vsb, "exp = {%f,%f,%f,%f}\n",
+	VSB_printf(vsb, "exp = {%f, %f, %f, %f}\n",
 	    oc->t_origin, oc->ttl, oc->grace, oc->keep);
 	VSB_printf(vsb, "objhead = %p,\n", oc->objhead);
 	VSB_printf(vsb, "stevedore = %p", oc->stobj->stevedore);
diff --git a/bin/varnishd/storage/storage_simple.c b/bin/varnishd/storage/storage_simple.c
index 39d2bac..d597b43 100644
--- a/bin/varnishd/storage/storage_simple.c
+++ b/bin/varnishd/storage/storage_simple.c
@@ -645,7 +645,7 @@ const struct obj_methods SML_methods = {
 static void
 sml_panic_st(struct vsb *vsb, const char *hd, const struct storage *st)
 {
-	VSB_printf(vsb, "%s %p {priv=%p ptr=%p len=%u space=%u}\n",
+	VSB_printf(vsb, "%s %p {priv=%p, ptr=%p, len=%u, space=%u}\n",
 	    hd, st, st->priv, st->ptr, st->len, st->space);
 }