From 71f06fab915f20d10b4b97d6c927087228b51f6e Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Thu, 29 Nov 2012 22:33:04 +0100 Subject: Trivial 64-bit warning fixes. --- src/utility/encoder/b64Encoder.cpp | 4 ++-- src/utility/encoder/qpEncoder.cpp | 8 ++++---- src/utility/encoder/uuEncoder.cpp | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/utility/encoder') diff --git a/src/utility/encoder/b64Encoder.cpp b/src/utility/encoder/b64Encoder.cpp index 58ef3200..85c972f9 100644 --- a/src/utility/encoder/b64Encoder.cpp +++ b/src/utility/encoder/b64Encoder.cpp @@ -197,8 +197,8 @@ utility::stream::size_type b64Encoder::decode(utility::inputStream& in, // Process the data char buffer[16384]; - int bufferLength = 0; - int bufferPos = 0; + utility::stream::size_type bufferLength = 0; + utility::stream::size_type bufferPos = 0; utility::stream::size_type total = 0; utility::stream::size_type inTotal = 0; diff --git a/src/utility/encoder/qpEncoder.cpp b/src/utility/encoder/qpEncoder.cpp index ab8db2e4..9e1c1ccd 100644 --- a/src/utility/encoder/qpEncoder.cpp +++ b/src/utility/encoder/qpEncoder.cpp @@ -178,8 +178,8 @@ utility::stream::size_type qpEncoder::encode(utility::inputStream& in, // Process the data char buffer[16384]; - int bufferLength = 0; - int bufferPos = 0; + utility::stream::size_type bufferLength = 0; + utility::stream::size_type bufferPos = 0; string::size_type curCol = 0; @@ -380,8 +380,8 @@ utility::stream::size_type qpEncoder::decode(utility::inputStream& in, const bool rfc2047 = getProperties().getProperty ("rfc2047", false); char buffer[16384]; - int bufferLength = 0; - int bufferPos = 0; + utility::stream::size_type bufferLength = 0; + utility::stream::size_type bufferPos = 0; unsigned char outBuffer[16384]; int outBufferPos = 0; diff --git a/src/utility/encoder/uuEncoder.cpp b/src/utility/encoder/uuEncoder.cpp index 0ddfbac6..4b4d83d8 100644 --- a/src/utility/encoder/uuEncoder.cpp +++ b/src/utility/encoder/uuEncoder.cpp @@ -52,15 +52,15 @@ const std::vector uuEncoder::getAvailableProperties() const // This is the character encoding function to make a character printable -static inline unsigned char UUENCODE(const unsigned char c) +static inline unsigned char UUENCODE(const unsigned long c) { - return ((c & 077) + ' '); + return static_cast ((c & 077) + ' '); } // Single character decoding -static inline unsigned char UUDECODE(const unsigned char c) +static inline unsigned char UUDECODE(const unsigned long c) { - return ((c - ' ') & 077); + return static_cast ((c - ' ') & 077); } -- cgit v1.2.3