more warning fixes

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

8 files changed, 13 insertions, 16 deletions

diff --git a/plugins/Clist_modern/src/hdr/modern_commonheaders.h b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
index ec2016e1c2..284b5c2d15 100644
--- a/plugins/Clist_modern/src/hdr/modern_commonheaders.h
+++ b/plugins/Clist_modern/src/hdr/modern_commonheaders.h
@@ -351,7 +351,7 @@ public:
 

 	~HashStringKeyNoCase()

 	{

-		if (_strKey) free (_strKey);

+		free(_strKey);

 		_strKey = NULL;

 		_dwKey=0;

 	}

diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp
index 093f0852e6..02690cff9d 100644
--- a/plugins/Clist_modern/src/modern_aniavatars.cpp
+++ b/plugins/Clist_modern/src/modern_aniavatars.cpp
@@ -250,7 +250,7 @@ int AniAva_UnloadModule()
 		for (i=0; i < s_AniAvatarList.getCount(); i++) {

 			ANIAVA_INFO *aai = s_AniAvatarList[i];

 			mir_free(aai->tcsFilename);

-			if (aai->pFrameDelays) free(aai->pFrameDelays);

+			free(aai->pFrameDelays);

 			mir_free(aai);

 		}

 		s_AniAvatarList.destroy();

@@ -529,7 +529,7 @@ static void _AniAva_RealRemoveAvatar(DWORD UniqueID)
 				_AniAva_PausePainting();

 

 				mir_free(aai->tcsFilename);

-				if (aai->pFrameDelays) free(aai->pFrameDelays);

+				free(aai->pFrameDelays);

 				_AniAva_ReduceAvatarImages(aai->nStripTop,aai->FrameSize.cx*aai->nFrameCount, FALSE);

 				for (int k = 0; k < s_AniAvatarList.getCount(); k++)

 					if (k != j)	{

diff --git a/plugins/Clist_modern/src/modern_clcpaint.cpp b/plugins/Clist_modern/src/modern_clcpaint.cpp
index 18b29d54df..6a36c8978a 100644
--- a/plugins/Clist_modern/src/modern_clcpaint.cpp
+++ b/plugins/Clist_modern/src/modern_clcpaint.cpp
@@ -2025,8 +2025,7 @@ void CLCPaint::_DrawLines( HWND hWnd, ClcData *dat, HDC hdc, int paintMode, RECT
 				_PaintRowItems( hWnd, pc.hdcMem, dat, Drawing, row_rc, free_row_rc, left_pos, right_pos, selected, hottrack, rcPaint );

 				if ( mpRequest && !dat->force_in_dialog )

 				{

-					if ( mpRequest->pl_Params[1].szValue )

-						free( mpRequest->pl_Params[1].szValue );

+					free(mpRequest->pl_Params[1].szValue);

 					mpRequest->pl_Params[1].szValue = strdupn("Ovl", 3 );

 					mpRequest->pl_Params[1].dwValueHash = mod_CalcHash("Ovl");

 					{

diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp
index a4b940bbbe..354a9ce843 100644
--- a/plugins/Clist_modern/src/modern_clistmenus.cpp
+++ b/plugins/Clist_modern/src/modern_clistmenus.cpp
@@ -188,8 +188,7 @@ int LoadFavoriteContactMenu()
 

 int UnloadFavoriteContactMenu()

 {

-	if (hFavoriteContactMenuItems)

-		free (hFavoriteContactMenuItems);

+	free(hFavoriteContactMenuItems);

 	hFavoriteContactMenuItems = NULL;

 

 	if (hFavoriteContactMenu)

diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp
index c8ad998e2c..fd2e204e89 100644
--- a/plugins/Clist_modern/src/modern_clistmod.cpp
+++ b/plugins/Clist_modern/src/modern_clistmod.cpp
@@ -378,7 +378,7 @@ int cliShowHide(WPARAM wParam,LPARAM lParam)
 		return 0;

 	}

 

-	if ((bShow == TRUE || lParam == 1)) {

+	if (bShow || lParam == 1) {

 		Sync( CLUIFrames_ActivateSubContainers, TRUE );

 		CLUI_ShowWindowMod(pcli->hwndContactList, SW_RESTORE);

 

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index da0679328b..0081ff777d 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -2110,7 +2110,7 @@ LRESULT CLUI::OnStatusBarUpdateTimer(UINT msg, WPARAM wParam, LPARAM lParam)
 

 	for (int i=0; i < 64; i++) {

 		pt = &CycleStartTick[i];

-		if (pt->szProto != NULL && pt->bTimerCreated == 1) {

+		if (pt->szProto != NULL && pt->bTimerCreated) {

 			if (pt->bGlobal)

 				status = g_bMultiConnectionMode?ID_STATUS_CONNECTING:0;

 			else

@@ -2434,7 +2434,7 @@ LRESULT CLUI::OnListSizeChangeNotify( NMCLISTCONTROL * pnmc )
 	static RECT rcWindow,rcTree,rcTree2,rcWorkArea,rcOld;

 	int maxHeight, minHeight,newHeight;

 	int winstyle;

-	if (mutex_bDisableAutoUpdate == 1)

+	if (mutex_bDisableAutoUpdate)

 		return FALSE;

 	if (mutex_bDuringSizing)

 		rcWindow = rcSizingRect;

diff --git a/plugins/Clist_modern/src/modern_cluiframes.cpp b/plugins/Clist_modern/src/modern_cluiframes.cpp
index 24ac15f196..cf71f9ad53 100644
--- a/plugins/Clist_modern/src/modern_cluiframes.cpp
+++ b/plugins/Clist_modern/src/modern_cluiframes.cpp
@@ -1479,8 +1479,7 @@ static int _us_DoMoveFrame(WPARAM wParam,LPARAM lParam)
 			}

 		}

 

-		if (sd != NULL)

-			free(sd);

+		free(sd);

 		CLUIFramesStoreFrameSettings(pos);

 		CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0);

 	}

@@ -3224,7 +3223,7 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam
 				//return 0;

 			};

 

-			if (wParam&MK_LBUTTON) {

+			if (wParam&MK_RBUTTON) {

 				int newh = -1,prevold;

 

 				if (GetCapture() != hwnd){break;};

@@ -4029,7 +4028,7 @@ int UnLoadCLUIFramesModule(void)
 		mir_free_and_nil(g_pfwFrames[i].TitleBar.sztooltip);

 

 	}

-	if (g_pfwFrames) free(g_pfwFrames);

+	free(g_pfwFrames);

 	g_pfwFrames = NULL;

 	g_nFramesCount = 0;

 	UnregisterClass(CLUIFrameTitleBarClassName,g_hInst);

diff --git a/plugins/Clist_modern/src/modern_skinselector.cpp b/plugins/Clist_modern/src/modern_skinselector.cpp
index eb1221ccf1..759b1a5193 100644
--- a/plugins/Clist_modern/src/modern_skinselector.cpp
+++ b/plugins/Clist_modern/src/modern_skinselector.cpp
@@ -56,8 +56,8 @@ int SkinSelector_DeleteMask(MODERNMASK *mm)
 	if ( !mm->pl_Params) return 0;

 	for (i=0;i < (int)mm->dwParamCnt;i++)

 	{

-		if (mm->pl_Params[i].szName) free(mm->pl_Params[i].szName);

-		if (mm->pl_Params[i].szValue) free(mm->pl_Params[i].szValue);

+		free(mm->pl_Params[i].szName);

+		free(mm->pl_Params[i].szValue);

 	}

 	free(mm->pl_Params);

 	return 1;