From 87ccff097dd0f8d10119572f81d747cb544e4400 Mon Sep 17 00:00:00 2001 From: Markus Makela Date: Fri, 26 Feb 2016 12:30:56 +0200 Subject: [PATCH] Minor fix to token processing of dbfwfilter The yylineno was manually simulated even though it can be automated by enabling the yylineno option. --- server/modules/filter/dbfwfilter/token.l | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/modules/filter/dbfwfilter/token.l b/server/modules/filter/dbfwfilter/token.l index fd0f92d0f..5b0c35f66 100644 --- a/server/modules/filter/dbfwfilter/token.l +++ b/server/modules/filter/dbfwfilter/token.l @@ -22,7 +22,7 @@ %} %option reentrant noyywrap bison-bridge prefix="dbfw_yy" -/* %option header-file="lex.yy.h" */ +%option yylineno RULENAME [-_[:alnum:][:punct:]]+ STR [_[:alnum:]]+ @@ -40,7 +40,7 @@ BTSTR `[^`]*` USTR [%-_[:alnum:][:punct:]]+ %% -"\n"+ dbfw_yyset_lineno(dbfw_yyget_lineno(yyscanner) + dbfw_yyget_leng(yyscanner), yyscanner);return '\n'; +"\n"+ return '\n'; {COMMENT} return FWTOK_COMMENT; deny|allow return FWTOK_DENY; /** This should be removed at some point */ rule return FWTOK_RULE;