From eb3c0d1be3114815f27c33947fd3591858661000 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 31 Jul 2015 09:46:53 +0000 Subject: warning fix git-svn-id: http://svn.miranda-ng.org/main/trunk@14762 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeWeb/src/skype_history_sync.cpp | 6 +++--- protocols/SkypeWeb/src/skype_mslogin.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'protocols') diff --git a/protocols/SkypeWeb/src/skype_history_sync.cpp b/protocols/SkypeWeb/src/skype_history_sync.cpp index 06fe888e0d..8f582ae7a5 100644 --- a/protocols/SkypeWeb/src/skype_history_sync.cpp +++ b/protocols/SkypeWeb/src/skype_history_sync.cpp @@ -72,14 +72,14 @@ void CSkypeProto::OnGetServerHistory(const NETLIBHTTPREQUEST *response) { if (messageType == "Text" || messageType == "RichText") { - ptrA message(RemoveHtml(content.c_str())); + ptrA szMessage(RemoveHtml(content.c_str())); MEVENT dbevent = GetMessageFromDb(hContact, szMessageId); if (isEdited && dbevent != NULL) { - AppendDBEvent(hContact, dbevent, message, szMessageId, timestamp); + AppendDBEvent(hContact, dbevent, szMessage, szMessageId, timestamp); } - else AddDbEvent(emoteOffset == 0 ? EVENTTYPE_MESSAGE : SKYPE_DB_EVENT_TYPE_ACTION, hContact, timestamp, iFlags, &message[emoteOffset], szMessageId); + else AddDbEvent(emoteOffset == 0 ? EVENTTYPE_MESSAGE : SKYPE_DB_EVENT_TYPE_ACTION, hContact, timestamp, iFlags, &szMessage[emoteOffset], szMessageId); } else if (messageType == "Event/Call") { diff --git a/protocols/SkypeWeb/src/skype_mslogin.cpp b/protocols/SkypeWeb/src/skype_mslogin.cpp index 6109fbeba2..b46c153b0a 100644 --- a/protocols/SkypeWeb/src/skype_mslogin.cpp +++ b/protocols/SkypeWeb/src/skype_mslogin.cpp @@ -76,7 +76,7 @@ void CSkypeProto::OnMSLoginSecond(const NETLIBHTTPREQUEST *response) { if (match[1] == "i5600") { - CMStringA cookies; + CMStringA szCookies; for (int i = 0; i < response->headersCount; i++) { if (mir_strcmpi(response->headers[i].szName, "Set-Cookie")) @@ -86,7 +86,7 @@ void CSkypeProto::OnMSLoginSecond(const NETLIBHTTPREQUEST *response) content = response->headers[i].szValue; if (std::regex_search(content, match, regex)) if (!std::string(match[2]).empty() && std::string(match[2]) != " ") - cookies.AppendFormat("%s=%s;", std::string(match[1]).c_str(), std::string(match[2]).c_str()); + szCookies.AppendFormat("%s=%s;", std::string(match[1]).c_str(), std::string(match[2]).c_str()); } CMStringA url(GetStringChunk(szContent, "urlPost:'", "'")); @@ -95,7 +95,7 @@ void CSkypeProto::OnMSLoginSecond(const NETLIBHTTPREQUEST *response) ptrA code(mir_utf8encodeT(RunConfirmationCode())); - SendRequest(new LoginMSRequest(url.c_str(), ptrA(getStringA(SKYPE_SETTINGS_ID)), cookies.c_str(), ppft.c_str(), code), &CSkypeProto::OnMSLoginEnd); + SendRequest(new LoginMSRequest(url.c_str(), ptrA(getStringA(SKYPE_SETTINGS_ID)), szCookies.c_str(), ppft.c_str(), code), &CSkypeProto::OnMSLoginEnd); return; } } -- cgit v1.2.3