Changeset 7ed9bc6

Timestamp:

Jun 25, 2011, 3:26:15 AM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

eb897c6

Parents:

d191f45

git-author:

David Benjamin <davidben@mit.edu> (03/11/11 11:15:00)

git-committer:

David Benjamin <davidben@mit.edu> (06/25/11 03:26:15)

Message:

Replace owl_zbuddlist's owl_list with GPtrArray

Files:

• owl.h (modified) (1 diff)
• zbuddylist.c (modified) (3 diffs)

owl.h

@@ -512 +512 @@
 
 typedef struct _owl_zbuddylist {
-  owl_list zusers;
+  GPtrArray *zusers;
 } owl_zbuddylist;
 

zbuddylist.c

@@ -3 +3 @@
 void owl_zbuddylist_create(owl_zbuddylist *zb)
 {
-  owl_list_create(&(zb->zusers));
+  zb->zusers = g_ptr_array_new();
 }
 
 int owl_zbuddylist_adduser(owl_zbuddylist *zb, const char *name)
 {
-  int i, j;
+  int i;
   char *user;
 
   user=long_zuser(name);
 
-  j=owl_list_get_size(&(zb->zusers));
-  for (i=0; i<j; i++) {
-    if (!strcasecmp(user, owl_list_get_element(&(zb->zusers), i))) {
+  for (i = 0; i < zb->zusers->len; i++) {
+    if (!strcasecmp(user, zb->zusers->pdata[i])) {
       g_free(user);
       return(-1);
     }
   }
-  owl_list_append_element(&(zb->zusers), user);
+  g_ptr_array_add(zb->zusers, user);
   return(0);
 }
@@ -26 +25 @@
 int owl_zbuddylist_deluser(owl_zbuddylist *zb, const char *name)
 {
-  int i, j;
-  char *user, *ptr;
+  int i;
+  char *user;
 
   user=long_zuser(name);
 
-  j=owl_list_get_size(&(zb->zusers));
-  for (i=0; i<j; i++) {
-    ptr=owl_list_get_element(&(zb->zusers), i);
-    if (!strcasecmp(user, ptr)) {
-      owl_list_remove_element(&(zb->zusers), i);
-      g_free(ptr);
+  for (i = 0; i < zb->zusers->len; i++) {
+    if (!strcasecmp(user, zb->zusers->pdata[i])) {
+      g_free(g_ptr_array_remove_index(zb->zusers, i));
       g_free(user);
       return(0);
@@ -47 +43 @@
 int owl_zbuddylist_contains_user(const owl_zbuddylist *zb, const char *name)
 {
-  int i, j;
+  int i;
   char *user;
 
   user=long_zuser(name);
 
-  j=owl_list_get_size(&(zb->zusers));
-  for (i=0; i<j; i++) {
-    if (!strcasecmp(user, owl_list_get_element(&(zb->zusers), i))) {
+  for (i = 0; i < zb->zusers->len; i++) {
+    if (!strcasecmp(user, zb->zusers->pdata[i])) {
       g_free(user);
       return(1);