From 41a7300678e4bb3cd703e2c236e57af4a31962c7 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Mon, 1 Dec 2014 04:50:22 +0000 Subject: mir_snprintf(..., sizeof() -> SIZEOF(), ...) small fixs cleanups git-svn-id: http://svn.miranda-ng.org/main/trunk@11188 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Gadu-Gadu/src/core.cpp | 4 ++-- protocols/Gadu-Gadu/src/gg.cpp | 2 +- protocols/Gadu-Gadu/src/groupchat.cpp | 4 ++-- protocols/Gadu-Gadu/src/icolib.cpp | 4 ++-- protocols/Gadu-Gadu/src/image.cpp | 2 +- protocols/Gadu-Gadu/src/import.cpp | 10 +++++----- protocols/Gadu-Gadu/src/oauth.cpp | 4 ++-- protocols/Gadu-Gadu/src/sessions.cpp | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) (limited to 'protocols/Gadu-Gadu') diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp index 0514783678..52a988e025 100644 --- a/protocols/Gadu-Gadu/src/core.cpp +++ b/protocols/Gadu-Gadu/src/core.cpp @@ -1009,7 +1009,7 @@ retry: { CLISTEVENT cle = {0}; char service[128]; - mir_snprintf(service, sizeof(service), GGS_RECVIMAGE, m_szModuleName); + mir_snprintf(service, SIZEOF(service), GGS_RECVIMAGE, m_szModuleName); cle.cbSize = sizeof(cle); cle.hContact = hContact; @@ -1721,7 +1721,7 @@ void GGPROTO::changecontactstatus(uin_t uin, int status, const TCHAR *idescr, in { char sversion[48]; setDword(hContact, GG_KEY_CLIENTVERSION, (DWORD) version); - mir_snprintf(sversion, sizeof(sversion), "%sGadu-Gadu %s", (version & 0x00ffffff) > 0x2b ? "Nowe " : "", gg_version2string(version)); + mir_snprintf(sversion, SIZEOF(sversion), "%sGadu-Gadu %s", (version & 0x00ffffff) > 0x2b ? "Nowe " : "", gg_version2string(version)); setString(hContact, "MirVer", sversion); } } diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp index a7fd0a3fa9..95c9902def 100644 --- a/protocols/Gadu-Gadu/src/gg.cpp +++ b/protocols/Gadu-Gadu/src/gg.cpp @@ -244,7 +244,7 @@ INT_PTR GGPROTO::blockuser(WPARAM hContact, LPARAM lParam) void GGPROTO::block_init() { char service[64]; - mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_BLOCKUSER); + mir_snprintf(service, SIZEOF(service), "%s%s", m_szModuleName, GGS_BLOCKUSER); CreateProtoService(GGS_BLOCKUSER, &GGPROTO::blockuser); CLISTMENUITEM mi = { sizeof(mi) }; diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp index 6c1abc6c9c..0d80f7aef8 100644 --- a/protocols/Gadu-Gadu/src/groupchat.cpp +++ b/protocols/Gadu-Gadu/src/groupchat.cpp @@ -64,7 +64,7 @@ void GGPROTO::gc_menus_init(HGENMENU hRoot) mi.hParentMenu = hRoot; // Conferencing - mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_OPEN_CONF); + mir_snprintf(service, SIZEOF(service), "%s%s", m_szModuleName, GGS_OPEN_CONF); CreateProtoService(GGS_OPEN_CONF, &GGPROTO::gc_openconf); mi.position = 2000050001; mi.icolibItem = iconList[14].hIcolib; @@ -73,7 +73,7 @@ void GGPROTO::gc_menus_init(HGENMENU hRoot) hMainMenu[0] = Menu_AddProtoMenuItem(&mi); // Clear ignored conferences - mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_CLEAR_IGNORED); + mir_snprintf(service, SIZEOF(service), "%s%s", m_szModuleName, GGS_CLEAR_IGNORED); CreateProtoService(GGS_CLEAR_IGNORED, &GGPROTO::gc_clearignored); mi.position = 2000050002; mi.icolibItem = iconList[15].hIcolib; diff --git a/protocols/Gadu-Gadu/src/icolib.cpp b/protocols/Gadu-Gadu/src/icolib.cpp index 91d10ae542..b50d305a5d 100644 --- a/protocols/Gadu-Gadu/src/icolib.cpp +++ b/protocols/Gadu-Gadu/src/icolib.cpp @@ -51,7 +51,7 @@ void gg_icolib_init() HICON LoadIconEx(const char* name, BOOL big) { char szSettingName[100]; - mir_snprintf(szSettingName, sizeof(szSettingName), "%s_%s", GGDEF_PROTO, name); + mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", GGDEF_PROTO, name); return Skin_GetIcon(szSettingName, big); } @@ -66,7 +66,7 @@ HANDLE GetIconHandle(int iconId) void ReleaseIconEx(const char* name, BOOL big) { char szSettingName[100]; - mir_snprintf(szSettingName, sizeof(szSettingName), "%s_%s", GGDEF_PROTO, name); + mir_snprintf(szSettingName, SIZEOF(szSettingName), "%s_%s", GGDEF_PROTO, name); Skin_ReleaseIcon(szSettingName, big); } diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp index 60d588e888..213e24b51e 100644 --- a/protocols/Gadu-Gadu/src/image.cpp +++ b/protocols/Gadu-Gadu/src/image.cpp @@ -69,7 +69,7 @@ int gg_img_remove(GGIMAGEDLGDATA *dat); int GGPROTO::img_init() { char service[64]; - mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_SENDIMAGE); + mir_snprintf(service, SIZEOF(service), "%s%s", m_szModuleName, GGS_SENDIMAGE); CreateProtoService(GGS_SENDIMAGE, &GGPROTO::img_sendimg); // Send image contact menu item diff --git a/protocols/Gadu-Gadu/src/import.cpp b/protocols/Gadu-Gadu/src/import.cpp index 27c7830354..c39509f68a 100644 --- a/protocols/Gadu-Gadu/src/import.cpp +++ b/protocols/Gadu-Gadu/src/import.cpp @@ -514,7 +514,7 @@ void GGPROTO::import_init(HGENMENU hRoot) { // Import from server item char service[64]; - mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_IMPORT_SERVER); + mir_snprintf(service, SIZEOF(service), "%s%s", m_szModuleName, GGS_IMPORT_SERVER); CreateProtoService(GGS_IMPORT_SERVER, &GGPROTO::import_server); CLISTMENUITEM mi = { sizeof(mi) }; @@ -527,7 +527,7 @@ void GGPROTO::import_init(HGENMENU hRoot) hMainMenu[2] = Menu_AddProtoMenuItem(&mi); // Import from textfile - mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_IMPORT_TEXT); + mir_snprintf(service, SIZEOF(service), "%s%s", m_szModuleName, GGS_IMPORT_TEXT); CreateProtoService(GGS_IMPORT_TEXT, &GGPROTO::import_text); mi.position = 2000500002; @@ -537,7 +537,7 @@ void GGPROTO::import_init(HGENMENU hRoot) hMainMenu[3] = Menu_AddProtoMenuItem(&mi); // Remove from server - mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_REMOVE_SERVER); + mir_snprintf(service, SIZEOF(service), "%s%s", m_szModuleName, GGS_REMOVE_SERVER); CreateProtoService(GGS_REMOVE_SERVER, &GGPROTO::remove_server); mi.position = 2000500003; @@ -547,7 +547,7 @@ void GGPROTO::import_init(HGENMENU hRoot) hMainMenu[4] = Menu_AddProtoMenuItem(&mi); // Export to server - mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_EXPORT_SERVER); + mir_snprintf(service, SIZEOF(service), "%s%s", m_szModuleName, GGS_EXPORT_SERVER); CreateProtoService(GGS_EXPORT_SERVER, &GGPROTO::export_server); mi.position = 2005000001; @@ -557,7 +557,7 @@ void GGPROTO::import_init(HGENMENU hRoot) hMainMenu[5] = Menu_AddProtoMenuItem(&mi); // Export to textfile - mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_EXPORT_TEXT); + mir_snprintf(service, SIZEOF(service), "%s%s", m_szModuleName, GGS_EXPORT_TEXT); CreateProtoService(GGS_EXPORT_TEXT, &GGPROTO::export_text); mi.position = 2005000002; diff --git a/protocols/Gadu-Gadu/src/oauth.cpp b/protocols/Gadu-Gadu/src/oauth.cpp index 4918700cc8..8b0f8f4a57 100644 --- a/protocols/Gadu-Gadu/src/oauth.cpp +++ b/protocols/Gadu-Gadu/src/oauth.cpp @@ -222,7 +222,7 @@ int oauth_sign_request(LIST ¶ms, const char *httpmethod, con char *oauth_generate_nonce() { char timestamp[22], randnum[16]; - mir_snprintf(timestamp, sizeof(timestamp), "%ld", time(NULL)); + mir_snprintf(timestamp, SIZEOF(timestamp), "%ld", time(NULL)); CallService(MS_UTILS_GETRANDOM, (WPARAM)sizeof(randnum), (LPARAM)randnum); int strSizeB = int(strlen(timestamp) + sizeof(randnum)); @@ -252,7 +252,7 @@ char *oauth_auth_header(const char *httpmethod, const char *url, OAUTHSIGNMETHOD case RSASHA1: oauth_setparam(oauth_parameters, "oauth_signature_method", "RSA-SHA1"); break; default: oauth_setparam(oauth_parameters, "oauth_signature_method", "PLAINTEXT"); break; }; - mir_snprintf(timestamp, sizeof(timestamp), "%ld", time(NULL)); + mir_snprintf(timestamp, SIZEOF(timestamp), "%ld", time(NULL)); oauth_setparam(oauth_parameters, "oauth_timestamp", timestamp); nonce = oauth_generate_nonce(); oauth_setparam(oauth_parameters, "oauth_nonce", nonce); diff --git a/protocols/Gadu-Gadu/src/sessions.cpp b/protocols/Gadu-Gadu/src/sessions.cpp index 693c8f6b70..411730e68d 100644 --- a/protocols/Gadu-Gadu/src/sessions.cpp +++ b/protocols/Gadu-Gadu/src/sessions.cpp @@ -426,7 +426,7 @@ BOOL GGPROTO::sessions_closedlg() void GGPROTO::sessions_menus_init(HGENMENU hRoot) { char service[64]; - mir_snprintf(service, sizeof(service), "%s%s", m_szModuleName, GGS_CONCUR_SESS); + mir_snprintf(service, SIZEOF(service), "%s%s", m_szModuleName, GGS_CONCUR_SESS); CreateProtoService(GGS_CONCUR_SESS, &GGPROTO::sessions_view); CLISTMENUITEM mi = { sizeof(mi) }; -- cgit v1.2.3