summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorweidai <weidai11@users.noreply.github.com>2003-02-24 01:48:16 +0000
committerweidai <weidai11@users.noreply.github.com>2003-02-24 01:48:16 +0000
commit5ed4a7daec36b64a13a8ed58e550c55b0389c3a6 (patch)
tree77df28b18296f9d2d58835ecb4d20f81c49f2d6b
parent9ffe5ae0357710e00f0dea7da0e29e55032d8e51 (diff)
downloadcryptopp-git-5ed4a7daec36b64a13a8ed58e550c55b0389c3a6.tar.gz
fixed FILTER_END bug
-rw-r--r--filters.cpp2
-rw-r--r--fltrimpl.h4
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) \
{\