more warning fixes

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

2 files changed, 9 insertions, 13 deletions

diff --git a/plugins/CmdLine/src/mimcmd_handlers.cpp b/plugins/CmdLine/src/mimcmd_handlers.cpp
index b0cf21c1ca..b06c70bf4e 100644
--- a/plugins/CmdLine/src/mimcmd_handlers.cpp
+++ b/plugins/CmdLine/src/mimcmd_handlers.cpp
@@ -1045,10 +1045,10 @@ void HandleCallServiceCommand(PCommand command, TArgument *argv, int argc, PRepl
 					reply->code = MIMRES_FAILURE;

 					mir_snprintf(reply->message, reply->cMessage, Translate("Invalid parameter '%s' passed to CallService command."), (wParam) ? argv[4] : argv[3]);

 				}

-				

-				if (wParam) { free(wParam); }

-				if (lParam) { free(lParam); }

-				

+

+				free(wParam);

+				free(lParam);

+

 			}

 			else{

 				reply->code = MIMRES_FAILURE;

@@ -1330,11 +1330,8 @@ void HandleDatabaseCommand(PCommand command, TArgument *argv, int argc, PReply r
 						reply->code = MIMRES_SUCCESS;

 						mir_snprintf(reply->message, reply->cMessage, Translate("Wrote '%s:%s' to database entry '%s/%s'."), wrote, argv[5] + 1, module, key);

 					}

-					

-					if (value)

-					{

-						free(value);

-					}

+

+					free(value);

 				}

 				else{

 					HandleWrongParametersCount(command, reply);

@@ -1613,7 +1610,7 @@ void HandleProtocolProxyCommand(PCommand command, TArgument *argv, int argc, PRe
 	

 	if (ok)

 	{

-		if (strlen(reply->message) > 0)

+		if (reply->message[0] != 0)

 		{

 			strncat(reply->message, "\n", reply->cMessage);

 			strncat(reply->message, buffer, reply->cMessage);

@@ -1882,7 +1879,7 @@ void AddHistoryEvent(DBEVENTINFO *dbEvent, char *contact, PReply reply)
 	mir_snprintf(buffer, sizeof(buffer), "[%s] %15s: %s", timestamp, sender, message);

 	

 	

-	if (strlen(reply->message) > 0)

+	if (reply->message[0] != 0)

 	{

 		strncat(reply->message, "\n", reply->cMessage);

 		strncat(reply->message, buffer, reply->cMessage);

diff --git a/plugins/CmdLine/src/utils.cpp b/plugins/CmdLine/src/utils.cpp
index 6f0dba3271..f7f08be649 100644
--- a/plugins/CmdLine/src/utils.cpp
+++ b/plugins/CmdLine/src/utils.cpp
@@ -98,7 +98,6 @@ int MyPUShowMessage(char *lpzText, BYTE kind)
 char *BinToHex(int size, PBYTE data)

 {

 	char *szresult = NULL;

-	char buffer[32] = {0}; //should be more than enough

 	int maxSize = size * 2 + HEX_SIZE + 1;

 	szresult = (char *) new char[ maxSize ];

 	mir_snprintf(szresult, maxSize, "%0*X", HEX_SIZE, size);

@@ -344,7 +343,7 @@ HANDLE GetContactFromID(TCHAR *szID, char *szProto)
 		if ((szHandle) && ((_tcsicmp(szHandle, szID) == 0) || (_tcsicmp(dispName, szID) == 0)) && ((szProto == NULL) || (_stricmp(szProto, cProtocol) == 0)))

 			found = 1;

 

-		if (szHandle) free(szHandle);

+		free(szHandle);

 

 		if (found) return hContact;

 	}