From e3ddcf47bdff0e1bc169e32aa64353852cb88665 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 22 Dec 2023 13:51:44 +0300 Subject: Jabber: no need to duplicate empty strings --- protocols/JabberG/src/jabber_api.cpp | 2 +- protocols/JabberG/src/jabber_iqid.cpp | 2 +- protocols/JabberG/src/jabber_thread.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/protocols/JabberG/src/jabber_api.cpp b/protocols/JabberG/src/jabber_api.cpp index cfbbb24083..2263b398b6 100644 --- a/protocols/JabberG/src/jabber_api.cpp +++ b/protocols/JabberG/src/jabber_api.cpp @@ -230,7 +230,7 @@ int CJabberProto::RegisterFeature(const char *pszFeature, const char *pszDescrip if (!jcb) return false; - g_clientCapsManager.SetClientCaps(JABBER_CAPS_MIRANDA_NODE, m_szFeaturesCrc, "", jcb); + g_clientCapsManager.SetClientCaps(JABBER_CAPS_MIRANDA_NODE, m_szFeaturesCrc, nullptr, jcb); fcp = new JabberFeatCapPairDynamic(); fcp->szExt = mir_strdup(pszExt); diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index fb83d3fafd..f5e64cd73e 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -136,7 +136,7 @@ void CJabberProto::OnIqResultServerDiscoInfo(const TiXmlElement *iqNode, CJabber if (void *p = pInfo->GetUserData()) { const char *szNode = (const char *)p; const char *szVer = szNode + strlen(szNode) + 1; - g_clientCapsManager.SetClientCaps(szNode, szVer, "", jcb); + g_clientCapsManager.SetClientCaps(szNode, szVer, nullptr, jcb); mir_free(p); } diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index cc5f6d887b..9a3c833339 100644 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -1461,7 +1461,7 @@ void CJabberProto::OnProcessPresenceCapabilites(const TiXmlElement *node, pResou else { r->m_pCaps = g_clientCapsManager.GetPartialCaps(szNode, szVer); if (r->m_pCaps == nullptr) { - r->m_pCaps = g_clientCapsManager.SetClientCaps(szNode, szVer, "", JABBER_RESOURCE_CAPS_UNINIT); + r->m_pCaps = g_clientCapsManager.SetClientCaps(szNode, szVer, nullptr, JABBER_RESOURCE_CAPS_UNINIT); GetResourceCapabilities(from, r); } } -- cgit v1.2.3