slightly refactored MRA

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

1 files changed, 72 insertions, 72 deletions

diff --git a/protocols/MRA/MraSendQueue.cpp b/protocols/MRA/MraSendQueue.cpp
index de68943569..a4f0891ccb 100644
--- a/protocols/MRA/MraSendQueue.cpp
+++ b/protocols/MRA/MraSendQueue.cpp
@@ -22,7 +22,7 @@ typedef struct
 	HANDLE			hContact;

 	DWORD			dwAckType;

 	LPBYTE			lpbData;

-	SIZE_T			dwDataSize;

+	size_t			dwDataSize;

 } MRA_SEND_QUEUE_ITEM;

 

 

@@ -32,7 +32,7 @@ typedef struct
 

 

 

-DWORD MraSendQueueInitialize(DWORD dwSendTimeOutInterval,HANDLE *phSendQueueHandle)

+DWORD MraSendQueueInitialize(DWORD dwSendTimeOutInterval, HANDLE *phSendQueueHandle)

 {

 	DWORD dwRetErrorCode;

 

@@ -40,20 +40,20 @@ DWORD MraSendQueueInitialize(DWORD dwSendTimeOutInterval,HANDLE *phSendQueueHand
 	{

 		MRA_SEND_QUEUE *pmrasqSendQueue;

 

-		pmrasqSendQueue=(MRA_SEND_QUEUE*)MEMALLOC(sizeof(MRA_SEND_QUEUE));

+		pmrasqSendQueue = (MRA_SEND_QUEUE*)mir_calloc(sizeof(MRA_SEND_QUEUE));

 		if (pmrasqSendQueue)

 		{

-			dwRetErrorCode=ListMTInitialize(&pmrasqSendQueue->lmtListMT,0);

-			if (dwRetErrorCode==NO_ERROR)

+			dwRetErrorCode = ListMTInitialize(&pmrasqSendQueue->lmtListMT, 0);

+			if (dwRetErrorCode == NO_ERROR)

 			{

-				pmrasqSendQueue->dwSendTimeOutInterval=dwSendTimeOutInterval;

-				(*phSendQueueHandle)=(HANDLE)pmrasqSendQueue;

+				pmrasqSendQueue->dwSendTimeOutInterval = dwSendTimeOutInterval;

+				(*phSendQueueHandle) = (HANDLE)pmrasqSendQueue;

 			}

-		}else{

-			dwRetErrorCode=GetLastError();

+		}else {

+			dwRetErrorCode = GetLastError();

 		}

-	}else{

-		dwRetErrorCode=ERROR_INVALID_HANDLE;

+	}else {

+		dwRetErrorCode = ERROR_INVALID_HANDLE;

 	}

 return(dwRetErrorCode);

 }

@@ -63,161 +63,161 @@ void MraSendQueueDestroy(HANDLE hSendQueueHandle)
 {

 	if (hSendQueueHandle)

 	{

-		MRA_SEND_QUEUE *pmrasqSendQueue=(MRA_SEND_QUEUE*)hSendQueueHandle;

+		MRA_SEND_QUEUE *pmrasqSendQueue = (MRA_SEND_QUEUE*)hSendQueueHandle;

 		MRA_SEND_QUEUE_ITEM *pmrasqiSendQueueItem;

 

 		ListMTLock(&pmrasqSendQueue->lmtListMT);

-		while(ListMTItemGetFirst(&pmrasqSendQueue->lmtListMT,NULL,(LPVOID*)&pmrasqiSendQueueItem)==NO_ERROR)

+		while(ListMTItemGetFirst(&pmrasqSendQueue->lmtListMT, NULL, (LPVOID*)&pmrasqiSendQueueItem) == NO_ERROR)

 		{

-			ListMTItemDelete(&pmrasqSendQueue->lmtListMT,&pmrasqiSendQueueItem->lmtListMTItem);

-			//MEMFREE(pmrasqiSendQueueItem->lpbData);

-			MEMFREE(pmrasqiSendQueueItem);

+			ListMTItemDelete(&pmrasqSendQueue->lmtListMT, &pmrasqiSendQueueItem->lmtListMTItem);

+			//mir_free(pmrasqiSendQueueItem->lpbData);

+			mir_free(pmrasqiSendQueueItem);

 		}

 		ListMTUnLock(&pmrasqSendQueue->lmtListMT);

 

 		ListMTDestroy(&pmrasqSendQueue->lmtListMT);

-		MEMFREE(pmrasqSendQueue);

+		mir_free(pmrasqSendQueue);

 	}

 }

 

 

-DWORD MraSendQueueAdd(HANDLE hSendQueueHandle,DWORD dwCMDNum,DWORD dwFlags,HANDLE hContact,DWORD dwAckType,LPBYTE lpbData,SIZE_T dwDataSize)

+DWORD MraSendQueueAdd(HANDLE hSendQueueHandle, DWORD dwCMDNum, DWORD dwFlags, HANDLE hContact, DWORD dwAckType, LPBYTE lpbData, size_t dwDataSize)

 {

 	DWORD dwRetErrorCode;

 

 	if (hSendQueueHandle && dwCMDNum)

 	{

-		MRA_SEND_QUEUE *pmrasqSendQueue=(MRA_SEND_QUEUE*)hSendQueueHandle;

+		MRA_SEND_QUEUE *pmrasqSendQueue = (MRA_SEND_QUEUE*)hSendQueueHandle;

 		MRA_SEND_QUEUE_ITEM *pmrasqiSendQueueItem;

 

-		pmrasqiSendQueueItem=(MRA_SEND_QUEUE_ITEM*)MEMALLOC(sizeof(MRA_SEND_QUEUE_ITEM));

+		pmrasqiSendQueueItem = (MRA_SEND_QUEUE_ITEM*)mir_calloc(sizeof(MRA_SEND_QUEUE_ITEM));

 		if (pmrasqiSendQueueItem)

 		{

 			//pmrasqiSendQueueItem->lmtListMTItem;

 			GetSystemTimeAsFileTime(&pmrasqiSendQueueItem->ftSendTime);

-			pmrasqiSendQueueItem->dwCMDNum=dwCMDNum;

-			pmrasqiSendQueueItem->dwFlags=dwFlags;

-			pmrasqiSendQueueItem->hContact=hContact;

-			pmrasqiSendQueueItem->dwAckType=dwAckType;

-			pmrasqiSendQueueItem->lpbData=lpbData;

-			pmrasqiSendQueueItem->dwDataSize=dwDataSize;

+			pmrasqiSendQueueItem->dwCMDNum = dwCMDNum;

+			pmrasqiSendQueueItem->dwFlags = dwFlags;

+			pmrasqiSendQueueItem->hContact = hContact;

+			pmrasqiSendQueueItem->dwAckType = dwAckType;

+			pmrasqiSendQueueItem->lpbData = lpbData;

+			pmrasqiSendQueueItem->dwDataSize = dwDataSize;

 

 			ListMTLock(&pmrasqSendQueue->lmtListMT);

-			ListMTItemAdd(&pmrasqSendQueue->lmtListMT,&pmrasqiSendQueueItem->lmtListMTItem,pmrasqiSendQueueItem);

+			ListMTItemAdd(&pmrasqSendQueue->lmtListMT, &pmrasqiSendQueueItem->lmtListMTItem, pmrasqiSendQueueItem);

 			ListMTUnLock(&pmrasqSendQueue->lmtListMT);

-			dwRetErrorCode=NO_ERROR;

-		}else{

-			dwRetErrorCode=GetLastError();

+			dwRetErrorCode = NO_ERROR;

+		}else {

+			dwRetErrorCode = GetLastError();

 		}

-	}else{

-		dwRetErrorCode=ERROR_INVALID_HANDLE;

+	}else {

+		dwRetErrorCode = ERROR_INVALID_HANDLE;

 	}

 return(dwRetErrorCode);

 }

 

 

-DWORD MraSendQueueFree(HANDLE hSendQueueHandle,DWORD dwCMDNum)

+DWORD MraSendQueueFree(HANDLE hSendQueueHandle, DWORD dwCMDNum)

 {

 	DWORD dwRetErrorCode;

 

 	if (hSendQueueHandle)

 	{

-		MRA_SEND_QUEUE *pmrasqSendQueue=(MRA_SEND_QUEUE*)hSendQueueHandle;

+		MRA_SEND_QUEUE *pmrasqSendQueue = (MRA_SEND_QUEUE*)hSendQueueHandle;

 		MRA_SEND_QUEUE_ITEM *pmrasqiSendQueueItem;

 		LIST_MT_ITERATOR lmtiIterator;

 

-		dwRetErrorCode=ERROR_NOT_FOUND;

+		dwRetErrorCode = ERROR_NOT_FOUND;

 		ListMTLock(&pmrasqSendQueue->lmtListMT);

-		ListMTIteratorMoveFirst(&pmrasqSendQueue->lmtListMT,&lmtiIterator);

+		ListMTIteratorMoveFirst(&pmrasqSendQueue->lmtListMT, &lmtiIterator);

 		do

 		{// цикл

-			if (ListMTIteratorGet(&lmtiIterator,NULL,(LPVOID*)&pmrasqiSendQueueItem)==NO_ERROR)

-			if (pmrasqiSendQueueItem->dwCMDNum==dwCMDNum)

+			if (ListMTIteratorGet(&lmtiIterator, NULL, (LPVOID*)&pmrasqiSendQueueItem) == NO_ERROR)

+			if (pmrasqiSendQueueItem->dwCMDNum == dwCMDNum)

 			{

-				ListMTItemDelete(&pmrasqSendQueue->lmtListMT,&pmrasqiSendQueueItem->lmtListMTItem);

-				//MEMFREE(pmrasqiSendQueueItem->lpbData);

-				MEMFREE(pmrasqiSendQueueItem);

-				dwRetErrorCode=NO_ERROR;

+				ListMTItemDelete(&pmrasqSendQueue->lmtListMT, &pmrasqiSendQueueItem->lmtListMTItem);

+				//mir_free(pmrasqiSendQueueItem->lpbData);

+				mir_free(pmrasqiSendQueueItem);

+				dwRetErrorCode = NO_ERROR;

 				break;

 			}

 		}while(ListMTIteratorMoveNext(&lmtiIterator));

 		ListMTUnLock(&pmrasqSendQueue->lmtListMT);

-	}else{

-		dwRetErrorCode=ERROR_INVALID_HANDLE;

+	}else {

+		dwRetErrorCode = ERROR_INVALID_HANDLE;

 	}

 return(dwRetErrorCode);

 }

 

 

-DWORD MraSendQueueFind(HANDLE hSendQueueHandle,DWORD dwCMDNum,DWORD *pdwFlags,HANDLE *phContact,DWORD *pdwAckType,LPBYTE *plpbData,SIZE_T *pdwDataSize)

+DWORD MraSendQueueFind(HANDLE hSendQueueHandle, DWORD dwCMDNum, DWORD *pdwFlags, HANDLE *phContact, DWORD *pdwAckType, LPBYTE *plpbData, size_t *pdwDataSize)

 {

 	DWORD dwRetErrorCode;

 

 	if (hSendQueueHandle)

 	{

-		MRA_SEND_QUEUE *pmrasqSendQueue=(MRA_SEND_QUEUE*)hSendQueueHandle;

+		MRA_SEND_QUEUE *pmrasqSendQueue = (MRA_SEND_QUEUE*)hSendQueueHandle;

 		MRA_SEND_QUEUE_ITEM *pmrasqiSendQueueItem;

 		LIST_MT_ITERATOR lmtiIterator;

 

-		dwRetErrorCode=ERROR_NOT_FOUND;

+		dwRetErrorCode = ERROR_NOT_FOUND;

 		ListMTLock(&pmrasqSendQueue->lmtListMT);

-		ListMTIteratorMoveFirst(&pmrasqSendQueue->lmtListMT,&lmtiIterator);

+		ListMTIteratorMoveFirst(&pmrasqSendQueue->lmtListMT, &lmtiIterator);

 		do

 		{// цикл

-			if (ListMTIteratorGet(&lmtiIterator,NULL,(LPVOID*)&pmrasqiSendQueueItem)==NO_ERROR)

-			if (pmrasqiSendQueueItem->dwCMDNum==dwCMDNum)

+			if (ListMTIteratorGet(&lmtiIterator, NULL, (LPVOID*)&pmrasqiSendQueueItem) == NO_ERROR)

+			if (pmrasqiSendQueueItem->dwCMDNum == dwCMDNum)

 			{

-				if (pdwFlags)		(*pdwFlags)=pmrasqiSendQueueItem->dwFlags;

-				if (phContact)		(*phContact)=pmrasqiSendQueueItem->hContact;

-				if (pdwAckType)		(*pdwAckType)=pmrasqiSendQueueItem->dwAckType;

-				if (plpbData)		(*plpbData)=pmrasqiSendQueueItem->lpbData;

-				if (pdwDataSize)	(*pdwDataSize)=pmrasqiSendQueueItem->dwDataSize;

-				dwRetErrorCode=NO_ERROR;

+				if (pdwFlags)		(*pdwFlags) = pmrasqiSendQueueItem->dwFlags;

+				if (phContact)		(*phContact) = pmrasqiSendQueueItem->hContact;

+				if (pdwAckType)		(*pdwAckType) = pmrasqiSendQueueItem->dwAckType;

+				if (plpbData)		(*plpbData) = pmrasqiSendQueueItem->lpbData;

+				if (pdwDataSize)	(*pdwDataSize) = pmrasqiSendQueueItem->dwDataSize;

+				dwRetErrorCode = NO_ERROR;

 				break;

 			}

 		}while(ListMTIteratorMoveNext(&lmtiIterator));

 		ListMTUnLock(&pmrasqSendQueue->lmtListMT);

-	}else{

-		dwRetErrorCode=ERROR_INVALID_HANDLE;

+	}else {

+		dwRetErrorCode = ERROR_INVALID_HANDLE;

 	}

 return(dwRetErrorCode);

 }

 

 

-DWORD MraSendQueueFindOlderThan(HANDLE hSendQueueHandle,DWORD dwTime,DWORD *pdwCMDNum,DWORD *pdwFlags,HANDLE *phContact,DWORD *pdwAckType,LPBYTE *plpbData,SIZE_T *pdwDataSize)

+DWORD MraSendQueueFindOlderThan(HANDLE hSendQueueHandle, DWORD dwTime, DWORD *pdwCMDNum, DWORD *pdwFlags, HANDLE *phContact, DWORD *pdwAckType, LPBYTE *plpbData, size_t *pdwDataSize)

 {

 	DWORD dwRetErrorCode;

 

 	if (hSendQueueHandle)

 	{

 		FILETIME ftExpireTime;

-		MRA_SEND_QUEUE *pmrasqSendQueue=(MRA_SEND_QUEUE*)hSendQueueHandle;

+		MRA_SEND_QUEUE *pmrasqSendQueue = (MRA_SEND_QUEUE*)hSendQueueHandle;

 		MRA_SEND_QUEUE_ITEM *pmrasqiSendQueueItem;

 		LIST_MT_ITERATOR lmtiIterator;

 

 		GetSystemTimeAsFileTime(&ftExpireTime);

 		(*((DWORDLONG*)&ftExpireTime))-=((DWORDLONG)dwTime*FILETIME_SECOND);

-		dwRetErrorCode=ERROR_NOT_FOUND;

+		dwRetErrorCode = ERROR_NOT_FOUND;

 		ListMTLock(&pmrasqSendQueue->lmtListMT);

-		ListMTIteratorMoveFirst(&pmrasqSendQueue->lmtListMT,&lmtiIterator);

+		ListMTIteratorMoveFirst(&pmrasqSendQueue->lmtListMT, &lmtiIterator);

 		do

 		{// цикл

-			if (ListMTIteratorGet(&lmtiIterator,NULL,(LPVOID*)&pmrasqiSendQueueItem)==NO_ERROR)

+			if (ListMTIteratorGet(&lmtiIterator, NULL, (LPVOID*)&pmrasqiSendQueueItem) == NO_ERROR)

 			if ((*((DWORDLONG*)&ftExpireTime))>(*((DWORDLONG*)&pmrasqiSendQueueItem->ftSendTime)))

 			{

-				if (pdwCMDNum)		(*pdwCMDNum)=pmrasqiSendQueueItem->dwCMDNum;

-				if (pdwFlags)		(*pdwFlags)=pmrasqiSendQueueItem->dwFlags;

-				if (phContact)		(*phContact)=pmrasqiSendQueueItem->hContact;

-				if (pdwAckType)		(*pdwAckType)=pmrasqiSendQueueItem->dwAckType;

-				if (plpbData)		(*plpbData)=pmrasqiSendQueueItem->lpbData;

-				if (pdwDataSize)	(*pdwDataSize)=pmrasqiSendQueueItem->dwDataSize;

-				dwRetErrorCode=NO_ERROR;

+				if (pdwCMDNum)		(*pdwCMDNum) = pmrasqiSendQueueItem->dwCMDNum;

+				if (pdwFlags)		(*pdwFlags) = pmrasqiSendQueueItem->dwFlags;

+				if (phContact)		(*phContact) = pmrasqiSendQueueItem->hContact;

+				if (pdwAckType)		(*pdwAckType) = pmrasqiSendQueueItem->dwAckType;

+				if (plpbData)		(*plpbData) = pmrasqiSendQueueItem->lpbData;

+				if (pdwDataSize)	(*pdwDataSize) = pmrasqiSendQueueItem->dwDataSize;

+				dwRetErrorCode = NO_ERROR;

 				break;

 			}

 		}while(ListMTIteratorMoveNext(&lmtiIterator));

 		ListMTUnLock(&pmrasqSendQueue->lmtListMT);

-	}else{

-		dwRetErrorCode=ERROR_INVALID_HANDLE;

+	}else {

+		dwRetErrorCode = ERROR_INVALID_HANDLE;

 	}

 return(dwRetErrorCode);

 }