sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing loads of msvc warnings (mainly size_t vs int issues).

Browse Source
This commit is contained in:
lotodore
2011-04-10 10:04:42 +00:00
parent 3cb3a5c3a8
commit 8bac902580
31 changed files with 304 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/avatarmanager.h
+2 -2
View File
@@ -59,9 +59,9 @@ public:
bool GetHashForAvatar(const std::string &fileName, MD5Buf &md5buf) const;
bool GetAvatarFileName(const MD5Buf &md5buf, std::string &fileName) const;
bool HasAvatar(const MD5Buf &md5buf) const;
bool StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFileType, const unsigned char *data, unsigned size, bool upload);
bool StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFileType, const unsigned char *data, size_t size, bool upload);
static bool IsValidAvatarFileType(AvatarFileType avatarFileType, const unsigned char *fileHeader, unsigned fileHeaderSize);
static bool IsValidAvatarFileType(AvatarFileType avatarFileType, const unsigned char *fileHeader, size_t fileHeaderSize);
void RemoveOldAvatarCacheEntries();
src/core/common/avatarmanager.cpp
+2 -2
View File
@@ -341,7 +341,7 @@ AvatarManager::HasAvatar(const MD5Buf &md5buf) const
}
bool
AvatarManager::StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFileType, const unsigned char *data, unsigned size, bool upload)
AvatarManager::StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFileType, const unsigned char *data, size_t size, bool upload)
{
bool retVal = false;
string cacheDir;
@@ -380,7 +380,7 @@ AvatarManager::StoreAvatarInCache(const MD5Buf &md5buf, AvatarFileType avatarFil
}
bool
AvatarManager::IsValidAvatarFileType(AvatarFileType avatarFileType, const unsigned char *fileHeader, unsigned fileHeaderSize)
AvatarManager::IsValidAvatarFileType(AvatarFileType avatarFileType, const unsigned char *fileHeader, size_t fileHeaderSize)
{
bool validType = false;
src/core/common/crypthelper.cpp
+1 -1
View File
@@ -166,7 +166,7 @@ CryptHelper::MD5Sum(const std::string &fileName, MD5Buf &buf)
if (file) {
// Calculate MD5 sum of file.
unsigned char *readBuf = new unsigned char[8192];
int numBytes;
size_t numBytes;
#ifdef HAVE_OPENSSL
MD5_CTX context;