[master] 441c29d Fix query expression error printing

[Martin Blix Grydeland]

commit 441c29d27087eb4c1ae965f8bcbf9f25e0ae90fc
Author: Martin Blix Grydeland <martin at varnish-software.com>
Date:   Mon Sep 30 15:19:45 2013 +0200

    Fix query expression error printing

diff --git a/lib/libvarnishapi/vsl_query.c b/lib/libvarnishapi/vsl_query.c
index 7f1b66b..40780bb 100644
--- a/lib/libvarnishapi/vsl_query.c
+++ b/lib/libvarnishapi/vsl_query.c
@@ -297,7 +297,7 @@ vslq_newquery(struct VSL_data *vsl, enum VSL_grouping_e grouping,
 	vex = vex_New(querystring, vsb);
 	VSB_finish(vsb);
 	if (vex == NULL)
-		vsl_diag(vsl, "Query expression error:\n%s", VSB_data(vsb));
+		vsl_diag(vsl, "%s", VSB_data(vsb));
 	else {
 		ALLOC_OBJ(query, VSLQ_QUERY_MAGIC);
 		query->vex = vex;
diff --git a/lib/libvarnishtools/vut.c b/lib/libvarnishtools/vut.c
index 4cf5c71..8c2f90c 100644
--- a/lib/libvarnishtools/vut.c
+++ b/lib/libvarnishtools/vut.c
@@ -207,7 +207,7 @@ VUT_Setup(void)
 	/* Create query */
 	VUT.vslq = VSLQ_New(VUT.vsl, &c, VUT.g_arg, VUT.q_arg);
 	if (VUT.vslq == NULL)
-		VUT_Error(1, "Query parse error (%s)", VSL_Error(VUT.vsl));
+		VUT_Error(1, "Query expression error:\n%s", VSL_Error(VUT.vsl));
 	AZ(c);
 
 	/* Signal handlers */