# HG changeset patch # User Mark Doliner # Date 1323680302 0 # Node ID 3a4fc19e168efd0af71d1a915b19e476cf82c822 # Parent d0dba386ca0ad1586bc1f15c775a8c36b64c02da Cleanup the formatting of this code a little. No functionality change. diff -r d0dba386ca0a -r 3a4fc19e168e libpurple/protocols/oscar/family_feedbag.c --- a/libpurple/protocols/oscar/family_feedbag.c Mon Dec 12 08:53:24 2011 +0000 +++ b/libpurple/protocols/oscar/family_feedbag.c Mon Dec 12 08:58:22 2011 +0000 @@ -771,16 +771,23 @@ 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;