Changeset ecffae6

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:

e4524da

Parents:

e6d7e4e

git-author:

David Benjamin <davidben@mit.edu> (03/11/11 16:21:42)

git-committer:

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

Message:

Make owl_zephyr_get_anyone_list return a GPtrArray

Files:

• functions.c (modified) (7 diffs)
• zephyr.c (modified) (3 diffs)

functions.c

@@ -2994 +2994 @@
 #ifdef HAVE_LIBZEPHYR
   int x;
-  owl_list anyone;
+  GPtrArray *anyone;
   const char *user;
   char *tmp;
@@ -3029 +3029 @@
     } else {
       owl_fmtext_append_bold(&fm, "Zephyr users logged in:\n");
-      owl_list_create(&anyone);
-      ret=owl_zephyr_get_anyone_list(&anyone, filename);
-      if (ret) {
+      anyone = owl_zephyr_get_anyone_list(filename);
+      if (anyone == NULL) {
         if (errno == ENOENT) {
           owl_fmtext_append_normal(&fm, " You have not added any zephyr buddies.  Use the\n");
@@ -3041 +3040 @@
         }
       } else {
-        j=owl_list_get_size(&anyone);
-        for (i=0; i<j; i++) {
-          user=owl_list_get_element(&anyone, i);
+        for (i = 0; i < anyone->len; i++) {
+          user = anyone->pdata[i];
           ret=ZLocateUser(zstr(user), &numlocs, ZAUTH);
 
@@ -3075 +3073 @@
         }
       }
-      owl_list_cleanup(&anyone, g_free);
+      g_ptr_array_foreach(anyone, (GFunc)g_free, NULL);
+      g_ptr_array_free(anyone, true);
     }
   }
@@ -3387 +3386 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  int i, j;
-  owl_list anyone;
+  int i;
+  GPtrArray *anyone;
   GList **zaldlist;
   GList *zaldptr;
@@ -3408 +3407 @@
   *zaldlist = NULL;
 
-  owl_list_create(&anyone);
-  owl_zephyr_get_anyone_list(&anyone, NULL);
-  j = owl_list_get_size(&anyone);
-  for (i = 0; i < j; i++) {
-    user = owl_list_get_element(&anyone, i);
+  anyone = owl_zephyr_get_anyone_list(NULL);
+  for (i = 0; i < anyone->len; i++) {
+    user = anyone->pdata[i];
     zald = g_new(ZAsyncLocateData_t, 1);
     if (ZRequestLocations(zstr(user), zald, UNACKED, ZAUTH) == ZERR_NONE) {
@@ -3421 +3418 @@
   }
 
-  owl_list_cleanup(&anyone, g_free);
+  g_ptr_array_foreach(anyone, (GFunc)g_free, NULL);
+  g_ptr_array_free(anyone, true);
 #endif
 }

zephyr.c

@@ -1324 +1324 @@
 }
 
-/* read the list of users in 'filename' as a .anyone file, and put the
- * names of the zephyr users in the list 'in'.  If 'filename' is NULL,
- * use the default .anyone file in the users home directory.  Returns
- * -1 on failure, 0 on success.
+/* Read the list of users in 'filename' as a .anyone file, and return as a
+ * GPtrArray of strings.  If 'filename' is NULL, use the default .anyone file
+ * in the users home directory.  Returns NULL on failure.
  */
-int owl_zephyr_get_anyone_list(owl_list *in, const char *filename)
+GPtrArray *owl_zephyr_get_anyone_list(const char *filename)
 {
 #ifdef HAVE_LIBZEPHYR
   char *ourfile, *tmp, *s = NULL;
   FILE *f;
+  GPtrArray *list;
 
   ourfile = owl_zephyr_dotfile(".anyone", filename);
@@ -1341 +1341 @@
     owl_function_error("Error opening file %s: %s", ourfile, strerror(errno) ? strerror(errno) : "");
     g_free(ourfile);
-    return -1;
+    return NULL;
   }
   g_free(ourfile);
 
+  list = g_ptr_array_new();
   while (owl_getline_chomp(&s, f)) {
     /* ignore comments, blank lines etc. */
@@ -1360 +1361 @@
       tmp[0] = '\0';
 
-    owl_list_append_element(in, long_zuser(s));
+    g_ptr_array_add(list, long_zuser(s));
   }
   g_free(s);
   fclose(f);
-  return 0;
-#else
-  return -1;
+  return list;
+#else
+  return NULL;
 #endif
 }