[master] 77f49d0 Use vcc_expr_tostring and polish

Federico G. Schwindt fgsch at lodoss.net
Mon Sep 12 12:35:14 CEST 2016


commit 77f49d0db4752f17815c9642212895aa475e72ee
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Mon Sep 12 10:26:32 2016 +0100

    Use vcc_expr_tostring and polish

diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
index 3e0feef..4ced132 100644
--- a/lib/libvcc/vcc_expr.c
+++ b/lib/libvcc/vcc_expr.c
@@ -1062,10 +1062,8 @@ vcc_expr_strfold(struct vcc *tl, struct expr **e, vcc_type_t fmt)
 	ERRCHK(tl);
 
 	if (fmt != STRING_LIST && (*e)->fmt == STRING_LIST)
-		*e = vcc_expr_edit(STRING,
-		    "\v+VRT_CollectString(ctx,\n\v1,\nvrt_magic_string_end)\v-",
-		    *e, NULL);
-	if (fmt == STRING_LIST && (*e)->fmt == STRING)
+		vcc_expr_tostring(tl, e, STRING);
+	else if (fmt == STRING_LIST && (*e)->fmt == STRING)
 		(*e)->fmt = STRING_LIST;
 }
 



More information about the varnish-commit mailing list