From d0ceb5768ff3146499a0318ffe03c867c0845592 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 17 Aug 2015 19:38:42 +0000 Subject: - numerous name conflicts resolved; - funny code that loads resource #102 from miranda32.exe removed; - massive mir_sntprintf code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@14979 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/JabberG/src/jabber_proto.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'protocols/JabberG/src/jabber_proto.cpp') diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index 0cfc3446f8..bf467a484b 100644 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -633,7 +633,7 @@ int __cdecl CJabberProto::GetInfo(MCONTACT hContact, int /*infoType*/) for (int i=0; i < item->arResources.getCount(); i++) { pResourceStatus r(item->arResources[i]); TCHAR tmp[JABBER_MAX_JID_LEN]; - mir_sntprintf(tmp, _countof(tmp), _T("%s/%s"), szBareJid, r->m_tszResourceName); + mir_sntprintf(tmp, _T("%s/%s"), szBareJid, r->m_tszResourceName); if (r->m_jcbCachedCaps & JABBER_CAPS_DISCO_INFO) { XmlNodeIq iq5(AddIQ(&CJabberProto::OnIqResultCapsDiscoInfoSI, JABBER_IQ_TYPE_GET, tmp, JABBER_IQ_PARSE_FROM | JABBER_IQ_PARSE_CHILD_TAG_NODE | JABBER_IQ_PARSE_HCONTACT)); @@ -716,7 +716,7 @@ HANDLE __cdecl CJabberProto::SearchBasic(const TCHAR *szJid) mir_free(szServer); szServer = mir_tstrdup(_T("sms")); } - mir_sntprintf(jsb->jid, _countof(jsb->jid), _T("%s@%s"), szJid, szServer); + mir_sntprintf(jsb->jid, _T("%s@%s"), szJid, szServer); } else _tcsncpy_s(jsb->jid, szJid, _TRUNCATE); mir_free(szServer); @@ -1122,7 +1122,7 @@ int __cdecl CJabberProto::SetStatus(int iNewStatus) void __cdecl CJabberProto::GetAwayMsgThread(void *param) { - MCONTACT hContact = (MCONTACT)param; + MCONTACT hContact = (DWORD_PTR)param; ptrT jid(getTStringA(hContact, "jid")); if (jid != NULL) { -- cgit v1.2.3