[master] b907f30 More consistent panic output

[Federico G. Schwindt]

commit b907f30c4d82d13401f81db3ed6e4de1c417a3dc
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Fri Feb 10 02:39:05 2017 +0000

    More consistent panic output

diff --git a/bin/varnishd/cache/cache_panic.c b/bin/varnishd/cache/cache_panic.c
index 216fdff..9e19c1b 100644
--- a/bin/varnishd/cache/cache_panic.c
+++ b/bin/varnishd/cache/cache_panic.c
@@ -275,7 +275,7 @@ pan_objcore(struct vsb *vsb, const char *typ, const struct objcore *oc)
 	VSB_printf(vsb, "},\n");
 	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/cache/cache_vcl.c b/bin/varnishd/cache/cache_vcl.c
index b950a96..70de663 100644
--- a/bin/varnishd/cache/cache_vcl.c
+++ b/bin/varnishd/cache/cache_vcl.c
@@ -193,8 +193,8 @@ VCL_Panic(struct vsb *vsb, const struct vcl *vcl)
 	VSB_printf(vsb, "vcl = {\n");
 	VSB_indent(vsb, 2);
 	PAN_CheckMagic(vsb, vcl, VCL_MAGIC);
-	VSB_printf(vsb, "name = \"%s\"\n", vcl->loaded_name);
-	VSB_printf(vsb, "busy = %u\n", vcl->busy);
+	VSB_printf(vsb, "name = \"%s\",\n", vcl->loaded_name);
+	VSB_printf(vsb, "busy = %u,\n", vcl->busy);
 	VSB_printf(vsb, "discard = %u,\n", vcl->discard);
 	VSB_printf(vsb, "state = %s,\n", vcl->state);
 	VSB_printf(vsb, "temp = %s,\n", (const volatile char *)vcl->temp);
diff --git a/bin/varnishd/storage/storage_simple.c b/bin/varnishd/storage/storage_simple.c
index 011b9ec..0ad45f7 100644
--- a/bin/varnishd/storage/storage_simple.c
+++ b/bin/varnishd/storage/storage_simple.c
@@ -642,7 +642,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);
 }
 
@@ -652,7 +652,7 @@ SML_panic(struct vsb *vsb, const struct objcore *oc)
 	struct object *o;
 	struct storage *st;
 
-	VSB_printf(vsb, "Simple = %p\n", oc->stobj->priv);
+	VSB_printf(vsb, "Simple = %p,\n", oc->stobj->priv);
 	if (oc->stobj->priv == NULL)
 		return;
 	CAST_OBJ_NOTNULL(o, oc->stobj->priv, OBJECT_MAGIC);
@@ -661,10 +661,10 @@ SML_panic(struct vsb *vsb, const struct objcore *oc)
 #define OBJ_FIXATTR(U, l, sz) \
 	VSB_printf(vsb, "%s = ", #U); \
 	VSB_quote(vsb, (const void*)o->fa_##l, sz, VSB_QUOTE_HEX); \
-	VSB_printf(vsb, "\n");
+	VSB_printf(vsb, ",\n");
 
 #define OBJ_VARATTR(U, l) \
-	VSB_printf(vsb, "%s = {len=%u, ptr=%p}\n", \
+	VSB_printf(vsb, "%s = {len=%u, ptr=%p},\n", \
 	    #U, o->va_##l##_len, o->va_##l);
 
 #define OBJ_AUXATTR(U, l) \