[Gaim-commits] SF.net SVN: gaim: [16096] trunk/src/protocols/msn

[<rl...@us...>]

Revision: 16096
Author:   rlaager
Date:     2006-04-25 10:38:43 -0700 (Tue, 25 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16096&view=rev

Log Message:
-----------
Part of SF Patch #1437836 from Sadrul

'3. replace a bunch of "if (a) free(a);" with "free(a);"'

My comment in the patch:
"I'm accepting this, even though it doesn't really do much. In the future, however, I would suggest avoiding creating these type of changes unless you're already editing the code directly around them."

Modified Paths:
--------------
    trunk/src/protocols/msn/session.c
    trunk/src/protocols/msn/switchboard.c
    trunk/src/protocols/msn/user.c
Modified: trunk/src/protocols/msn/session.c
===================================================================
--- trunk/src/protocols/msn/session.c	2006-04-25 17:27:17 UTC (rev 16095)
+++ trunk/src/protocols/msn/session.c	2006-04-25 17:38:43 UTC (rev 16096)
@@ -70,18 +70,11 @@
 
 	msn_userlist_destroy(session->userlist);
 
-	if (session->passport_info.kv != NULL)
-		g_free(session->passport_info.kv);
+	g_free(session->passport_info.kv);
+	g_free(session->passport_info.sid);
+	g_free(session->passport_info.mspauth);
+	g_free(session->passport_info.client_ip);
 
-	if (session->passport_info.sid != NULL)
-		g_free(session->passport_info.sid);
-
-	if (session->passport_info.mspauth != NULL)
-		g_free(session->passport_info.mspauth);
-
-	if (session->passport_info.client_ip != NULL)
-		g_free(session->passport_info.client_ip);
-
 	if (session->passport_info.file != NULL)
 	{
 		g_unlink(session->passport_info.file);

Modified: trunk/src/protocols/msn/switchboard.c
===================================================================
--- trunk/src/protocols/msn/switchboard.c	2006-04-25 17:27:17 UTC (rev 16095)
+++ trunk/src/protocols/msn/switchboard.c	2006-04-25 17:38:43 UTC (rev 16096)
@@ -104,15 +104,10 @@
 	while ((l = swboard->ack_list) != NULL)
 		msg_error_helper(swboard->cmdproc, l->data, MSN_MSG_ERROR_SB);
 
-	if (swboard->im_user != NULL)
-		g_free(swboard->im_user);
+	g_free(swboard->im_user);
+	g_free(swboard->auth_key);
+	g_free(swboard->session_id);
 
-	if (swboard->auth_key != NULL)
-		g_free(swboard->auth_key);
-
-	if (swboard->session_id != NULL)
-		g_free(swboard->session_id);
-
 	for (l = swboard->users; l != NULL; l = l->next)
 		g_free(l->data);
 

Modified: trunk/src/protocols/msn/user.c
===================================================================
--- trunk/src/protocols/msn/user.c	2006-04-25 17:27:17 UTC (rev 16095)
+++ trunk/src/protocols/msn/user.c	2006-04-25 17:38:43 UTC (rev 16096)
@@ -64,24 +64,13 @@
 	if (user->msnobj != NULL)
 		msn_object_destroy(user->msnobj);
 
-	if (user->passport != NULL)
-		g_free(user->passport);
+	g_free(user->passport);
+	g_free(user->friendly_name);
+	g_free(user->store_name);
+	g_free(user->phone.home);
+	g_free(user->phone.work);
+	g_free(user->phone.mobile);
 
-	if (user->friendly_name != NULL)
-		g_free(user->friendly_name);
-
-	if (user->store_name != NULL)
-		g_free(user->store_name);
-
-	if (user->phone.home != NULL)
-		g_free(user->phone.home);
-
-	if (user->phone.work != NULL)
-		g_free(user->phone.work);
-
-	if (user->phone.mobile != NULL)
-		g_free(user->phone.mobile);
-
 	g_free(user);
 }
 
@@ -134,9 +123,7 @@
 {
 	g_return_if_fail(user != NULL);
 
-	if (user->passport != NULL)
-		g_free(user->passport);
-
+	g_free(user->passport);
 	user->passport = g_strdup(passport);
 }
 
@@ -145,9 +132,7 @@
 {
 	g_return_if_fail(user != NULL);
 
-	if (user->friendly_name != NULL)
-		g_free(user->friendly_name);
-
+	g_free(user->friendly_name);
 	user->friendly_name = g_strdup(name);
 }
 
@@ -156,9 +141,7 @@
 {
 	g_return_if_fail(user != NULL);
 
-	if (user->store_name != NULL)
-		g_free(user->store_name);
-
+	g_free(user->store_name);
 	user->store_name = g_strdup(name);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.