From 5a17c9299e03bebf46169927abdeee34aaf8e854 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 10:06:32 +0000 Subject: replace strlen to mir_strlen git-svn-id: http://svn.miranda-ng.org/main/trunk@13747 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Steam/src/Steam/authorization.h | 6 +++--- protocols/Steam/src/Steam/friend_list.h | 6 +++--- protocols/Steam/src/Steam/login.h | 4 ++-- protocols/Steam/src/Steam/message.h | 6 +++--- protocols/Steam/src/Steam/pending.h | 6 +++--- protocols/Steam/src/Steam/session.h | 2 +- protocols/Steam/src/steam_menus.cpp | 2 +- protocols/Steam/src/steam_utils.cpp | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) (limited to 'protocols/Steam') diff --git a/protocols/Steam/src/Steam/authorization.h b/protocols/Steam/src/Steam/authorization.h index 047b408b05..57401f91c5 100644 --- a/protocols/Steam/src/Steam/authorization.h +++ b/protocols/Steam/src/Steam/authorization.h @@ -18,7 +18,7 @@ namespace SteamWebApi ptrA(mir_urlEncode(password)), timestamp); - SetData(data, strlen(data)); + SetData(data, mir_strlen(data)); } AuthorizationRequest(const char *username, const char *password, const char *timestamp, const char *guardCode) : @@ -34,7 +34,7 @@ namespace SteamWebApi guardCode, timestamp); - SetData(data, strlen(data)); + SetData(data, mir_strlen(data)); } AuthorizationRequest(const char *username, const char *password, const char *timestamp, const char *captchaId, const char *captchaText) : @@ -51,7 +51,7 @@ namespace SteamWebApi ptrA(mir_urlEncode(captchaText)), timestamp); - SetData(data, strlen(data)); + SetData(data, mir_strlen(data)); } }; } diff --git a/protocols/Steam/src/Steam/friend_list.h b/protocols/Steam/src/Steam/friend_list.h index eccc3d1224..cfa383c533 100644 --- a/protocols/Steam/src/Steam/friend_list.h +++ b/protocols/Steam/src/Steam/friend_list.h @@ -33,7 +33,7 @@ namespace SteamWebApi sessionId, who); - SetData(data, strlen(data)); + SetData(data, mir_strlen(data)); AddHeader("Cookie", cookie); } }; @@ -56,7 +56,7 @@ namespace SteamWebApi sessionId, who); - SetData(data, strlen(data)); + SetData(data, mir_strlen(data)); AddHeader("Cookie", cookie); } }; @@ -79,7 +79,7 @@ namespace SteamWebApi sessionId, who); - SetData(data, strlen(data)); + SetData(data, mir_strlen(data)); AddHeader("Cookie", cookie); } }; diff --git a/protocols/Steam/src/Steam/login.h b/protocols/Steam/src/Steam/login.h index bf19c6f522..e2b9b41a81 100644 --- a/protocols/Steam/src/Steam/login.h +++ b/protocols/Steam/src/Steam/login.h @@ -12,7 +12,7 @@ namespace SteamWebApi char data[256]; mir_snprintf(data, SIZEOF(data), "access_token=%s&ui_mode=web", token); - SetData(data, strlen(data)); + SetData(data, mir_strlen(data)); } }; @@ -25,7 +25,7 @@ namespace SteamWebApi char data[256]; mir_snprintf(data, SIZEOF(data), "access_token=%s&umqid=%s", token, umqId); - SetData(data, strlen(data)); + SetData(data, mir_strlen(data)); } }; } diff --git a/protocols/Steam/src/Steam/message.h b/protocols/Steam/src/Steam/message.h index ee5b5dcea7..bf0cb78b3d 100644 --- a/protocols/Steam/src/Steam/message.h +++ b/protocols/Steam/src/Steam/message.h @@ -31,7 +31,7 @@ namespace SteamWebApi // state); // SecureHttpPostRequest request(hConnection, STEAM_API_URL "/ISteamWebUserPresenceOAuth/Message/v0001"); - // request.SetData(data, strlen(data)); + // request.SetData(data, mir_strlen(data)); // mir_ptr response(request.Send()); // if (!response) @@ -56,7 +56,7 @@ namespace SteamWebApi // ptrA(mir_urlEncode(text))); // SecureHttpPostRequest request(hConnection, STEAM_API_URL "/ISteamWebUserPresenceOAuth/Message/v0001"); - // request.SetData(data, strlen(data)); + // request.SetData(data, mir_strlen(data)); // mir_ptr response(request.Send()); // if (!response) @@ -91,7 +91,7 @@ namespace SteamWebApi // steamId); // SecureHttpPostRequest request(hConnection, STEAM_API_URL "/ISteamWebUserPresenceOAuth/Message/v0001"); - // request.SetData(data, strlen(data)); + // request.SetData(data, mir_strlen(data)); // mir_ptr response(request.Send()); // if (!response) diff --git a/protocols/Steam/src/Steam/pending.h b/protocols/Steam/src/Steam/pending.h index 68b86ad689..65a72d25d4 100644 --- a/protocols/Steam/src/Steam/pending.h +++ b/protocols/Steam/src/Steam/pending.h @@ -18,7 +18,7 @@ namespace SteamWebApi char data[MAX_PATH]; mir_snprintf(data, SIZEOF(data), "sessionID=%s&id=%s&perform=accept&action=approvePending&itype=friend&json=1&xml=0", sessionId, who); - SetData(data, strlen(data)); + SetData(data, mir_strlen(data)); AddHeader("Cookie", cookie); } }; @@ -38,7 +38,7 @@ namespace SteamWebApi char data[MAX_PATH]; mir_snprintf(data, SIZEOF(data), "sessionID=%s&id=%s&perform=ignore&action=approvePending&itype=friend&json=1&xml=0", sessionId, who); - SetData(data, strlen(data)); + SetData(data, mir_strlen(data)); AddHeader("Cookie", cookie); } }; @@ -58,7 +58,7 @@ namespace SteamWebApi char data[MAX_PATH]; mir_snprintf(data, SIZEOF(data), "sessionID=%s&id=%s&perform=block&action=approvePending&itype=friend&json=1&xml=0", sessionId, who); - SetData(data, strlen(data)); + SetData(data, mir_strlen(data)); AddHeader("Cookie", cookie); } }; diff --git a/protocols/Steam/src/Steam/session.h b/protocols/Steam/src/Steam/session.h index ea42cc77c4..20a5d7db53 100644 --- a/protocols/Steam/src/Steam/session.h +++ b/protocols/Steam/src/Steam/session.h @@ -18,7 +18,7 @@ namespace SteamWebApi steamId, cookie); - SetData(data, strlen(data)); + SetData(data, mir_strlen(data)); } }; } diff --git a/protocols/Steam/src/steam_menus.cpp b/protocols/Steam/src/steam_menus.cpp index 8e2865bf22..a7b9626fc5 100644 --- a/protocols/Steam/src/steam_menus.cpp +++ b/protocols/Steam/src/steam_menus.cpp @@ -99,7 +99,7 @@ void CSteamProto::OnInitStatusMenu() { char text[200]; mir_strncpy(text, m_szModuleName, 100); - char* tDest = text + strlen(text); + char* tDest = text + mir_strlen(text); CLISTMENUITEM mi = { sizeof(mi) }; mi.pszService = text; diff --git a/protocols/Steam/src/steam_utils.cpp b/protocols/Steam/src/steam_utils.cpp index 46b7d8b6de..9484252d3a 100644 --- a/protocols/Steam/src/steam_utils.cpp +++ b/protocols/Steam/src/steam_utils.cpp @@ -50,7 +50,7 @@ int CSteamProto::MirandaToSteamState(int status) int CSteamProto::RsaEncrypt(const char *pszModulus, const char *data, BYTE *encryptedData, DWORD &encryptedSize) { - DWORD cchModulus = (DWORD)strlen(pszModulus); + DWORD cchModulus = (DWORD)mir_strlen(pszModulus); int result = 0; BYTE *pbBuffer = 0; BYTE *pKeyBlob = 0; @@ -118,7 +118,7 @@ int CSteamProto::RsaEncrypt(const char *pszModulus, const char *data, BYTE *encr goto exit; } - DWORD dataSize = (DWORD)strlen(data); + DWORD dataSize = (DWORD)mir_strlen(data); // if data is not allocated just renurn size if (encryptedData == NULL) -- cgit v1.2.3