From 152da8847e828b132c5753ae5f58e8272556d4ef Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 17 Mar 2013 11:15:15 +0000
Subject: some another leaks fixed

git-svn-id: http://svn.miranda-ng.org/main/trunk@4070 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/mir_core/memory.cpp         | 60 ++++++++++++++++++++---------------------
 src/modules/clist/clisttray.cpp | 10 +++----
 2 files changed, 34 insertions(+), 36 deletions(-)

(limited to 'src')

diff --git a/src/mir_core/memory.cpp b/src/mir_core/memory.cpp
index b8bf481aad..2f7467ccc4 100644
--- a/src/mir_core/memory.cpp
+++ b/src/mir_core/memory.cpp
@@ -144,52 +144,52 @@ MIR_C_CORE_DLL(void) mir_free(void* ptr)
 
 MIR_CORE_DLL(char*) mir_strdup(const char *str)
 {
-	if (str != NULL) {
-		char *p = (char*)mir_alloc(strlen(str)+1);
-		if (p)
-			strcpy(p, str);
-		return p;
-	}
-	return NULL;
+	if (str == NULL)
+		return NULL;
+
+	char *p = (char*)mir_alloc(strlen(str)+1);
+	if (p)
+		strcpy(p, str);
+	return p;
 }
 
 MIR_CORE_DLL(WCHAR*) mir_wstrdup(const WCHAR *str)
 {
-	if (str != NULL) {
-		WCHAR *p = (WCHAR*)mir_alloc(sizeof(WCHAR)*(wcslen(str)+1));
-		if (p)
-			wcscpy(p, str);
-		return p;
-	}
-	return NULL;
+	if (str == NULL)
+		return NULL;
+
+	WCHAR *p = (WCHAR*)mir_alloc(sizeof(WCHAR)*(wcslen(str)+1));
+	if (p)
+		wcscpy(p, str);
+	return p;
 }
 
 /******************************************************************************/
 
 MIR_CORE_DLL(char*) mir_strndup(const char *str, size_t len)
 {
-	if (str != NULL && len != 0) {
-		char *p = (char*)mir_alloc(len+1);
-		if (p) {
-			memcpy(p, str, len);
-			p[ len ] = 0;
-		}
-		return p;
+	if (str == NULL || len == 0)
+		return NULL;
+	
+	char *p = (char*)mir_alloc(len+1);
+	if (p) {
+		memcpy(p, str, len);
+		p[ len ] = 0;
 	}
-	return NULL;
+	return p;
 }
 
 MIR_CORE_DLL(WCHAR*) mir_wstrndup(const WCHAR *str, size_t len)
 {
-	if (str != NULL && len != 0) {
-		WCHAR *p = (WCHAR*)mir_alloc(sizeof(WCHAR)*(len+1));
-		if (p) {
-			memcpy(p, str, sizeof(WCHAR)*len);
-			p[ len ] = 0;
-		}
-		return p;
+	if (str == NULL || len == 0)
+		return NULL;
+	
+	WCHAR *p = (WCHAR*)mir_alloc(sizeof(WCHAR)*(len+1));
+	if (p) {
+		memcpy(p, str, sizeof(WCHAR)*len);
+		p[ len ] = 0;
 	}
-	return NULL;
+	return p;
 }
 
 /******************************************************************************/
diff --git a/src/modules/clist/clisttray.cpp b/src/modules/clist/clisttray.cpp
index 071e667e2e..6373b1a193 100644
--- a/src/modules/clist/clisttray.cpp
+++ b/src/modules/clist/clisttray.cpp
@@ -250,10 +250,10 @@ void fnTrayIconRemove(HWND hwnd, const char *szProto)
 
 int fnTrayIconInit(HWND hwnd)
 {
-	int netProtoCount = 0;
 	initcheck 0;
 	lock;
 
+	int netProtoCount = 0;
 	int averageMode = GetAverageMode(&netProtoCount);
 	mToolTipTrayTips = ServiceExists("mToolTip/ShowTip") != 0;
 
@@ -310,16 +310,15 @@ int fnTrayIconInit(HWND hwnd)
 
 int fnTrayIconDestroy(HWND hwnd)
 {
-	NOTIFYICONDATA nid = { SIZEOFNID };
-	int i;
 	initcheck 0;
 	lock;
 
 	if (cli.trayIconCount == 1)
 		SetTaskBarIcon(NULL, NULL);
 
+	NOTIFYICONDATA nid = { SIZEOFNID };
 	nid.hWnd = hwnd;
-	for (i=0; i < cli.trayIconCount; i++) {
+	for (int i=0; i < cli.trayIconCount; i++) {
 		if (cli.trayIcon[i].id == 0)
 			continue;
 		nid.uID = cli.trayIcon[i].id;
@@ -937,16 +936,15 @@ void fnUninitTray(void)
 	fTrayInited = FALSE;
 	DeleteCriticalSection(&trayLockCS);
 }
+
 void fnLockTray(void)
 {
-//	return;				//stub to be removed
 	initcheck;
 	EnterCriticalSection(&trayLockCS);
 }
 
 void fnUnlockTray(void)
 {
-//	return;				//stub to be removed
 	initcheck;
 #ifdef _DEBUG
 	if (trayLockCS.RecursionCount == 0) DebugBreak();	   //try to unlock already
-- 
cgit v1.2.3