Clear unused variable in fltimpl.h in cross-compiler way

This commit is contained in:
Jeffrey Walton 2023-06-22 22:36:25 -04:00
parent c654762f91
commit 14d799767a
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 4 additions and 22 deletions

View File

@ -225,7 +225,7 @@ size_t Grouper::Put2(const byte *begin, size_t length, int messageEnd, bool bloc
}
size_t len;
FILTER_OUTPUT2(2, len = STDMIN(length-m_inputPosition, m_groupSize-m_counter),
FILTER_OUTPUT2(2, (len = STDMIN(length-m_inputPosition, m_groupSize-m_counter)),
begin+m_inputPosition, len, 0);
m_inputPosition += len;
m_counter += len;

View File

@ -1,16 +1,6 @@
#ifndef CRYPTOPP_FLTRIMPL_H
#define CRYPTOPP_FLTRIMPL_H
#if CRYPTOPP_MSC_VERSION
# pragma warning(push)
# pragma warning(disable: 4100)
#endif
#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-value"
#endif
#define FILTER_BEGIN \
switch (m_continueAt) \
{ \
@ -38,7 +28,7 @@
#define FILTER_OUTPUT3(site, statement, output, length, messageEnd, channel) \
{\
case site: \
statement; \
(void) statement; \
if (Output(site, output, length, messageEnd, blocking, channel)) \
return STDMAX(size_t(1), length-m_inputPosition);\
}
@ -56,7 +46,7 @@
{\
/* fall through */ \
case site: \
statement; \
(void) statement; \
if (OutputModifiable(site, output, length, messageEnd, blocking)) \
return STDMAX(size_t(1), length-m_inputPosition);\
}
@ -68,7 +58,7 @@
{\
/* fall through */ \
case site: \
statement; \
(void) statement; \
if (modifiable ? OutputModifiable(site, output, length, messageEnd, blocking) : Output(site, output, length, messageEnd, blocking)) \
return STDMAX(size_t(1), length-m_inputPosition);\
}
@ -76,12 +66,4 @@
#define FILTER_OUTPUT_MAYBE_MODIFIABLE(site, output, length, messageEnd, modifiable) \
FILTER_OUTPUT2_MAYBE_MODIFIABLE(site, 0, output, length, messageEnd, modifiable)
#if CRYPTOPP_MSC_VERSION
# pragma warning(pop)
#endif
#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
# pragma GCC diagnostic pop
#endif
#endif