diff options
| author | Rozhuk Ivan <rozhuk.im@gmail.com> | 2014-11-30 00:53:10 +0000 |
|---|---|---|
| committer | Rozhuk Ivan <rozhuk.im@gmail.com> | 2014-11-30 00:53:10 +0000 |
| commit | ce2af47d41cc790df1b18d9e80295a38747de19f (patch) | |
| tree | b9e75709ec7e75dada1c77a3ea70f1304091cae9 /src | |
| parent | a5574d24bc8c0e94c8880c75f0fd27d08d30b98b (diff) | |
code cleanup, x64 fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@11163 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/stdfile/ftmanager.cpp | 2 | ||||
| -rw-r--r-- | src/modules/clist/clui.cpp | 2 | ||||
| -rw-r--r-- | src/modules/extraicons/extraicons.cpp | 6 | ||||
| -rw-r--r-- | src/modules/xml/xmlParser.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/core/stdfile/ftmanager.cpp b/src/core/stdfile/ftmanager.cpp index abd07d2b91..9788776091 100644 --- a/src/core/stdfile/ftmanager.cpp +++ b/src/core/stdfile/ftmanager.cpp @@ -162,7 +162,7 @@ static INT_PTR CALLBACK FtMgrPageDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPA if (i == dat->wnds->realCount)
PostMessage(GetParent(hwnd), WM_TIMER, 1, NULL);
- if(dat->runningCount == 0 && (int)wParam == ACKRESULT_SUCCESS && db_get_b(NULL, "SRFile", "AutoClose", 0))
+ if(dat->runningCount == 0 && wParam == ACKRESULT_SUCCESS && db_get_b(NULL, "SRFile", "AutoClose", 0))
ShowWindow(hwndFtMgr, SW_HIDE);
break;
diff --git a/src/modules/clist/clui.cpp b/src/modules/clist/clui.cpp index 7522afabf3..ee0884e97d 100644 --- a/src/modules/clist/clui.cpp +++ b/src/modules/clist/clui.cpp @@ -585,7 +585,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM }
case WM_TIMER:
- if ((int)wParam == TM_AUTOALPHA) {
+ if (wParam == TM_AUTOALPHA) {
int inwnd;
if (GetForegroundWindow() == hwnd) {
diff --git a/src/modules/extraicons/extraicons.cpp b/src/modules/extraicons/extraicons.cpp index cfd80a3697..4d0d56c4ef 100644 --- a/src/modules/extraicons/extraicons.cpp +++ b/src/modules/extraicons/extraicons.cpp @@ -351,7 +351,7 @@ INT_PTR ExtraIcon_Register(WPARAM wParam, LPARAM lParam) return 0;
EXTRAICON_INFO *ei = (EXTRAICON_INFO *)wParam;
- if (ei->cbSize < (int)sizeof(EXTRAICON_INFO))
+ if (ei->cbSize < sizeof(EXTRAICON_INFO))
return 0;
if (ei->type != EXTRAICON_TYPE_CALLBACK && ei->type != EXTRAICON_TYPE_ICOLIB)
return 0;
@@ -462,7 +462,7 @@ INT_PTR ExtraIcon_SetIcon(WPARAM wParam, LPARAM) return -1;
EXTRAICON *ei = (EXTRAICON*)wParam;
- if (ei->cbSize < (int)sizeof(EXTRAICON) || ei->hExtraIcon == NULL || ei->hContact == NULL)
+ if (ei->cbSize < sizeof(EXTRAICON) || ei->hExtraIcon == NULL || ei->hContact == NULL)
return -1;
ExtraIcon *extra = GetExtraIcon(ei->hExtraIcon);
@@ -478,7 +478,7 @@ INT_PTR ExtraIcon_SetIconByName(WPARAM wParam, LPARAM) return -1;
EXTRAICON *ei = (EXTRAICON*)wParam;
- if (ei->cbSize < (int)sizeof(EXTRAICON) || ei->hExtraIcon == NULL || ei->hContact == NULL)
+ if (ei->cbSize < sizeof(EXTRAICON) || ei->hExtraIcon == NULL || ei->hContact == NULL)
return -1;
ExtraIcon *extra = GetExtraIcon(ei->hExtraIcon);
diff --git a/src/modules/xml/xmlParser.cpp b/src/modules/xml/xmlParser.cpp index 958d54f2fc..9da791bfdf 100644 --- a/src/modules/xml/xmlParser.cpp +++ b/src/modules/xml/xmlParser.cpp @@ -159,7 +159,7 @@ char myIsTextWideChar(const void *b, int len) // inspired by the Wine API: RtlIs const wchar_t *s = (const wchar_t*)b; // buffer too small: - if (len<(int)sizeof(wchar_t)) return FALSE; + if (len<sizeof(wchar_t)) return FALSE; // odd length test if (len&1) return FALSE; @@ -3042,7 +3042,7 @@ unsigned char *XMLParserBase64Tool::decode(XMLCSTR data, int *outlen, XMLError * *outlen = len; if (!len) return NULL; - alloc(len+1); // XXX: check me! + alloc(len+1); if(!decode(data, (unsigned char*)buf, len, xe)) return NULL; return (unsigned char*)buf; |