From 4b01e299223c3fdb05d82ecde0117f88f8caa726 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 2 Dec 2014 22:20:16 +0000 Subject: less warnings git-svn-id: http://svn.miranda-ng.org/main/trunk@11224 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/protocols/protoopts.cpp | 9 +++------ src/modules/skin/hotkey_opts.cpp | 3 +-- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'src/modules') diff --git a/src/modules/protocols/protoopts.cpp b/src/modules/protocols/protoopts.cpp index ced3b45b54..c4b8ed5dd3 100644 --- a/src/modules/protocols/protoopts.cpp +++ b/src/modules/protocols/protoopts.cpp @@ -626,13 +626,10 @@ INT_PTR CALLBACK AccMgrDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM lps->rcItem.top += sz.cy + 2; if (acc->ppro && Proto_IsProtocolLoaded(acc->szProtoName)) { - char *szIdName; - TCHAR *tszIdName; - CONTACTINFO ci = { 0 }; - - szIdName = (char *)acc->ppro->GetCaps(PFLAG_UNIQUEIDTEXT, 0); - tszIdName = szIdName ? mir_a2t(szIdName) : mir_tstrdup(TranslateT("Account ID")); + char *szIdName = (char *)acc->ppro->GetCaps(PFLAG_UNIQUEIDTEXT, 0); + TCHAR *tszIdName = szIdName ? mir_a2t(szIdName) : mir_tstrdup(TranslateT("Account ID")); + CONTACTINFO ci = { 0 }; ci.cbSize = sizeof(ci); ci.hContact = NULL; ci.szProto = acc->szModuleName; diff --git a/src/modules/skin/hotkey_opts.cpp b/src/modules/skin/hotkey_opts.cpp index 7ade1f27d7..62192d4822 100644 --- a/src/modules/skin/hotkey_opts.cpp +++ b/src/modules/skin/hotkey_opts.cpp @@ -413,11 +413,10 @@ static void sttOptionsStartEdit(HWND hwndDlg, HWND hwndHotkey) static void sttOptionsDrawTextChunk(HDC hdc, TCHAR *text, RECT *rc) { - int len = (int)mir_tstrlen(text); DrawText(hdc, text, -1, rc, DT_LEFT | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER | DT_WORD_ELLIPSIS); SIZE sz; - GetTextExtentPoint32(hdc, text, len, &sz); + GetTextExtentPoint32(hdc, text, (int)mir_tstrlen(text), &sz); rc->left += sz.cx; } -- cgit v1.2.3