[master] 2f1c3bce3 Avoid detour over VRT_CollectString()

Poul-Henning Kamp phk at FreeBSD.org
Thu Jun 20 08:49:09 UTC 2019


commit 2f1c3bce3bc092cb0c9fb64508dbbefe18d22dba
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Jun 20 08:46:36 2019 +0000

    Avoid detour over VRT_CollectString()

diff --git a/lib/libvmod_debug/vmod_debug_obj.c b/lib/libvmod_debug/vmod_debug_obj.c
index 3928e5598..6dd6b48d0 100644
--- a/lib/libvmod_debug/vmod_debug_obj.c
+++ b/lib/libvmod_debug/vmod_debug_obj.c
@@ -232,15 +232,16 @@ xyzzy_obj_opt_meth_opt(VRT_CTX,
 	assert(args->arg1 != args->arg2);
 	assert(args->arg2 != args->arg3);
 
-	return (VRT_CollectString(ctx,
-	    "obj ", o->name,
-	    " obj_s ", (o->args.valid_s ? o->args.s : "*undef*"),
-	    " obj_b ", (o->args.valid_b
+	return (WS_Printf(ctx->ws,
+	    "obj %s obj_s %s obj_b %s met_s %s met_b %s",
+            o->name,
+	    (o->args.valid_s ? o->args.s : "*undef*"),
+	    (o->args.valid_b
 			? (o->args.b ? "true" : "false" )
 			: "*undef*"),
-	    " met_s ", (args->valid_s ? args->s : "*undef*"),
-	    " met_b ", (args->valid_b
+	    (args->valid_s ? args->s : "*undef*"),
+	    (args->valid_b
 			? (args->b ? "true" : "false" )
-			: "*undef*"),
-	    vrt_magic_string_end));
+			: "*undef*")
+	));
 }


More information about the varnish-commit mailing list