[master] 0f81a95 Give VDI->list() a j_flag argument for JSON output.

[Poul-Henning Kamp]

commit 0f81a958212a4062f2894590663d6dd86115b42b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun May 13 14:22:29 2018 +0000

    Give VDI->list() a j_flag argument for JSON output.

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 982183b..512886a 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -411,12 +411,14 @@ vbe_panic(const struct director *d, struct vsb *vsb)
  */
 
 static void
-vbe_list(const struct director *d, struct vsb *vsb, int vflag, int pflag)
+vbe_list(const struct director *d, struct vsb *vsb, int vflag, int pflag,
+    int jflag)
 {
 	struct backend *bp;
 
 	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
 	CAST_OBJ_NOTNULL(bp, d->priv, BACKEND_MAGIC);
+	AZ(jflag);
 
 	if (bp->probe != NULL)
 		VBP_Status(vsb, bp, vflag | pflag);
diff --git a/bin/varnishd/cache/cache_director.c b/bin/varnishd/cache/cache_director.c
index f5552fe..671e305 100644
--- a/bin/varnishd/cache/cache_director.c
+++ b/bin/varnishd/cache/cache_director.c
@@ -36,7 +36,6 @@
 #include "config.h"
 
 #include "cache_varnishd.h"
-
 #include "cache_director.h"
 
 #include "vcli_serve.h"
@@ -292,14 +291,14 @@ do_list(struct cli *cli, struct director *d, void *priv)
 	VCLI_Out(cli, "\n%-30s %-7s ", d->vdir->cli_name, VDI_Ahealth(d));
 
 	if (d->vdir->methods->list != NULL)
-		d->vdir->methods->list(d, cli->sb, 0, 0);
+		d->vdir->methods->list(d, cli->sb, 0, 0, 0);
 	else
 		VCLI_Out(cli, "%-10s", d->sick ? "sick" : "healthy");
 
 	VTIM_format(d->vdir->health_changed, time_str);
 	VCLI_Out(cli, " %s", time_str);
 	if ((la->p || la->v) && d->vdir->methods->list != NULL)
-		d->vdir->methods->list(d, cli->sb, la->p, la->v);
+		d->vdir->methods->list(d, cli->sb, la->p, la->v, 0);
 	return (0);
 }
 
diff --git a/include/vrt.h b/include/vrt.h
index a0c142c..9af2346 100644
--- a/include/vrt.h
+++ b/include/vrt.h
@@ -426,7 +426,7 @@ typedef enum sess_close vdi_http1pipe_f(VRT_CTX, VCL_BACKEND);
 typedef void vdi_event_f(VCL_BACKEND, enum vcl_event_e);
 typedef void vdi_destroy_f(VCL_BACKEND);
 typedef void vdi_panic_f(VCL_BACKEND, struct vsb *);
-typedef void vdi_list_f(VCL_BACKEND, struct vsb *, int, int);
+typedef void vdi_list_f(VCL_BACKEND, struct vsb *, int, int, int);
 
 struct vdi_methods {
 	unsigned			magic;