[master] ea55fc0 Remove old bandaid from VCL1->VCL2 transition.

Poul-Henning Kamp phk at varnish-cache.org
Tue May 7 13:35:40 CEST 2013


commit ea55fc01e04871abeeec989d87ccea601038994e
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue May 7 11:35:22 2013 +0000

    Remove old bandaid from VCL1->VCL2 transition.

diff --git a/lib/libvcl/vcc_action.c b/lib/libvcl/vcc_action.c
index b84df6f..057e151 100644
--- a/lib/libvcl/vcc_action.c
+++ b/lib/libvcl/vcc_action.c
@@ -276,17 +276,6 @@ parse_ban(struct vcc *tl)
 /*--------------------------------------------------------------------*/
 
 static void
-parse_new_syntax(struct vcc *tl)
-{
-
-	VSB_printf(tl->sb, "Please change \"%.*s\" to \"return(%.*s)\".\n",
-	    PF(tl->t), PF(tl->t));
-	vcc_ErrWhere(tl, tl->t);
-}
-
-/*--------------------------------------------------------------------*/
-
-static void
 parse_hash_data(struct vcc *tl)
 {
 	vcc_NextToken(tl);
@@ -379,11 +368,6 @@ static struct action_table {
             VCL_MET_MISS | VCL_MET_LOOKUP | VCL_MET_BACKEND_RESPONSE
 	},
 
-#define VCL_RET_MAC(l, U, B)						\
-	{ #l,			parse_new_syntax },
-#include "tbl/vcl_returns.h"
-#undef VCL_RET_MAC
-
 	/* Keep list sorted from here */
 	{ "call",		parse_call },
 	{ "hash_data",		parse_hash_data, VCL_MET_HASH },



More information about the varnish-commit mailing list