From b7c74cd5b22618d544a3f4ae124985d4837e3a22 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 4 Jun 2015 22:12:13 +0000 Subject: new mir_snprintf templates without SIZEOF git-svn-id: http://svn.miranda-ng.org/main/trunk@14002 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_disco.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'protocols/JabberG/src/jabber_disco.cpp') diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp index 4e1a452f77..b13aac36ff 100644 --- a/protocols/JabberG/src/jabber_disco.cpp +++ b/protocols/JabberG/src/jabber_disco.cpp @@ -441,14 +441,14 @@ void CJabberProto::PerformBrowse(HWND hwndDlg) int count = getDword("discoWnd_favCount", 0); for (int i=0; i < count; i++) { char setting[MAXMODULELABELLENGTH]; - mir_snprintf(setting, SIZEOF(setting), "discoWnd_favName_%d", i); + mir_snprintf(setting, "discoWnd_favName_%d", i); ptrT tszName( getTStringA(setting)); if (tszName == NULL) continue; - mir_snprintf(setting, SIZEOF(setting), "discoWnd_favJID_%d", i); + mir_snprintf(setting, "discoWnd_favJID_%d", i); ptrT dbvJid( getTStringA(setting)); - mir_snprintf(setting, SIZEOF(setting), "discoWnd_favNode_%d", i); + mir_snprintf(setting, "discoWnd_favNode_%d", i); ptrT dbvNode( getTStringA(setting)); CJabberSDNode *pNode = m_SDManager.AddPrimaryNode(dbvJid, dbvNode, tszName); SendBothRequests(pNode, NULL); @@ -798,7 +798,7 @@ void CJabberDlgDiscovery::btnBookmarks_OnClick(CCtrlButton *) int count = m_proto->getDword("discoWnd_favCount", 0); for (int i=0; i < count; i++) { char setting[MAXMODULELABELLENGTH]; - mir_snprintf(setting, SIZEOF(setting), "discoWnd_favName_%d", i); + mir_snprintf(setting, "discoWnd_favName_%d", i); ptrT tszName( m_proto->getTStringA(setting)); if (tszName != NULL) { HMENU hSubMenu = CreatePopupMenu(); @@ -832,11 +832,11 @@ void CJabberDlgDiscovery::btnBookmarks_OnClick(CCtrlButton *) if (res % 10) { res /= 10; char setting[MAXMODULELABELLENGTH]; - mir_snprintf(setting, SIZEOF(setting), "discoWnd_favName_%d", res); + mir_snprintf(setting, "discoWnd_favName_%d", res); m_proto->delSetting(setting); - mir_snprintf(setting, SIZEOF(setting), "discoWnd_favJID_%d", res); + mir_snprintf(setting, "discoWnd_favJID_%d", res); m_proto->delSetting(setting); - mir_snprintf(setting, SIZEOF(setting), "discoWnd_favNode_%d", res); + mir_snprintf(setting, "discoWnd_favNode_%d", res); m_proto->delSetting(setting); } else { @@ -846,11 +846,11 @@ void CJabberDlgDiscovery::btnBookmarks_OnClick(CCtrlButton *) SetDlgItemText(m_hwnd, IDC_COMBO_NODE, _T("")); char setting[MAXMODULELABELLENGTH]; - mir_snprintf(setting, SIZEOF(setting), "discoWnd_favJID_%d", res); + mir_snprintf(setting, "discoWnd_favJID_%d", res); ptrT dbv( m_proto->getTStringA(setting)); if (dbv) SetDlgItemText(m_hwnd, IDC_COMBO_JID, dbv); - mir_snprintf(setting, SIZEOF(setting), "discoWnd_favNode_%d", res); + mir_snprintf(setting, "discoWnd_favNode_%d", res); dbv = m_proto->getTStringA(setting); if (dbv) SetDlgItemText(m_hwnd, IDC_COMBO_NODE, dbv); @@ -861,11 +861,11 @@ void CJabberDlgDiscovery::btnBookmarks_OnClick(CCtrlButton *) int count = m_proto->getDword("discoWnd_favCount", 0); for (int i=0; i < count; i++) { char setting[MAXMODULELABELLENGTH]; - mir_snprintf(setting, SIZEOF(setting), "discoWnd_favName_%d", i); + mir_snprintf(setting, "discoWnd_favName_%d", i); m_proto->delSetting(setting); - mir_snprintf(setting, SIZEOF(setting), "discoWnd_favJID_%d", i); + mir_snprintf(setting, "discoWnd_favJID_%d", i); m_proto->delSetting(setting); - mir_snprintf(setting, SIZEOF(setting), "discoWnd_favNode_%d", i); + mir_snprintf(setting, "discoWnd_favNode_%d", i); m_proto->delSetting(setting); } m_proto->delSetting("discoWnd_favCount"); @@ -1334,11 +1334,11 @@ void CJabberProto::ServiceDiscoveryShowMenu(CJabberSDNode *pNode, HTREELISTITEM { char setting[MAXMODULELABELLENGTH]; int count = getDword("discoWnd_favCount", 0); - mir_snprintf(setting, SIZEOF(setting), "discoWnd_favName_%d", count); + mir_snprintf(setting, "discoWnd_favName_%d", count); setTString(setting, pNode->GetName() ? pNode->GetName() : pNode->GetJid()); - mir_snprintf(setting, SIZEOF(setting), "discoWnd_favJID_%d", count); + mir_snprintf(setting, "discoWnd_favJID_%d", count); setTString(setting, pNode->GetJid()); - mir_snprintf(setting, SIZEOF(setting), "discoWnd_favNode_%d", count); + mir_snprintf(setting, "discoWnd_favNode_%d", count); setTString(setting, pNode->GetNode() ? pNode->GetNode() : _T("")); setDword("discoWnd_favCount", ++count); } -- cgit v1.2.3