summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2013-09-01 20:19:21 +0000
committerGeorge Hazan <george.hazan@gmail.com>2013-09-01 20:19:21 +0000
commit504f2480e4c7b6d634afb3b2267c8915552736b8 (patch)
treeaa3e022ce4dca3676182330048150191d339b4f3
parent16bdf3ff794d7834580707d7bad8d8819b39ffb6 (diff)
warning fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@5899 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--protocols/MRA/src/Mra_proto.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp
index d9bbd00642..3acf1035f2 100644
--- a/protocols/MRA/src/Mra_proto.cpp
+++ b/protocols/MRA/src/Mra_proto.cpp
@@ -822,7 +822,7 @@ bool CMraProto::CmdAnketaInfo(int seq, BinBuffer &buf)
case MRIM_ANKETA_INFO_STATUS_OK:
// поиск успешно завершен
- DWORD dwFieldsNum, dwMaxRows, dwServerTime, dwStatus;
+ DWORD dwFieldsNum, dwMaxRows, dwServerTime;
buf >> dwFieldsNum >> dwMaxRows >> dwServerTime;
CMStringA *pmralpsFields = new CMStringA[dwFieldsNum];
@@ -956,7 +956,7 @@ bool CMraProto::CmdAnketaInfo(int seq, BinBuffer &buf)
DWORD dwID, dwContactSeverFlags, dwXStatus;
GetContactBasicInfoW(hContact, &dwID, NULL, NULL, &dwContactSeverFlags, NULL, NULL, NULL, NULL);
if (dwID == -1 || (dwContactSeverFlags & CONTACT_INTFLAG_NOT_AUTHORIZED)) {
- MraSetContactStatus(hContact, GetMiradaStatusFromMraStatus(dwStatus, GetMraXStatusIDFromMraUriStatus(val), &dwXStatus));
+ MraSetContactStatus(hContact, GetMiradaStatusFromMraStatus(atoi(val), GetMraXStatusIDFromMraUriStatus(val), &dwXStatus));
setByte(hContact, DBSETTING_XSTATUSID, (BYTE)dwXStatus);
}
}
@@ -1840,7 +1840,7 @@ DWORD CMraProto::MraRecvCommand_Message(DWORD dwTime, DWORD dwFlags, CMStringA &
LPSTR lpbBufferCurPos = lpbBuffer;
while (TRUE) { // цикл замены ; на 0
- LPSTR lpbBufferCurPos = (LPSTR)MemoryFindByte((lpbBufferCurPos-(LPSTR)lpbBuffer), lpbBuffer, pre.lParam, ';');
+ lpbBufferCurPos = (LPSTR)MemoryFindByte((lpbBufferCurPos-(LPSTR)lpbBuffer), lpbBuffer, pre.lParam, ';');
if (!lpbBufferCurPos)
break;