From 83278f1c0a1b12b349617b7ebc5583be17e69daa Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 10 Jan 2023 19:56:07 +0300 Subject: code cleaning --- protocols/Facebook/src/avatars.cpp | 2 +- protocols/Gadu-Gadu/src/avatar.cpp | 12 ++++++------ protocols/ICQ-WIM/src/server.cpp | 4 ++-- protocols/JabberG/src/jabber_iqid.cpp | 4 ++-- protocols/SkypeWeb/src/skype_avatars.cpp | 4 ++-- protocols/Tox/src/tox_avatars.cpp | 4 ++-- protocols/Twitter/src/connection.cpp | 2 +- protocols/VKontakte/src/vk_avatars.cpp | 2 +- protocols/WhatsApp/src/avatars.cpp | 4 ++-- 9 files changed, 19 insertions(+), 19 deletions(-) (limited to 'protocols') diff --git a/protocols/Facebook/src/avatars.cpp b/protocols/Facebook/src/avatars.cpp index 0e73a9241b..f8fd4fb73e 100644 --- a/protocols/Facebook/src/avatars.cpp +++ b/protocols/Facebook/src/avatars.cpp @@ -85,7 +85,7 @@ void __cdecl FacebookProto::AvatarsUpdate(void *) } else debugLogA("Error %d reading avatar from url: %s", pReply->resultCode, szUrl.c_str()); - ProtoBroadcastAck(cc, ACKTYPE_AVATAR, bSuccess ? ACKRESULT_SUCCESS : ACKRESULT_FAILED, (HANDLE)&ai); + ProtoBroadcastAck(cc, ACKTYPE_AVATAR, bSuccess ? ACKRESULT_SUCCESS : ACKRESULT_FAILED, &ai); Netlib_FreeHttpRequest(pReply); } diff --git a/protocols/Gadu-Gadu/src/avatar.cpp b/protocols/Gadu-Gadu/src/avatar.cpp index 6f77e19f90..48db5027c7 100644 --- a/protocols/Gadu-Gadu/src/avatar.cpp +++ b/protocols/Gadu-Gadu/src/avatar.cpp @@ -194,14 +194,14 @@ void __cdecl GaduProto::avatarrequestthread(void*) char *AvatarURL, *AvatarTs; if (!getAvatarFileInfo(uin, &AvatarURL, &AvatarTs)) { if (iWaitFor) - ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_FAILED, nullptr, 0); + ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_FAILED, nullptr); } else { if (AvatarURL == nullptr && AvatarTs == nullptr) { delSetting(hContact, GG_KEY_AVATARURL); delSetting(hContact, GG_KEY_AVATARTS); if (iWaitFor) - ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, nullptr, 0); + ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, nullptr); } else { setString(hContact, GG_KEY_AVATARURL, AvatarURL); @@ -213,11 +213,11 @@ void __cdecl GaduProto::avatarrequestthread(void*) ai.hContact = hContact; INT_PTR res = getavatarinfo((WPARAM)GAIF_FORCE, (LPARAM)&ai); if (res == GAIR_NOAVATAR) - ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, nullptr, 0); + ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, nullptr); else if (res == GAIR_SUCCESS) - ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, (HANDLE)&ai, 0); + ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, &ai); } - else ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, nullptr, 0); + else ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, nullptr); delSetting(hContact, GG_KEY_AVATARREQUESTED); } } @@ -272,7 +272,7 @@ void __cdecl GaduProto::avatarrequestthread(void*) } else debugLogA("avatarrequestthread(): No response from HTTP request"); - ProtoBroadcastAck(ai.hContact, ACKTYPE_AVATAR, result ? ACKRESULT_SUCCESS : ACKRESULT_FAILED, (HANDLE)&ai, 0); + ProtoBroadcastAck(ai.hContact, ACKTYPE_AVATAR, result ? ACKRESULT_SUCCESS : ACKRESULT_FAILED, &ai); if (!ai.hContact) ReportSelfAvatarChanged(); diff --git a/protocols/ICQ-WIM/src/server.cpp b/protocols/ICQ-WIM/src/server.cpp index 114ad5ed99..3a0e198280 100644 --- a/protocols/ICQ-WIM/src/server.cpp +++ b/protocols/ICQ-WIM/src/server.cpp @@ -1125,7 +1125,7 @@ void CIcqProto::OnReceiveAvatar(NETLIBHTTPREQUEST *pReply, AsyncHttpRequest *pRe if (pReply->resultCode != 200 || pReply->pData == nullptr) { LBL_Error: - ProtoBroadcastAck(pReq->hContact, ACKTYPE_AVATAR, ACKRESULT_FAILED, HANDLE(&ai), 0); + ProtoBroadcastAck(pReq->hContact, ACKTYPE_AVATAR, ACKRESULT_FAILED, &ai); return; } @@ -1145,7 +1145,7 @@ LBL_Error: fclose(out); if (pReq->hContact != 0) { - ProtoBroadcastAck(pReq->hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, HANDLE(&ai), 0); + ProtoBroadcastAck(pReq->hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, &ai); debugLogW(L"Broadcast new avatar: %s", ai.filename); } else ReportSelfAvatarChanged(); diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index 68783083c7..041a2052bf 100644 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -1392,10 +1392,10 @@ void CJabberProto::OnIqResultGotAvatar(MCONTACT hContact, const char *pszText, c char buffer[41]; setString(hContact, "AvatarHash", bin2hex(digest, sizeof(digest), buffer)); - ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, HANDLE(&ai)); + ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, &ai); debugLogW(L"Broadcast new avatar: %s", ai.filename); } - else ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_FAILED, HANDLE(&ai)); + else ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_FAILED, &ai); } ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/protocols/SkypeWeb/src/skype_avatars.cpp b/protocols/SkypeWeb/src/skype_avatars.cpp index 1ac07d6d33..015b56965b 100644 --- a/protocols/SkypeWeb/src/skype_avatars.cpp +++ b/protocols/SkypeWeb/src/skype_avatars.cpp @@ -142,7 +142,7 @@ void CSkypeProto::SetAvatarUrl(MCONTACT hContact, CMStringW &tszUrl) if (tszUrl.IsEmpty()) { delSetting(hContact, "AvatarUrl"); - ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, NULL, 0); + ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, nullptr); } else { setWString(hContact, "AvatarUrl", tszUrl.GetBuffer()); @@ -151,7 +151,7 @@ void CSkypeProto::SetAvatarUrl(MCONTACT hContact, CMStringW &tszUrl) ai.hContact = hContact; GetAvatarFileName(ai.hContact, ai.filename, _countof(ai.filename)); ai.format = ProtoGetAvatarFormat(ai.filename); - ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, (HANDLE)&ai, 0); + ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, &ai); } } diff --git a/protocols/Tox/src/tox_avatars.cpp b/protocols/Tox/src/tox_avatars.cpp index ca5c7d40a5..5e30c5c442 100644 --- a/protocols/Tox/src/tox_avatars.cpp +++ b/protocols/Tox/src/tox_avatars.cpp @@ -196,7 +196,7 @@ void CToxProto::OnGotFriendAvatarInfo(Tox *tox, AvatarTransferParam *transfer) transfers.Remove(transfer); delSetting(hConact, TOX_SETTINGS_AVATAR_HASH); - ProtoBroadcastAck(hConact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, nullptr, 0); + ProtoBroadcastAck(hConact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, nullptr); return; } @@ -227,6 +227,6 @@ void CToxProto::OnGotFriendAvatarData(AvatarTransferParam *transfer) fclose(transfer->hFile); transfer->hFile = nullptr; - ProtoBroadcastAck(transfer->pfts.hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, (HANDLE)&ai, 0); + ProtoBroadcastAck(transfer->pfts.hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, &ai); transfers.Remove(transfer); } diff --git a/protocols/Twitter/src/connection.cpp b/protocols/Twitter/src/connection.cpp index d25dbcb919..5e8b88d830 100644 --- a/protocols/Twitter/src/connection.cpp +++ b/protocols/Twitter/src/connection.cpp @@ -336,7 +336,7 @@ void CTwitterProto::UpdateAvatar(MCONTACT hContact, const CMStringA &url, bool f ai.hContact = hContact; setString(hContact, TWITTER_KEY_AV_URL, url.c_str()); - ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, &ai, 0); + ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, &ai); } else { ForkThread(&CTwitterProto::UpdateAvatarWorker, new update_avatar(hContact, url)); diff --git a/protocols/VKontakte/src/vk_avatars.cpp b/protocols/VKontakte/src/vk_avatars.cpp index b4ee6cc7cb..b7829cd58a 100644 --- a/protocols/VKontakte/src/vk_avatars.cpp +++ b/protocols/VKontakte/src/vk_avatars.cpp @@ -168,6 +168,6 @@ void CVkProto::SetAvatarUrl(MCONTACT hContact, CMStringW &wszUrl) ai.hContact = hContact; GetAvatarFileName(ai.hContact, ai.filename, _countof(ai.filename)); ai.format = ProtoGetAvatarFormat(ai.filename); - ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, (HANDLE)&ai); + ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, &ai); } } \ No newline at end of file diff --git a/protocols/WhatsApp/src/avatars.cpp b/protocols/WhatsApp/src/avatars.cpp index d648bb3801..dfe45817b7 100644 --- a/protocols/WhatsApp/src/avatars.cpp +++ b/protocols/WhatsApp/src/avatars.cpp @@ -27,7 +27,7 @@ void WhatsAppProto::OnIqGetAvatar(const WANode &node) setDword(pUser->hContact, DBKEY_AVATAR_TAG, 0); // avatar doesn't exist, don't check it later LBL_Error: - ProtoBroadcastAck(pUser->hContact, ACKTYPE_AVATAR, ACKRESULT_FAILED, HANDLE(&ai)); + ProtoBroadcastAck(pUser->hContact, ACKTYPE_AVATAR, ACKRESULT_FAILED, &ai); return; } @@ -39,7 +39,7 @@ LBL_Error: // set timestamp of avatar being saved setDword(pUser->hContact, DBKEY_AVATAR_TAG, dwLastChangeTime); } - ProtoBroadcastAck(pUser->hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, HANDLE(&ai)); + ProtoBroadcastAck(pUser->hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, &ai); } INT_PTR WhatsAppProto::GetAvatarInfo(WPARAM wParam, LPARAM lParam) -- cgit v1.2.3