summaryrefslogtreecommitdiff
path: root/src/core/stdfile
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2014-11-30 22:12:34 +0000
committerGeorge Hazan <george.hazan@gmail.com>2014-11-30 22:12:34 +0000
commit6be364a555dce699d093f9d49cd14a9b0c174893 (patch)
treeac10770856206fb50d2e83acde528413f5f22009 /src/core/stdfile
parentd9c98bcdfca6da51a1a82dc6c0dc5996b3b6cd6d (diff)
warning fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@11181 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src/core/stdfile')
-rw-r--r--src/core/stdfile/filesenddlg.cpp5
-rw-r--r--src/core/stdfile/filexferdlg.cpp2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/core/stdfile/filesenddlg.cpp b/src/core/stdfile/filesenddlg.cpp
index c207cb9ff0..f9be264353 100644
--- a/src/core/stdfile/filesenddlg.cpp
+++ b/src/core/stdfile/filesenddlg.cpp
@@ -82,13 +82,12 @@ static void FilenameToFileList(HWND hwndDlg, FileDlgData* dat, const TCHAR *buf)
const TCHAR *pBuf;
int nNumberOfFiles = 0;
int nTemp;
- int fileOffset;
// :NOTE: The first string in the buffer is the directory, followed by a
// NULL separated list of all files
// fileOffset is the offset to the first file.
- fileOffset = mir_tstrlen(buf) + 1;
+ size_t fileOffset = mir_tstrlen(buf) + 1;
// Count number of files
pBuf = buf + fileOffset;
@@ -106,7 +105,7 @@ static void FilenameToFileList(HWND hwndDlg, FileDlgData* dat, const TCHAR *buf)
nTemp = 0;
while (*pBuf) {
// Allocate space for path+filename
- int cbFileNameLen = mir_tstrlen(pBuf);
+ size_t cbFileNameLen = mir_tstrlen(pBuf);
dat->files[nTemp] = (TCHAR*)mir_alloc(sizeof(TCHAR)*(fileOffset + cbFileNameLen + 1));
// Add path to filename and copy into array
diff --git a/src/core/stdfile/filexferdlg.cpp b/src/core/stdfile/filexferdlg.cpp
index f5eeeec531..962283e9b0 100644
--- a/src/core/stdfile/filexferdlg.cpp
+++ b/src/core/stdfile/filexferdlg.cpp
@@ -85,7 +85,7 @@ void FillSendData(FileDlgData *dat, DBEVENTINFO& dbei)
char *szFileNames = Utf8EncodeT(dat->szFilenames), *szMsg = Utf8EncodeT(dat->szMsg);
dbei.flags |= DBEF_UTF;
- dbei.cbBlob = sizeof(DWORD) + mir_strlen(szFileNames) + mir_strlen(szMsg) + 2;
+ dbei.cbBlob = int(sizeof(DWORD) + mir_strlen(szFileNames) + mir_strlen(szMsg) + 2);
dbei.pBlob = (PBYTE)mir_alloc(dbei.cbBlob);
*(PDWORD)dbei.pBlob = 0;
mir_strcpy((char*)dbei.pBlob + sizeof(DWORD), szFileNames);