diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-07-31 09:46:53 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-07-31 09:46:53 +0000 |
| commit | eb3c0d1be3114815f27c33947fd3591858661000 (patch) | |
| tree | 5a38d4896a6e1aa348b0551e45218e8dfe732115 | |
| parent | 0c2bd15027983dc1502edc0da7b0839fc9e9b70b (diff) | |
warning fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@14762 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | protocols/SkypeWeb/src/skype_history_sync.cpp | 6 | ||||
| -rw-r--r-- | protocols/SkypeWeb/src/skype_mslogin.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
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;
}
}
|