[master] 61a5add4c VSB_printf -> VSB_cat

Nils Goroll nils.goroll at uplex.de
Tue Mar 5 11:09:03 UTC 2019


commit 61a5add4c349b9aae7466378a14d79d4d1fab8b6
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Tue Mar 5 11:39:18 2019 +0100

    VSB_printf -> VSB_cat

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 2ba8e0a89..d5f5bb2ee 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -459,9 +459,9 @@ vbe_list(VRT_CTX, const struct director *d, struct vsb *vsb, int pflag,
 	if (bp->probe != NULL)
 		VBP_Status(vsb, bp, pflag, jflag);
 	else if (jflag && pflag)
-		VSB_printf(vsb, "{},\n");
+		VSB_cat(vsb, "{},\n");
 	else if (jflag)
-		VSB_printf(vsb, "[0, 0, \"healthy\"]");
+		VSB_cat(vsb, "[0, 0, \"healthy\"]");
 	else if (pflag)
 		return;
 	else
diff --git a/lib/libvmod_directors/vdir.c b/lib/libvmod_directors/vdir.c
index 323b155f3..95afd315d 100644
--- a/lib/libvmod_directors/vdir.c
+++ b/lib/libvmod_directors/vdir.c
@@ -207,10 +207,10 @@ vdir_list(VRT_CTX, struct vdir *vd, struct vsb *vsb, int pflag, int jflag)
 
 	if (pflag) {
 		if (jflag) {
-			VSB_printf(vsb, "{\n");
+			VSB_cat(vsb, "{\n");
 			VSB_indent(vsb, 2);
 		} else {
-			VSB_printf(vsb, "\n");
+			VSB_cat(vsb, "\n");
 		}
 	}
 
@@ -228,7 +228,7 @@ vdir_list(VRT_CTX, struct vdir *vd, struct vsb *vsb, int pflag, int jflag)
 			continue;
 		if (jflag) {
 			if (u)
-				VSB_printf(vsb, ",\n");
+				VSB_cat(vsb, ",\n");
 			VSB_printf(vsb, "\"%s\": \"%s\"",
 			    be->vcl_name, h ? "healthy" : "sick");
 		} else {
@@ -241,9 +241,9 @@ vdir_list(VRT_CTX, struct vdir *vd, struct vsb *vsb, int pflag, int jflag)
 	VRT_SetChanged(vd->dir, changed);
 
 	if (jflag && (pflag)) {
-		VSB_printf(vsb, "\n");
+		VSB_cat(vsb, "\n");
 		VSB_indent(vsb, -2);
-		VSB_printf(vsb, "},\n");
+		VSB_cat(vsb, "},\n");
 	}
 
 	if (pflag)


More information about the varnish-commit mailing list