diff options
| author | Robert Pösel <robyer@seznam.cz> | 2014-12-20 19:10:28 +0000 |
|---|---|---|
| committer | Robert Pösel <robyer@seznam.cz> | 2014-12-20 19:10:28 +0000 |
| commit | c913257a1eb9b0fdcac33c1b45b309261048f761 (patch) | |
| tree | cabe9ffbcceb441dba46626257eb463be03e002a /protocols/Steam/src/steam_pooling.cpp | |
| parent | c85f29701349a22dadca357c770296b7e8475db1 (diff) | |
Steam: Various code improvements (as reported by Coverity analyser); version bump
git-svn-id: http://svn.miranda-ng.org/main/trunk@11544 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Steam/src/steam_pooling.cpp')
| -rw-r--r-- | protocols/Steam/src/steam_pooling.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/protocols/Steam/src/steam_pooling.cpp b/protocols/Steam/src/steam_pooling.cpp index efdd6514f3..e126f7c7d3 100644 --- a/protocols/Steam/src/steam_pooling.cpp +++ b/protocols/Steam/src/steam_pooling.cpp @@ -14,10 +14,10 @@ void CSteamProto::ParsePollData(JSONNODE *data) break; node = json_get(item, "steamid_from"); - ptrA steamId(mir_t2a(json_as_string(node))); + ptrA steamId(mir_t2a(ptrT(json_as_string(node)))); node = json_get(item, "utc_timestamp"); - time_t timestamp = atol(ptrA(mir_t2a(json_as_string(node)))); + time_t timestamp = atol(ptrA(mir_t2a(ptrT(json_as_string(node))))); node = json_get(item, "type"); ptrT type(json_as_string(node)); @@ -25,7 +25,7 @@ void CSteamProto::ParsePollData(JSONNODE *data) !lstrcmpi(type, _T("my_saytext")) || !lstrcmpi(type, _T("my_emote"))) { node = json_get(item, "text"); - const TCHAR *text = json_as_string(node); + ptrT text(json_as_string(node)); if (_tcsstr(type, _T("my_")) == NULL) { @@ -64,7 +64,7 @@ void CSteamProto::ParsePollData(JSONNODE *data) if (IsMe(steamId)) { node = json_get(item, "persona_name"); - setTString("Nick", json_as_string(node)); + setTString("Nick", ptrT(json_as_string(node))); if (status == ID_STATUS_OFFLINE) continue; @@ -87,7 +87,7 @@ void CSteamProto::ParsePollData(JSONNODE *data) SetContactStatus(hContact, status); node = json_get(item, "persona_name"); - setTString(hContact, "Nick", json_as_string(node)); + setTString(hContact, "Nick", ptrT(json_as_string(node))); // todo: find difference between state changing and info changing steamIds.append(steamId).append(","); @@ -208,7 +208,10 @@ void CSteamProto::PollingThread(void*) JSONNODE *nroot = json_as_array(node); if (nroot != NULL) + { ParsePollData(nroot); + json_delete(nroot); + } m_pollingConnection = response->nlc; } |