[master] f0530c9 Fix indentation for regsub

Poul-Henning Kamp phk at varnish-cache.org
Wed Oct 24 10:43:30 CEST 2012


commit f0530c9ee20f527a73fe53c06d3e290225533c7b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Oct 24 08:43:17 2012 +0000

    Fix indentation for regsub

diff --git a/lib/libvcl/vcc_expr.c b/lib/libvcl/vcc_expr.c
index 17b0853..00e5994 100644
--- a/lib/libvcl/vcc_expr.c
+++ b/lib/libvcl/vcc_expr.c
@@ -482,7 +482,7 @@ vcc_Eval_Regsub(struct vcc *tl, struct expr **e, const struct symbol *sym)
 	p = vcc_regexp(tl);
 	vcc_NextToken(tl);
 
-	bprintf(buf, "VRT_regsub(req, %d,\n\v1,\n%s\n", all, p);
+	bprintf(buf, "VRT_regsub(req, %d,\v+\n\v1,\n%s", all, p);
 	*e = vcc_expr_edit(STRING, buf, e2, *e);
 
 	SkipToken(tl, ',');
@@ -491,7 +491,7 @@ vcc_Eval_Regsub(struct vcc *tl, struct expr **e, const struct symbol *sym)
 		return;
 	if (e2->fmt != STRING)
 		vcc_expr_tostring(&e2, STRING);
-	*e = vcc_expr_edit(STRING, "\v1, \v2)", *e, e2);
+	*e = vcc_expr_edit(STRING, "\v1,\n\v2)\v-",*e, e2);
 	SkipToken(tl, ')');
 }
 



More information about the varnish-commit mailing list