remove gcc warnings

pull/2/head
weidai 2003-07-26 08:35:40 +00:00
parent 84b15bcde2
commit 7b4f0c9c47
2 changed files with 3 additions and 3 deletions

View File

@ -11,7 +11,7 @@ NAMESPACE_BEGIN(CryptoPP)
void xorbuf(byte *buf, const byte *mask, unsigned int count) void xorbuf(byte *buf, const byte *mask, unsigned int count)
{ {
if (((unsigned int)buf | (unsigned int)mask | count) % WORD_SIZE == 0) if (((size_t)buf | (size_t)mask | count) % WORD_SIZE == 0)
XorWords((word *)buf, (const word *)mask, count/WORD_SIZE); XorWords((word *)buf, (const word *)mask, count/WORD_SIZE);
else else
{ {
@ -22,7 +22,7 @@ void xorbuf(byte *buf, const byte *mask, unsigned int count)
void xorbuf(byte *output, const byte *input, const byte *mask, unsigned int count) void xorbuf(byte *output, const byte *input, const byte *mask, unsigned int count)
{ {
if (((unsigned int)output | (unsigned int)input | (unsigned int)mask | count) % WORD_SIZE == 0) if (((size_t)output | (size_t)input | (size_t)mask | count) % WORD_SIZE == 0)
XorWords((word *)output, (const word *)input, (const word *)mask, count/WORD_SIZE); XorWords((word *)output, (const word *)input, (const word *)mask, count/WORD_SIZE);
else else
{ {

View File

@ -488,9 +488,9 @@ bool Inflator::DecodeBody()
switch (m_nextDecode) switch (m_nextDecode)
{ {
case LITERAL:
while (true) while (true)
{ {
case LITERAL:
if (!pLiteralDecoder->Decode(m_reader, m_literal)) if (!pLiteralDecoder->Decode(m_reader, m_literal))
{ {
m_nextDecode = LITERAL; m_nextDecode = LITERAL;