Changes in zbuddylist.c [7ed9bc6:ddbbcffa]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
zbuddylist.c
r7ed9bc6 rddbbcffa 3 3 void owl_zbuddylist_create(owl_zbuddylist *zb) 4 4 { 5 zb->zusers = g_ptr_array_new();5 owl_list_create(&(zb->zusers)); 6 6 } 7 7 8 8 int owl_zbuddylist_adduser(owl_zbuddylist *zb, const char *name) 9 9 { 10 int i ;10 int i, j; 11 11 char *user; 12 12 13 13 user=long_zuser(name); 14 14 15 for (i = 0; i < zb->zusers->len; i++) { 16 if (!strcasecmp(user, zb->zusers->pdata[i])) { 15 j=owl_list_get_size(&(zb->zusers)); 16 for (i=0; i<j; i++) { 17 if (!strcasecmp(user, owl_list_get_element(&(zb->zusers), i))) { 17 18 g_free(user); 18 19 return(-1); 19 20 } 20 21 } 21 g_ptr_array_add(zb->zusers, user);22 owl_list_append_element(&(zb->zusers), user); 22 23 return(0); 23 24 } … … 25 26 int owl_zbuddylist_deluser(owl_zbuddylist *zb, const char *name) 26 27 { 27 int i ;28 char *user ;28 int i, j; 29 char *user, *ptr; 29 30 30 31 user=long_zuser(name); 31 32 32 for (i = 0; i < zb->zusers->len; i++) { 33 if (!strcasecmp(user, zb->zusers->pdata[i])) { 34 g_free(g_ptr_array_remove_index(zb->zusers, i)); 33 j=owl_list_get_size(&(zb->zusers)); 34 for (i=0; i<j; i++) { 35 ptr=owl_list_get_element(&(zb->zusers), i); 36 if (!strcasecmp(user, ptr)) { 37 owl_list_remove_element(&(zb->zusers), i); 38 g_free(ptr); 35 39 g_free(user); 36 40 return(0); … … 43 47 int owl_zbuddylist_contains_user(const owl_zbuddylist *zb, const char *name) 44 48 { 45 int i ;49 int i, j; 46 50 char *user; 47 51 48 52 user=long_zuser(name); 49 53 50 for (i = 0; i < zb->zusers->len; i++) { 51 if (!strcasecmp(user, zb->zusers->pdata[i])) { 54 j=owl_list_get_size(&(zb->zusers)); 55 for (i=0; i<j; i++) { 56 if (!strcasecmp(user, owl_list_get_element(&(zb->zusers), i))) { 52 57 g_free(user); 53 58 return(1);
Note: See TracChangeset
for help on using the changeset viewer.