Changeset c4d1f12

Timestamp:

Mar 1, 2010, 8:33:50 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

release-1.5

Children:

050d25e

Parents:

5e8bec6

git-author:

Anders Kaseorg <andersk@mit.edu> (02/28/10 02:39:52)

git-committer:

Nelson Elhage <nelhage@mit.edu> (03/01/10 20:33:50)

Message:

Add owl_buddy_delete to fix leaks.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-by: Alejandro R. Sedeño <asedeno@mit.edu>

Files:

• buddy.c (modified) (1 diff)
• buddylist.c (modified) (3 diffs)

buddy.c

@@ -68 +68 @@
   if (b->name) owl_free(b->name);
 }
+
+void owl_buddy_delete(owl_buddy *b)
+{
+  owl_buddy_free(b);
+  owl_free(b);
+}

buddylist.c

@@ -29 +29 @@
     if (!strcasecmp(name, owl_buddy_get_name(b)) && owl_buddy_is_proto_aim(b)) {
       owl_list_remove_element(&(bl->buddies), i);
-      owl_buddy_free(b);
+      owl_buddy_delete(b);
       return(0);
     }
@@ -131 +131 @@
 void owl_buddylist_clear(owl_buddylist *bl)
 {
-  owl_list_free_all(&(bl->buddies), (void(*)(void*))owl_buddy_free);
+  owl_list_free_all(&(bl->buddies), (void (*)(void *))owl_buddy_delete);
   owl_list_create(&(bl->buddies));
 }
@@ -137 +137 @@
 void owl_buddylist_free(owl_buddylist *bl)
 {
-  owl_list_free_all(&(bl->buddies), (void(*)(void*))owl_buddy_free);
+  owl_list_free_all(&(bl->buddies), (void (*)(void *))owl_buddy_delete);
 }