# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1130014098 0
# Node ID 109ee3bfeac527c230565d028669c41de8a7e74b
# Parent  11e95968c9fffbb613d72af323332b5b4213e4a9
[gaim-migrate @ 14010]
SF Patch #1333770 from corfe83

"Many times in gaim we use the function
 g_slist_remove(list,node->data) to remove an element
 from a GSList. If we already have the pointer to the
 node we want to delete, it is faster to send it the
 pointer to the node to delete rather than the data of
 the node (we can do this by calling
 g_slist_delete_link(list,node)). This change was made
 while looking at glib's documentation and the code in
 glib's gslist.c.

 This is because as the remove/delete function traverses
 each node in the list, it doesn't need to spend an
 extra memory access to retrieve the data for each
 element in the node it is traversing and then compare,
 it can simply compare the pointer. In my tests outside
 of gaim, this makes a big difference if the node you
 are deleting is at a high index in the list. However,
 even if you're deleting the first node, it about breaks
 even.

 So, I've found each case in gaim where we are calling
 g_slist_remove, and we already have the pointer to the
 appropriate node to delete (this is often the case when
 we're doing a for or while loop on a GSList). I've then
 replaced it with the appropriate call to
 g_slist_delete_link. I, however, didn't do this in
 situations where we are explicitly removing the first
 element in the list, because in those situations it is
 an unnecessary change.

 There should be no difference in behavior, but just in
 case I've tried running it with valgrind, which reports
 the same number of memory leaks after my patch as
 before my patch. Of course, I can't guarantee that my
 normal behavior on gaim is hitting all the functions
 I've changed, but in general testing it Works For Me (tm)."

As with the last patch, this one may not have a practical performance impact (or maybe it does, I have no idea), but it's not worse for any case. Given two ways of doing things where one is always at least as fast and may be faster under some cases, I like to prefer that faster way. This doesn't make the code any uglier, so I'm applying.

committer: Tailor Script <tailor@pidgin.im>

diff -r 11e95968c9ff -r 109ee3bfeac5 src/gtkblist.c
--- a/src/gtkblist.c	Sat Oct 22 20:09:24 2005 +0000
+++ b/src/gtkblist.c	Sat Oct 22 20:48:18 2005 +0000
@@ -4628,7 +4628,7 @@
 	while(l) {
 		struct gaim_gtk_blist_sort_method *method = l->data;
 		if(!strcmp(method->id, id)) {
-			gaim_gtk_blist_sort_methods = g_slist_remove(gaim_gtk_blist_sort_methods, method);
+			gaim_gtk_blist_sort_methods = g_slist_delete_link(gaim_gtk_blist_sort_methods, l);
 			g_free(method->id);
 			g_free(method->name);
 			g_free(method);
diff -r 11e95968c9ff -r 109ee3bfeac5 src/prefs.c
--- a/src/prefs.c	Sat Oct 22 20:09:24 2005 +0000
+++ b/src/prefs.c	Sat Oct 22 20:48:18 2005 +0000
@@ -991,7 +991,7 @@
 	for(cbs = pref->callbacks; cbs; cbs = cbs->next) {
 		struct pref_cb *cb = cbs->data;
 		if(cb->id == callback_id) {
-			pref->callbacks = g_slist_remove(pref->callbacks, cb);
+			pref->callbacks = g_slist_delete_link(pref->callbacks, cbs);
 			g_free(cb);
 			return TRUE;
 		}
@@ -1024,7 +1024,7 @@
 	while (cbs != NULL) {
 		struct pref_cb *cb = cbs->data;
 		if(cb->handle == handle) {
-			pref->callbacks = g_slist_remove(pref->callbacks, cb);
+			pref->callbacks = g_slist_delete_link(pref->callbacks, cbs);
 			g_free(cb);
 			cbs = pref->callbacks;
 		} else
diff -r 11e95968c9ff -r 109ee3bfeac5 src/privacy.c
--- a/src/privacy.c	Sat Oct 22 20:09:24 2005 +0000
+++ b/src/privacy.c	Sat Oct 22 20:48:18 2005 +0000
@@ -85,8 +85,8 @@
 	if (l == NULL)
 		return FALSE;
 
-	account->permit = g_slist_remove(account->permit, l->data);
 	g_free(l->data);
+	account->permit = g_slist_delete_link(account->permit, l);
 
 	if (!local_only && gaim_account_is_connected(account))
 		serv_rem_permit(gaim_account_get_connection(account), who);
@@ -156,8 +156,8 @@
 	if (l == NULL)
 		return FALSE;
 
-	account->deny = g_slist_remove(account->deny, l->data);
 	g_free(l->data);
+	account->deny = g_slist_delete_link(account->deny, l);
 
 	if (!local_only && gaim_account_is_connected(account))
 		serv_rem_deny(gaim_account_get_connection(account), who);