From 5ed4a7daec36b64a13a8ed58e550c55b0389c3a6 Mon Sep 17 00:00:00 2001 From: weidai Date: Mon, 24 Feb 2003 01:48:16 +0000 Subject: [PATCH] fixed FILTER_END bug --- filters.cpp | 2 +- fltrimpl.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/filters.cpp b/filters.cpp index 007b1d72..d2b08fed 100644 --- a/filters.cpp +++ b/filters.cpp @@ -145,7 +145,7 @@ unsigned int MeterFilter::Put2(const byte *begin, unsigned int length, int messa } FILTER_OUTPUT(1, begin, length, messageEnd); - FILTER_END; + FILTER_END_NO_MESSAGE_END; } bool MeterFilter::IsolatedMessageSeriesEnd(bool blocking) diff --git a/fltrimpl.h b/fltrimpl.h index 6c37bfa5..a35e68b0 100644 --- a/fltrimpl.h +++ b/fltrimpl.h @@ -17,11 +17,13 @@ FILTER_END_NO_MESSAGE_END_NO_RETURN \ return 0; +/* #define FILTER_END \ case -1: \ - if (Output(-1, NULL, 0, messageEnd, blocking)) \ + if (messageEnd && Output(-1, NULL, 0, messageEnd, blocking)) \ return 1; \ FILTER_END_NO_MESSAGE_END +*/ #define FILTER_OUTPUT2(site, statement, output, length, messageEnd) \ {\