warning fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@13728 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 8 insertions, 8 deletions

diff --git a/protocols/MSN/src/msn_commands.cpp b/protocols/MSN/src/msn_commands.cpp
index cb0ad0a302..cddb412fe5 100644
--- a/protocols/MSN/src/msn_commands.cpp
+++ b/protocols/MSN/src/msn_commands.cpp
@@ -732,7 +732,7 @@ void CMsnProto::MSN_ProcessStatusMessage(ezxml_t xmli, const char* wlid)
 #endif

 }

 

-void CMsnProto::MSN_ProcessNotificationMessage(char* buf, unsigned len)

+void CMsnProto::MSN_ProcessNotificationMessage(char* buf, size_t len)

 {

 	if (buf == NULL) return;

 	ezxml_t xmlnot = ezxml_parse_str(buf, len);

@@ -1047,7 +1047,7 @@ LBL_InvalidCommand:
 								MEVENT hDbEvent;

 								bool bDuplicate = false;

 								DBEVENTINFO dbei = { sizeof(dbei) };

-								DWORD cbBlob = strlen(message);

+								DWORD cbBlob = (DWORD)strlen(message);

 								dbei.cbBlob = cbBlob;

 								BYTE *pszMsgBuf = (BYTE*)mir_calloc(cbBlob);

 								if (pszMsgBuf) {

diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp
index 385bd72697..5683bdb389 100644
--- a/protocols/MSN/src/msn_misc.cpp
+++ b/protocols/MSN/src/msn_misc.cpp
@@ -751,7 +751,7 @@ int ThreadData::sendPacketPayload(const char* cmd, const char *param, const char
 	va_start(vararg, fmt);

 

 	thisTrid = InterlockedIncrement(&mTrid);

-	int regSz = proto->msnRegistration?strlen(proto->msnRegistration)+16:0;

+	int regSz = proto->msnRegistration ? (int)strlen(proto->msnRegistration)+16 : 0;

 	int paramStart = mir_snprintf(str, strsize, "%s %d %s ", cmd, thisTrid, param), strszstart = 0, strSz;

 	while ((strSz = mir_vsnprintf(str + paramStart, strsize - paramStart - regSz - 10, fmt, vararg)) == -1)

 		str = (char*)mir_realloc(str, strsize += 512);

diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp
index b026780ee8..3b9a588261 100644
--- a/protocols/MSN/src/msn_proto.cpp
+++ b/protocols/MSN/src/msn_proto.cpp
@@ -707,7 +707,7 @@ int CMsnProto::RecvContacts(MCONTACT hContact, PROTORECVEVENT* pre)
 	int i;

 

 	for (i = 0; i < pre->lParam; i++)

-			dbei.cbBlob += mir_tstrlen(isrList[i]->nick) + 2 + mir_tstrlen(isrList[i]->id);

+		dbei.cbBlob += int(mir_tstrlen(isrList[i]->nick) + 2 + mir_tstrlen(isrList[i]->id));

 	dbei.pBlob = (PBYTE)_alloca(dbei.cbBlob);

 	for (i = 0, pCurBlob = dbei.pBlob; i < pre->lParam; i++) {

 		mir_strcpy((char*)pCurBlob, _T2A(isrList[i]->nick));

diff --git a/protocols/MSN/src/msn_proto.h b/protocols/MSN/src/msn_proto.h
index 75ef888607..f9d238475f 100644
--- a/protocols/MSN/src/msn_proto.h
+++ b/protocols/MSN/src/msn_proto.h
@@ -207,7 +207,7 @@ struct CMsnProto : public PROTO<CMsnProto>
 

 	void        MSN_SendStatusMessage(const char* msg);

 	void        MSN_SetServerStatus(int newStatus);

-	void		MSN_FetchRecentMessages(time_t since = 0);

+	void        MSN_FetchRecentMessages(time_t since = 0);

 	void        MSN_StartStopTyping(GCThreadData* info, bool start);

 	void        MSN_SendTyping(ThreadData* info, const char* email, int netId, bool bTyping );

 

@@ -215,9 +215,9 @@ struct CMsnProto : public PROTO<CMsnProto>
 	void        MSN_ReceiveMessage(ThreadData* info, char* cmdString, char* params);

 	int			MSN_HandleCommands(ThreadData* info, char* cmdString);

 	int			MSN_HandleErrors(ThreadData* info, char* cmdString);

-	void        MSN_ProcessNotificationMessage(char* buf, unsigned len);

-	void		MSN_ProcessStatusMessage(ezxml_t xmli, const char* wlid);

-	void		MSN_ProcessNLN(const char *userStatus, const char *wlid, char *userNick, const char *objid, char *cmdstring);

+	void        MSN_ProcessNotificationMessage(char* buf, size_t bufLen);

+	void        MSN_ProcessStatusMessage(ezxml_t xmli, const char* wlid);

+	void        MSN_ProcessNLN(const char *userStatus, const char *wlid, char *userNick, const char *objid, char *cmdstring);

 	void        MSN_ProcessPage(char* buf, unsigned len);

 	void        MSN_ProcessRemove(char* buf, size_t len);

 	void        MSN_ProcessAdd(char* buf, size_t len);