code cleaning

7 files changed, 18 insertions, 18 deletions

diff --git a/protocols/MSN/src/msn_avatar.cpp b/protocols/MSN/src/msn_avatar.cpp
index b2f1f36cb9..898e626de1 100644
--- a/protocols/MSN/src/msn_avatar.cpp
+++ b/protocols/MSN/src/msn_avatar.cpp
@@ -34,7 +34,7 @@ void CMsnProto::AvatarQueue_Uninit()
 

 void CMsnProto::pushAvatarRequest(MCONTACT hContact, LPCSTR pszUrl)

 {

-	ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, nullptr, 0);

+	ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, nullptr);

 

 	if (pszUrl != nullptr && *pszUrl != 0) {

 		mir_cslock lck(csAvatarQueue);

@@ -89,7 +89,7 @@ LBL_Error:
 	_write(fileId, nlhrReply->pData, (unsigned)nlhrReply->dataLength);

 	_close(fileId);

 

-	ProtoBroadcastAck(p->hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, &ai, 0);

+	ProtoBroadcastAck(p->hContact, ACKTYPE_AVATAR, ACKRESULT_SUCCESS, &ai);

 	Netlib_FreeHttpRequest(nlhrReply);

 	return true;

 }

@@ -116,7 +116,7 @@ void __cdecl CMsnProto::MSN_AvatarsThread(void*)
 			continue;

 

 		if (!loadHttpAvatar(p))

-			ProtoBroadcastAck(p->hContact, ACKTYPE_AVATAR, ACKRESULT_FAILED, nullptr, 0);

+			ProtoBroadcastAck(p->hContact, ACKTYPE_AVATAR, ACKRESULT_FAILED, nullptr);

 		delete p;

 	}

 

diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp
index 1de6168b5f..abb2e1c5f8 100644
--- a/protocols/MSN/src/msn_commands.cpp
+++ b/protocols/MSN/src/msn_commands.cpp
@@ -517,7 +517,7 @@ void CMsnProto::MSN_ProcessYFind(char* buf, size_t len)
 			psr.email.w = szEmailT;

 			ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, msnSearchId, (LPARAM)&psr);

 		}

-		ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, msnSearchId, 0);

+		ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, msnSearchId);

 

 		msnSearchId = nullptr;

 	}

@@ -627,7 +627,7 @@ void CMsnProto::MSN_ProcessNLN(const char *userStatus, const char *wlid, char *u
 			delSetting(hContact, "PictContext");

 			delSetting(hContact, "PictSavedContext");

 

-			ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, nullptr, 0);

+			ProtoBroadcastAck(hContact, ACKTYPE_AVATAR, ACKRESULT_STATUS, nullptr);

 		}

 	}

 	else if (lastStatus == ID_STATUS_OFFLINE)

diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp
index 1ace72c08a..16b93b6007 100644
--- a/protocols/MSN/src/msn_mail.cpp
+++ b/protocols/MSN/src/msn_mail.cpp
@@ -300,7 +300,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial)
 		}

 	}

 

-	ProtoBroadcastAck(NULL, ACKTYPE_EMAIL, ACKRESULT_STATUS, nullptr, 0);

+	ProtoBroadcastAck(NULL, ACKTYPE_EMAIL, ACKRESULT_STATUS, nullptr);

 

 	// Disable to notify receiving hotmail

 	if (ShowPopup && !getByte("DisableHotmail", 0)) {

diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp
index fbb46bdd6c..c6954fe6d1 100644
--- a/protocols/MSN/src/msn_misc.cpp
+++ b/protocols/MSN/src/msn_misc.cpp
@@ -915,7 +915,7 @@ filetransfer::~filetransfer(void)
 	if (!bCompleted && p2p_appID == MSN_APPID_FILE) {

 		std.pszFiles.w = nullptr;

 		std.totalFiles = 0;

-		proto->ProtoBroadcastAck(std.hContact, ACKTYPE_FILE, ACKRESULT_FAILED, this, 0);

+		proto->ProtoBroadcastAck(std.hContact, ACKTYPE_FILE, ACKRESULT_FAILED, this);

 	}

 

 	mir_free(p2p_branch);

@@ -945,7 +945,7 @@ void filetransfer::complete(void)
 	close();

 

 	bCompleted = true;

-	proto->ProtoBroadcastAck(std.hContact, ACKTYPE_FILE, ACKRESULT_SUCCESS, this, 0);

+	proto->ProtoBroadcastAck(std.hContact, ACKTYPE_FILE, ACKRESULT_SUCCESS, this);

 }

 

 int filetransfer::create(void)

diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp
index 8eaa4ef394..2005afd17c 100644
--- a/protocols/MSN/src/msn_proto.cpp
+++ b/protocols/MSN/src/msn_proto.cpp
@@ -380,7 +380,7 @@ void __cdecl CMsnProto::MsnSearchAckThread(void* arg)
 

 	if (Lists_IsInList(LIST_FL, email)) {

 		MSN_ShowPopup(emailT, TranslateT("Contact already in your contact list"), MSN_ALLOW_MSGBOX, nullptr);

-		ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, arg, 0);

+		ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, arg);

 		mir_free(arg);

 		return;

 	}

@@ -401,17 +401,17 @@ void __cdecl CMsnProto::MsnSearchAckThread(void* arg)
 				psr.email.w = (wchar_t*)emailT;

 

 				ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_DATA, arg, (LPARAM)&psr);

-				ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, arg, 0);

+				ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, arg);

 			}

 			break;

 

 		case 1:

 			if (strstr(email, "@yahoo.com") == nullptr)

-				ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, arg, 0);

+				ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, arg);

 			break;

 

 		default:

-			ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, arg, 0);

+			ProtoBroadcastAck(NULL, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, arg);

 			break;

 		}

 	}

@@ -474,7 +474,7 @@ void __cdecl CMsnProto::MsnFileAckThread(void* arg)
 

 	ft->create();

 

-	ProtoBroadcastAck(ft->std.hContact, ACKTYPE_FILE, ACKRESULT_INITIALISING, ft, 0);

+	ProtoBroadcastAck(ft->std.hContact, ACKTYPE_FILE, ACKRESULT_INITIALISING, ft);

 

 	if (ft->tType == SERVER_HTTP) {

 		const char *pszSkypeToken;

@@ -509,7 +509,7 @@ void __cdecl CMsnProto::MsnFileAckThread(void* arg)
 			HNETLIBCONN nlc = Netlib_OpenConnection(m_hNetlibUser, &nloc);

 			if (nlc && Netlib_SendHttpRequest(nlc, &nlhr) != SOCKET_ERROR && (nlhrReply = Netlib_RecvHttpHeaders(nlc))) {

 				if (nlhrReply->resultCode == 200 || nlhrReply->resultCode == 206) {

-					ProtoBroadcastAck(ft->std.hContact, ACKTYPE_FILE, ACKRESULT_CONNECTED, ft, 0);

+					ProtoBroadcastAck(ft->std.hContact, ACKTYPE_FILE, ACKRESULT_CONNECTED, ft);

 

 					INT_PTR dw;

 					char buf[1024];

diff --git a/protocols/MSN/src/msn_skypeab.cpp b/protocols/MSN/src/msn_skypeab.cpp
index ac107ce68f..0bf7f24696 100644
--- a/protocols/MSN/src/msn_skypeab.cpp
+++ b/protocols/MSN/src/msn_skypeab.cpp
@@ -369,7 +369,7 @@ bool CMsnProto::MSN_SKYABSearch(const char *keyWord, HANDLE hSearch)
 

 	// initialize the netlib request

 	if (!APISkypeComRequest(&nlhr, headers)) {

-		ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, hSearch, 0);

+		ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, hSearch);

 		return false;

 	}

 

@@ -390,7 +390,7 @@ bool CMsnProto::MSN_SKYABSearch(const char *keyWord, HANDLE hSearch)
 		if (nlhrReply->resultCode == 200 && nlhrReply->pData) {

 			JSONROOT root(nlhrReply->pData);

 			if (root == nullptr) {

-				ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, hSearch, 0);

+				ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, hSearch);

 				return false;

 			}

 

@@ -410,7 +410,7 @@ bool CMsnProto::MSN_SKYABSearch(const char *keyWord, HANDLE hSearch)
 				ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_DATA, hSearch, (LPARAM)&psr);

 			}

 			json_free(items);

-			ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, hSearch, 0);

+			ProtoBroadcastAck(0, ACKTYPE_SEARCH, ACKRESULT_SUCCESS, hSearch);

 			bRet = true;

 		}

 		Netlib_FreeHttpRequest(nlhrReply);

diff --git a/protocols/MSN/src/msn_svcs.cpp b/protocols/MSN/src/msn_svcs.cpp
index 9b5ce2fdda..01d2f1c2a8 100644
--- a/protocols/MSN/src/msn_svcs.cpp
+++ b/protocols/MSN/src/msn_svcs.cpp
@@ -58,7 +58,7 @@ INT_PTR CMsnProto::GetAvatar(WPARAM wParam, LPARAM lParam)
 void CMsnProto::sttFakeAvatarAck(void* arg)

 {

 	Sleep(100);

-	ProtoBroadcastAck(((PROTO_AVATAR_INFORMATION*)arg)->hContact, ACKTYPE_AVATAR, ACKRESULT_FAILED, arg, 0);

+	ProtoBroadcastAck(((PROTO_AVATAR_INFORMATION*)arg)->hContact, ACKTYPE_AVATAR, ACKRESULT_FAILED, arg);

 }

 

 INT_PTR CMsnProto::GetAvatarInfo(WPARAM wParam, LPARAM lParam)