diff --git a/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/Clock.cpp b/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/Clock.cpp index 2f5f47b4..2b7265bc 100644 --- a/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/Clock.cpp +++ b/external/3rd/library/soePlatform/CTServiceGameAPI/TcpLibrary/Clock.cpp @@ -46,8 +46,6 @@ ClockStamp Clock::getCurTime() return ret; #else struct timeval tv; - int err; - err = gettimeofday(&tv, NULL); return (static_cast(tv.tv_sec) * 1000 + static_cast(tv.tv_usec / 1000)); #endif } diff --git a/external/3rd/library/udplibrary/hashtable.hpp b/external/3rd/library/udplibrary/hashtable.hpp index 5a6d55aa..8c7340bc 100644 --- a/external/3rd/library/udplibrary/hashtable.hpp +++ b/external/3rd/library/udplibrary/hashtable.hpp @@ -148,7 +148,7 @@ inline int UpperHashString(char *string) int h = 0; while (*string != 0) { - h = ((31 * h) + ((*string >= 'a' && *string <= 'z') ? (*string - 0x20) : *string) ^ (h >> 26)); + h = ((31 * h) + (((*string >= 'a' && *string <= 'z') ? (*string - 0x20) : *string) ^ (h >> 26))); string++; } return(h); diff --git a/external/ours/library/crypto/src/shared/original/filters.cpp b/external/ours/library/crypto/src/shared/original/filters.cpp index ea32f50b..7caaf21d 100644 --- a/external/ours/library/crypto/src/shared/original/filters.cpp +++ b/external/ours/library/crypto/src/shared/original/filters.cpp @@ -82,7 +82,7 @@ unsigned int FilterWithBufferedInput::BlockQueue::GetAll(byte *outString) void FilterWithBufferedInput::BlockQueue::Put(const byte *inString, unsigned int length) { assert(m_size + length <= m_buffer.size); - byte *end = (m_size < m_buffer+m_buffer.size-m_begin) ? m_begin + m_size : m_begin + m_size - m_buffer.size; + byte *end = (m_size < (unsigned)(m_buffer+m_buffer.size-m_begin)) ? m_begin + m_size : m_begin + m_size - m_buffer.size; unsigned int len = STDMIN(length, (unsigned int)(m_buffer+m_buffer.size-end)); memcpy(end, inString, len); if (len < length) diff --git a/external/ours/library/unicodeArchive/src/shared/UnicodeAutoDeltaPackedMap.cpp b/external/ours/library/unicodeArchive/src/shared/UnicodeAutoDeltaPackedMap.cpp index 2f3f26ac..8138fdbb 100644 --- a/external/ours/library/unicodeArchive/src/shared/UnicodeAutoDeltaPackedMap.cpp +++ b/external/ours/library/unicodeArchive/src/shared/UnicodeAutoDeltaPackedMap.cpp @@ -19,7 +19,6 @@ namespace Archive template <> void AutoDeltaPackedMap::pack(ByteStream & target, const std::string & buffer) { char temp[200]; - char valueBuffer[200]; Command c; Archive::put(target, countCharacter(buffer,':')); @@ -31,7 +30,6 @@ namespace Archive if (*i==':') { temp[tempPos]='\0'; - valueBuffer[0]='\0'; sscanf(temp,"%i",&c.key); char const * const valueStart = strchr(temp,' '); if (valueStart)