From 18ef6358ffbf73021a958baefb6c4be4054e0042 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 14 Jul 2014 13:46:12 +0000 Subject: - debug prints uncommented to log packet codes etc. - code cleaning git-svn-id: http://svn.miranda-ng.org/main/trunk@9793 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/IcqOscarJ/src/icq_xtraz.cpp | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) (limited to 'protocols/IcqOscarJ/src/icq_xtraz.cpp') diff --git a/protocols/IcqOscarJ/src/icq_xtraz.cpp b/protocols/IcqOscarJ/src/icq_xtraz.cpp index a210a58037..ef7f84a154 100644 --- a/protocols/IcqOscarJ/src/icq_xtraz.cpp +++ b/protocols/IcqOscarJ/src/icq_xtraz.cpp @@ -54,10 +54,10 @@ void CIcqProto::handleXtrazNotify(DWORD dwUin, DWORD dwMID, DWORD dwMID2, WORD w szQuery = DemangleXml(szQuery, nQueryLen); szWork = strstrnull(szQuery, ""); szEnd = strstrnull(szQuery, ""); -#ifdef _DEBUG + debugLogA("Query: %s", szQuery); debugLogA("Notify: %s", szNotify); -#endif + if (szWork && szEnd) { // this is our plugin szWork += 10; *szEnd = '\0'; @@ -153,34 +153,26 @@ void CIcqProto::handleXtrazNotify(DWORD dwUin, DWORD dwMID, DWORD dwMID2, WORD w else debugLogA("Error: We are not in XStatus, skipping"); } - else - debugLogA("Error: Invalid sender information"); + else debugLogA("Error: Invalid sender information"); } - else - debugLogA("Error: Missing sender information"); + else debugLogA("Error: Missing sender information"); } - else - debugLogA("Error: Unknown plugin \"%s\" in Xtraz message", szWork); + else debugLogA("Error: Unknown plugin \"%s\" in Xtraz message", szWork); } - else - debugLogA("Error: Missing PluginID in Xtraz message"); + else debugLogA("Error: Missing PluginID in Xtraz message"); SAFE_FREE(&szNotify); SAFE_FREE(&szQuery); } - else - debugLogA("Error: Invalid Xtraz Notify message"); + else debugLogA("Error: Invalid Xtraz Notify message"); } - void CIcqProto::handleXtrazNotifyResponse(DWORD dwUin, MCONTACT hContact, WORD wCookie, char* szMsg, int nMsgLen) { char *szMem, *szRes, *szEnd; int nResLen; -#ifdef _DEBUG debugLogA("Received Xtraz Notify Response"); -#endif szRes = strstrnull(szMsg, ""); szEnd = strstrnull(szMsg, ""); @@ -193,9 +185,7 @@ void CIcqProto::handleXtrazNotifyResponse(DWORD dwUin, MCONTACT hContact, WORD w szMem = szRes = DemangleXml(szRes, nResLen); -#ifdef _DEBUG debugLogA("Response: %s", szRes); -#endif ProtoBroadcastAck(hContact, ICQACKTYPE_XTRAZNOTIFY_RESPONSE, ACKRESULT_SUCCESS, (HANDLE)wCookie, (LPARAM)szRes); @@ -266,16 +256,13 @@ void CIcqProto::handleXtrazNotifyResponse(DWORD dwUin, MCONTACT hContact, WORD w debugLogA("Error: Unknown serverId \"%s\" in Xtraz response", szNode); } } - else - debugLogA("Error: Missing serverId in Xtraz response"); + else debugLogA("Error: Missing serverId in Xtraz response"); SAFE_FREE(&szMem); } - else - debugLogA("Error: Invalid Xtraz Notify response"); + else debugLogA("Error: Invalid Xtraz Notify response"); } - static char* getXmlPidItem(const char* szData, int nLen) { const char *szPid, *szEnd; -- cgit v1.2.3