automatic lock management

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

1 files changed, 9 insertions, 25 deletions

diff --git a/protocols/MRA/Sdk/FIFOMT.h b/protocols/MRA/Sdk/FIFOMT.h
index d15ae3e596..acff96f500 100644
--- a/protocols/MRA/Sdk/FIFOMT.h
+++ b/protocols/MRA/Sdk/FIFOMT.h
@@ -62,13 +62,8 @@ typedef PCLIST_MT_ITERATOR	PCFIFO_MT_ITERATOR, LPCFIFO_MT_ITERATOR;
 

 __inline size_t FifoMTItemPush(PCFIFO_MT pcpmtFifoMT,PCFIFO_MT_ITEM pcffmtiFifoItem,LPVOID lpData)

 {

-	size_t dwRet;

-

-	ListMTLock(pcpmtFifoMT);

-	dwRet=ListMTItemAdd(pcpmtFifoMT,pcffmtiFifoItem,lpData);

-	ListMTUnLock(pcpmtFifoMT);

-

-return(dwRet);

+	mt_lock l(pcpmtFifoMT);

+	return ListMTItemAdd(pcpmtFifoMT,pcffmtiFifoItem,lpData);

 }

 

 

@@ -77,39 +72,28 @@ __inline DWORD FifoMTItemPop(PCFIFO_MT pcpmtFifoMT,PFIFO_MT_ITEM *ppffmtiFifoIte
 	DWORD dwRetErrorCode;

 	PLIST_MT_ITEM plmtiItem;

 

-	ListMTLock(pcpmtFifoMT);

+	mt_lock l(pcpmtFifoMT);

 	if ((dwRetErrorCode=ListMTItemGetFirst(pcpmtFifoMT,&plmtiItem,plpData))==NO_ERROR)

 	{

 		if (ppffmtiFifoItem) (*ppffmtiFifoItem)=plmtiItem;

-		dwRetErrorCode=ListMTItemDelete(pcpmtFifoMT,plmtiItem);

+		return ListMTItemDelete(pcpmtFifoMT,plmtiItem);

 	}

-	ListMTUnLock(pcpmtFifoMT);

 

-return(dwRetErrorCode);

+	return dwRetErrorCode;

 }

 

 

 __inline DWORD FifoMTItemGetFirst(PCFIFO_MT pcpmtFifoMT,PFIFO_MT_ITEM *ppffmtiFifoItem,LPVOID *plpData)

 {

-	DWORD dwRetErrorCode;

-

-	ListMTLock(pcpmtFifoMT);

-	dwRetErrorCode=ListMTItemGetFirst(pcpmtFifoMT,ppffmtiFifoItem,plpData);

-	ListMTUnLock(pcpmtFifoMT);

-

-return(dwRetErrorCode);

+	mt_lock l(pcpmtFifoMT);

+	return ListMTItemGetFirst(pcpmtFifoMT,ppffmtiFifoItem,plpData);

 }

 

 

 __inline DWORD FifoMTItemGetLast(PCFIFO_MT pcpmtFifoMT,PFIFO_MT_ITEM *ppffmtiFifoItem,LPVOID *plpData)

 {

-	DWORD dwRetErrorCode;

-

-	ListMTLock(pcpmtFifoMT);

-	dwRetErrorCode=ListMTItemGetLast(pcpmtFifoMT,ppffmtiFifoItem,plpData);

-	ListMTUnLock(pcpmtFifoMT);

-

-return(dwRetErrorCode);

+	mt_lock l(pcpmtFifoMT);

+	return ListMTItemGetLast(pcpmtFifoMT,ppffmtiFifoItem,plpData);

 }