From 3a0489a4a974dfed5cd435067e79c575715dc0ca Mon Sep 17 00:00:00 2001 From: Andrey Prygunkov Date: Mon, 16 Oct 2017 18:13:34 +0200 Subject: [PATCH] #435: fixed warnings in 64 bit mode on Windows --- daemon/nntp/ArticleWriter.cpp | 4 ++-- daemon/nntp/Decoder.cpp | 12 ++++++------ daemon/postprocess/RarRenamer.cpp | 4 ++-- lib/yencode/ScalarDecoder.cpp | 2 +- lib/yencode/Sse2Decoder.cpp | 4 ++-- lib/yencode/Ssse3Decoder.cpp | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/daemon/nntp/ArticleWriter.cpp b/daemon/nntp/ArticleWriter.cpp index 2411438f..6d972a5f 100644 --- a/daemon/nntp/ArticleWriter.cpp +++ b/daemon/nntp/ArticleWriter.cpp @@ -245,7 +245,7 @@ bool ArticleWriter::CreateOutputFile(int64 size) // ensure the directory exist BString<1024> destDir; - destDir.Set(m_outputFilename, FileSystem::BaseFileName(m_outputFilename) - m_outputFilename); + destDir.Set(m_outputFilename, (int)(FileSystem::BaseFileName(m_outputFilename) - m_outputFilename)); CString errmsg; if (!FileSystem::ForceDirectories(destDir, errmsg)) @@ -505,7 +505,7 @@ void ArticleWriter::CompleteFileParts() { debug("Checking old dir for: %s", *m_outputFilename); BString<1024> oldDestDir; - oldDestDir.Set(m_outputFilename, FileSystem::BaseFileName(m_outputFilename) - m_outputFilename); + oldDestDir.Set(m_outputFilename, (int)(FileSystem::BaseFileName(m_outputFilename) - m_outputFilename)); if (FileSystem::DirEmpty(oldDestDir)) { debug("Deleting old dir: %s", *oldDestDir); diff --git a/daemon/nntp/Decoder.cpp b/daemon/nntp/Decoder.cpp index 3462f7c7..051686ca 100644 --- a/daemon/nntp/Decoder.cpp +++ b/daemon/nntp/Decoder.cpp @@ -82,7 +82,7 @@ int Decoder::DecodeBuffer(char* buffer, int len) char* line = (char*)m_lineBuf; while (char* end = strchr(line, '\n')) { - int llen = end - line + 1; + int llen = (int)(end - line + 1); if (line[0] == '.' && line[1] == '\r') { @@ -101,7 +101,7 @@ int Decoder::DecodeBuffer(char* buffer, int len) ProcessYenc(line, llen); if (m_body) { - outlen = DecodeYenc(end + 1, buffer, m_lineBuf.Length() - (end + 1 - m_lineBuf)); + outlen = DecodeYenc(end + 1, buffer, m_lineBuf.Length() - (int)(end + 1 - m_lineBuf)); if (m_body) { m_lineBuf.SetLength(0); @@ -121,7 +121,7 @@ int Decoder::DecodeBuffer(char* buffer, int len) if (*line) { - len = m_lineBuf.Length() - (line - m_lineBuf); + len = m_lineBuf.Length() - (int)(line - m_lineBuf); memmove((char*)m_lineBuf, line, len); m_lineBuf.SetLength(len); } @@ -272,7 +272,7 @@ char* Decoder::FindStreamEnd(char* buffer, int len) { return end + 1; } - llen -= end - line; + llen -= (int)(end - line); line = end + 1; } @@ -292,7 +292,7 @@ int Decoder::DecodeYenc(char* buffer, char* outbuf, int len) char* end = FindStreamEnd(buffer, len); if (end) { - len = end - buffer; + len = (int)(end - buffer); } #ifdef SKIP_ARTICLE_DECODING @@ -310,7 +310,7 @@ int Decoder::DecodeYenc(char* buffer, char* outbuf, int len) { m_lineBuf.Append(&m_extraChar, 1); } - m_lineBuf.Append(end, inpLen - (end - buffer)); + m_lineBuf.Append(end, inpLen - (int)(end - buffer)); m_body = false; } diff --git a/daemon/postprocess/RarRenamer.cpp b/daemon/postprocess/RarRenamer.cpp index 4530ba6e..33cd3f43 100644 --- a/daemon/postprocess/RarRenamer.cpp +++ b/daemon/postprocess/RarRenamer.cpp @@ -305,8 +305,8 @@ bool RarRenamer::SameArchiveName(const char* filename1, const char* filename2, b return false; } BString<1024> name1, name2; - name1.Set(filename1, ext1 - filename1); - name2.Set(filename2, ext2 - filename2); + name1.Set(filename1, (int)(ext1 - filename1)); + name2.Set(filename2, (int)(ext2 - filename2)); ext1 = strrchr(name1, '.'); ext2 = strrchr(name2, '.'); return ext1 && ext2 && strlen(ext1) == strlen(ext2) && diff --git a/lib/yencode/ScalarDecoder.cpp b/lib/yencode/ScalarDecoder.cpp index f128e895..e44ec134 100644 --- a/lib/yencode/ScalarDecoder.cpp +++ b/lib/yencode/ScalarDecoder.cpp @@ -40,7 +40,7 @@ namespace YEncode size_t decode_scalar(const unsigned char* src, unsigned char* dest, size_t len, char* state) { unsigned char *es = (unsigned char*)src + len; // end source pointer unsigned char *p = dest; // destination pointer - long i = -len; // input position + long i = -(long)len; // input position unsigned char c; // input character if (len < 1) return 0; diff --git a/lib/yencode/Sse2Decoder.cpp b/lib/yencode/Sse2Decoder.cpp index 7d7cae3f..a3c47292 100644 --- a/lib/yencode/Sse2Decoder.cpp +++ b/lib/yencode/Sse2Decoder.cpp @@ -61,7 +61,7 @@ size_t do_decode_sse2(const unsigned char* src, unsigned char* dest, size_t len, // find source memory alignment unsigned char* aSrc = (unsigned char*)(((uintptr_t)src + (sizeof(__m128i)-1)) & ~(sizeof(__m128i)-1)); - i = aSrc - src; + i = (unsigned long)(aSrc - src); p += decode_scalar(src, dest, i, pState); } @@ -77,7 +77,7 @@ size_t do_decode_sse2(const unsigned char* src, unsigned char* dest, size_t len, size_t dLen = len - (sizeof(__m128i)+1); dLen = ((dLen-i) + 0xf) & ~0xf; unsigned char* dSrc = (unsigned char*)src + dLen + i; - long dI = -dLen; + long dI = -(long)dLen; i += dLen; for(; dI; dI += sizeof(__m128i)) { diff --git a/lib/yencode/Ssse3Decoder.cpp b/lib/yencode/Ssse3Decoder.cpp index 172bda4b..15a971ee 100644 --- a/lib/yencode/Ssse3Decoder.cpp +++ b/lib/yencode/Ssse3Decoder.cpp @@ -87,7 +87,7 @@ size_t do_decode_ssse3(const unsigned char* src, unsigned char* dest, size_t len // find source memory alignment unsigned char* aSrc = (unsigned char*)(((uintptr_t)src + (sizeof(__m128i)-1)) & ~(sizeof(__m128i)-1)); - i = aSrc - src; + i = (unsigned long)(aSrc - src); p += decode_scalar(src, dest, i, pState); } @@ -104,7 +104,7 @@ size_t do_decode_ssse3(const unsigned char* src, unsigned char* dest, size_t len size_t dLen = len - (sizeof(__m128i)+1); dLen = ((dLen-i) + 0xf) & ~0xf; unsigned char* dSrc = (unsigned char*)src + dLen + i; - long dI = -dLen; + long dI = -(long)dLen; i += dLen; for(; dI; dI += sizeof(__m128i)) {