pidgin: eb6023a3: Cleanup the formatting of this code a li...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: eb6023a30168a26f129e0626d18aa50710475d1b
Parent:   90ac38291e09215e691c3b2716688783ce0c50b3
Author:   markdoliner at pidgin.im
Date:     12/12/11 03:58:22
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/eb6023a30168a26f129e0626d18aa50710475d1b

Changelog: 

Cleanup the formatting of this code a little.  No functionality change.

Changes against parent 90ac38291e09215e691c3b2716688783ce0c50b3

  patched  libpurple/protocols/oscar/family_feedbag.c

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/family_feedbag.c	3777fc5770118db3a51a7575e226795c18e0e8fe
+++ libpurple/protocols/oscar/family_feedbag.c	9d088e91d255b2df6c9b648de072809886b172d7
@@ -771,16 +771,23 @@ int aim_ssi_cleanlist(OscarData *od)
 		cur = next;
 	}
 
-	/* Make sure there aren't any duplicate buddies in a group, or duplicate permits or denies */
 	cur = od->ssi.local.data;
 	while (cur) {
 		if ((cur->type == AIM_SSI_TYPE_BUDDY) || (cur->type == AIM_SSI_TYPE_PERMIT) || (cur->type == AIM_SSI_TYPE_DENY))
 		{
 			struct aim_ssi_item *cur2, *next2;
+
+			/* Make sure there aren't any duplicate permits or denies, or
+			   duplicate buddies within a group */
 			cur2 = cur->next;
 			while (cur2) {
 				next2 = cur2->next;
-				if ((cur->type == cur2->type) && (cur->gid == cur2->gid) && (cur->name != NULL) && (cur2->name != NULL) && (!oscar_util_name_compare(cur->name, cur2->name))) {
+				if (cur->type == cur2->type
+						&& cur->gid == cur2->gid
+						&& cur->name
+						&& cur2->name
+						&& !oscar_util_name_compare(cur->name, cur2->name))
+				{
 					aim_ssi_itemlist_del(&od->ssi.local, cur2);
 				}
 				cur2 = next2;