Changeset d8e2f07

Timestamp:

Jun 25, 2011, 4:11:19 AM (14 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

95b52d1 (diff), 2560529 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2560529186e398f85a038e8683d29058857eb7b7 into 95b52d17a566adefc77f07749218fe0cb33a66b2

Files:

• Makefile.am (modified) (1 diff)
• aim.c (modified) (3 diffs)
• buddylist.c (modified) (7 diffs)
• cmd.c (modified) (6 diffs)
• commands.c (modified) (7 diffs)
• context.c (modified) (1 diff)
• dict.c (modified) (2 diffs)
• editcontext.c (modified) (1 diff)
• editwin.c (modified) (5 diffs)
• errqueue.c (modified) (2 diffs)
• filter.c (modified) (1 diff)
• fmtext.c (modified) (3 diffs)
• functions.c (modified) (41 diffs)
• global.c (modified) (5 diffs)
• help.c (modified) (2 diffs)
• keybinding.c (modified) (3 diffs)
• keymap.c (modified) (10 diffs)
• keypress.c (modified) (1 diff)
• list.c (deleted)
• logging.c (modified) (4 diffs)
• message.c (modified) (12 diffs)
• messagelist.c (modified) (7 diffs)
• owl.h (modified) (11 diffs)
• perlconfig.c (modified) (13 diffs)
• perlglue.xs (modified) (7 diffs)
• popwin.c (modified) (1 diff)
• tester.c (modified) (2 diffs)
• text.c (modified) (6 diffs)
• util.c (modified) (15 diffs)
• variable.c (modified) (8 diffs)
• view.c (modified) (2 diffs)
• viewwin.c (modified) (3 diffs)
• window.c (modified) (1 diff)
• zbuddylist.c (modified) (3 diffs)
• zcrypt.c (modified) (7 diffs)
• zephyr.c (modified) (14 diffs)
• zwrite.c (modified) (15 diffs)

Makefile.am

@@ -38 +38 @@
            $(GIT_FLAGS)
 
-CODELIST_SRCS=list.c message.c mainwin.c popwin.c zephyr.c messagelist.c \
+CODELIST_SRCS=message.c mainwin.c popwin.c zephyr.c messagelist.c \
      commands.c global.c text.c fmtext.c editwin.c util.c logging.c \
      perlconfig.c keys.c functions.c zwrite.c viewwin.c help.c filter.c \

aim.c

@@ -437 +437 @@
 
 /* caller must free the return */
-G_GNUC_WARN_UNUSED_RESULT char *owl_aim_normalize_screenname(const char *in)
+CALLER_OWN char *owl_aim_normalize_screenname(const char *in)
 {
   char *out;
@@ -1439 +1439 @@
   const char *address, *SNs;
   int num, i;
-  owl_list list;
+  GPtrArray *list;
   
   va_start(ap, fr);
@@ -1447 +1447 @@
   va_end(ap);
 
-  owl_list_create(&list);
+  list = g_ptr_array_new();
   
   owl_function_debugmsg("faimtest_parse_searchreply: E-Mail Search Results for %s: ", address);
   for (i=0; i<num; i++) {
     owl_function_debugmsg("  %s", &SNs[i*(MAXSNLEN+1)]);
-    owl_list_append_element(&list, (void *)&SNs[i*(MAXSNLEN+1)]);
-  }
-  owl_function_aimsearch_results(address, &list);
-  owl_list_cleanup(&list, NULL);
-  return(1);
+    g_ptr_array_add(list, (void *)&SNs[i*(MAXSNLEN+1)]);
+  }
+  owl_function_aimsearch_results(address, list);
+  g_ptr_array_free(list, true);
+  return 1;
 }
 

buddylist.c

@@ -3 +3 @@
 void owl_buddylist_init(owl_buddylist *bl)
 {
-  owl_list_create(&(bl->buddies));
+  bl->buddies = g_ptr_array_new();
 }
 
@@ -14 +14 @@
   
   owl_buddy_create(b, OWL_PROTOCOL_AIM, screenname);
-  owl_list_append_element(&(bl->buddies), b);
+  g_ptr_array_add(bl->buddies, b);
 }
 
@@ -21 +21 @@
 int owl_buddylist_remove_aim_buddy(owl_buddylist *bl, const char *name)
 {
-  int i, j;
+  int i;
   owl_buddy *b;
 
-  j=owl_list_get_size(&(bl->buddies));
-  for (i=0; i<j; i++) {
-    b=owl_list_get_element(&(bl->buddies), i);
+  for (i = 0; i < bl->buddies->len; i++) {
+    b = bl->buddies->pdata[i];
     if (!strcasecmp(name, owl_buddy_get_name(b)) && owl_buddy_is_proto_aim(b)) {
-      owl_list_remove_element(&(bl->buddies), i);
-      owl_buddy_delete(b);
+      owl_buddy_delete(g_ptr_array_remove_index(bl->buddies, i));
       return(0);
     }
@@ -87 +85 @@
 int owl_buddylist_get_size(const owl_buddylist *bl)
 {
-  return(owl_list_get_size(&(bl->buddies)));
+  return bl->buddies->len;
 }
 
@@ -97 +95 @@
   if (index>(owl_buddylist_get_size(bl)-1)) return(NULL);
 
-  return(owl_list_get_element(&(bl->buddies), index));
+  return bl->buddies->pdata[index];
 }
 
@@ -105 +103 @@
 owl_buddy *owl_buddylist_get_aim_buddy(const owl_buddylist *bl, const char *name)
 {
-  int i, j;
+  int i;
   owl_buddy *b;
 
-  j=owl_list_get_size(&(bl->buddies));
-  for (i=0; i<j; i++) {
-    b=owl_list_get_element(&(bl->buddies), i);
+  for (i = 0; i < bl->buddies->len; i++) {
+    b = bl->buddies->pdata[i];
     if (!strcasecmp(name, owl_buddy_get_name(b))) return(b);
   }
@@ -131 +128 @@
 void owl_buddylist_clear(owl_buddylist *bl)
 {
-  owl_list_cleanup(&(bl->buddies), (void (*)(void *))owl_buddy_delete);
-  owl_list_create(&(bl->buddies));
+  g_ptr_array_foreach(bl->buddies, (GFunc)owl_buddy_delete, NULL);
+  g_ptr_array_set_size(bl->buddies, 0);
 }
 
 void owl_buddylist_cleanup(owl_buddylist *bl)
 {
-  owl_list_cleanup(&(bl->buddies), (void (*)(void *))owl_buddy_delete);
+  owl_ptr_array_free(bl->buddies, (GDestroyNotify)owl_buddy_delete);
 }

cmd.c

@@ -28 +28 @@
 }
 
-void owl_cmddict_get_names(const owl_cmddict *d, owl_list *l) {
-  owl_dict_get_keys(d, l);
+GPtrArray *owl_cmddict_get_names(const owl_cmddict *d) {
+  return owl_dict_get_keys(d);
 }
 
@@ -56 +56 @@
 
 /* caller must free the return */
-G_GNUC_WARN_UNUSED_RESULT char *_owl_cmddict_execute(const owl_cmddict *cd, const owl_context *ctx, const char *const *argv, int argc, const char *buff)
+CALLER_OWN char *_owl_cmddict_execute(const owl_cmddict *cd, const owl_context *ctx, const char *const *argv, int argc, const char *buff)
 {
   char *retval = NULL;
@@ -73 +73 @@
 
 /* caller must free the return */
-G_GNUC_WARN_UNUSED_RESULT char *owl_cmddict_execute(const owl_cmddict *cd, const owl_context *ctx, const char *cmdbuff)
+CALLER_OWN char *owl_cmddict_execute(const owl_cmddict *cd, const owl_context *ctx, const char *cmdbuff)
 {
   char **argv;
@@ -97 +97 @@
 
 /* caller must free the return */
-G_GNUC_WARN_UNUSED_RESULT char *owl_cmddict_execute_argv(const owl_cmddict *cd, const owl_context *ctx, const char *const *argv, int argc)
+CALLER_OWN char *owl_cmddict_execute_argv(const owl_cmddict *cd, const owl_context *ctx, const char *const *argv, int argc)
 {
   char *buff;
@@ -154 +154 @@
 
 /* caller must free the result */
-G_GNUC_WARN_UNUSED_RESULT char *owl_cmd_execute(const owl_cmd *cmd, const owl_cmddict *cd, const owl_context *ctx, int argc, const char *const *argv, const char *cmdbuff)
+CALLER_OWN char *owl_cmd_execute(const owl_cmd *cmd, const owl_cmddict *cd, const owl_context *ctx, int argc, const char *const *argv, const char *cmdbuff)
 {
   static int alias_recurse_depth = 0;
@@ -228 +228 @@
 
 /* returns a summary line describing this keymap.  the caller must free. */
-G_GNUC_WARN_UNUSED_RESULT char *owl_cmd_describe(const owl_cmd *cmd)
+CALLER_OWN char *owl_cmd_describe(const owl_cmd *cmd)
 {
   if (!cmd || !cmd->name || !cmd->summary) return NULL;

commands.c

@@ -1373 +1373 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_command_smartfilter(int argc, const char *const *argv, const char *buff)
+CALLER_OWN char *owl_command_smartfilter(int argc, const char *const *argv, const char *buff)
 {
   char *filtname = NULL;
@@ -1413 +1413 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_command_get_shift(int argc, const char *const *argv, const char *buff)
+CALLER_OWN char *owl_command_get_shift(int argc, const char *const *argv, const char *buff)
 {
   if(argc != 1)
@@ -1644 +1644 @@
 
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_command_exec(int argc, const char *const *argv, const char *buff)
+CALLER_OWN char *owl_command_exec(int argc, const char *const *argv, const char *buff)
 {
   return owl_function_exec(argc, argv, buff, OWL_OUTPUT_RETURN);
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_command_pexec(int argc, const char *const *argv, const char *buff)
+CALLER_OWN char *owl_command_pexec(int argc, const char *const *argv, const char *buff)
 {
   return owl_function_exec(argc, argv, buff, OWL_OUTPUT_POPUP);
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_command_aexec(int argc, const char *const *argv, const char *buff)
+CALLER_OWN char *owl_command_aexec(int argc, const char *const *argv, const char *buff)
 {
   return owl_function_exec(argc, argv, buff, OWL_OUTPUT_ADMINMSG);
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_command_perl(int argc, const char *const *argv, const char *buff)
+CALLER_OWN char *owl_command_perl(int argc, const char *const *argv, const char *buff)
 {
   return owl_function_perl(argc, argv, buff, OWL_OUTPUT_RETURN);
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_command_pperl(int argc, const char *const *argv, const char *buff)
+CALLER_OWN char *owl_command_pperl(int argc, const char *const *argv, const char *buff)
 {
   return owl_function_perl(argc, argv, buff, OWL_OUTPUT_POPUP);
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_command_aperl(int argc, const char *const *argv, const char *buff)
+CALLER_OWN char *owl_command_aperl(int argc, const char *const *argv, const char *buff)
 {
   return owl_function_perl(argc, argv, buff, OWL_OUTPUT_ADMINMSG);
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_command_multi(int argc, const char *const *argv, const char *buff)
+CALLER_OWN char *owl_command_multi(int argc, const char *const *argv, const char *buff)
 {
   char *lastrv = NULL, *newbuff;
@@ -2467 +2467 @@
 void owl_command_punt_unpunt(int argc, const char *const * argv, const char *buff, int unpunt)
 {
-  owl_list * fl;
-  owl_filter * f;
+  GPtrArray * fl;
   int i;
 
@@ -2478 +2477 @@
     if(unpunt && (i=atoi(argv[1])) !=0) {
       i--;      /* Accept 1-based indexing */
-      if(i < owl_list_get_size(fl)) {
-        f = owl_list_get_element(fl, i);
-        owl_list_remove_element(fl, i);
-        owl_filter_delete(f);
+      if (i < fl->len) {
+        owl_filter_delete(g_ptr_array_remove_index(fl, i));
         return;
       } else {
@@ -2594 +2591 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_command_getstyle(int argc, const char *const *argv, const char *buff)
+CALLER_OWN char *owl_command_getstyle(int argc, const char *const *argv, const char *buff)
 {
   const char *stylename;
@@ -2637 +2634 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_command_with_history(int argc, const char *const *argv, const char *buff)
+CALLER_OWN char *owl_command_with_history(int argc, const char *const *argv, const char *buff)
 {
   owl_history *hist;

context.c

@@ -6 +6 @@
 
 /* TODO: dependency from owl_context -> owl_window is annoying. */
-G_GNUC_WARN_UNUSED_RESULT owl_context *owl_context_new(int mode, void *data, const char *keymap, owl_window *cursor)
+CALLER_OWN owl_context *owl_context_new(int mode, void *data, const char *keymap, owl_window *cursor)
 {
   owl_context *c;

dict.c

@@ -56 +56 @@
 }
 
-/* Appends dictionary keys to a list.  Duplicates the keys,
- * so they will need to be freed by the caller. */
-void owl_dict_get_keys(const owl_dict *d, owl_list *l) {
+/* Returns a GPtrArray of dictionary keys. Duplicates the keys, so
+ * they will need to be freed by the caller with g_free. */
+CALLER_OWN GPtrArray *owl_dict_get_keys(const owl_dict *d) {
+  GPtrArray *keys = g_ptr_array_sized_new(d->size);
   int i;
-  for (i=0; i<d->size; i++) {
-    owl_list_append_element(l, g_strdup(d->els[i].k));
+  for (i = 0; i < d->size; i++) {
+    g_ptr_array_add(keys, g_strdup(d->els[i].k));
   }
+  return keys;
 }
 
@@ -107 +109 @@
 /* Doesn't free the value of the element, but does
  * return it so the caller can free it. */
-G_GNUC_WARN_UNUSED_RESULT void *owl_dict_remove_element(owl_dict *d, const char *k)
+CALLER_OWN void *owl_dict_remove_element(owl_dict *d, const char *k)
 {
   int i;

editcontext.c

@@ -8 +8 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT owl_context *owl_editcontext_new(int mode, owl_editwin *e, const char *keymap, void (*deactivate_cb)(owl_context*), void *cbdata)
+CALLER_OWN owl_context *owl_editcontext_new(int mode, owl_editwin *e, const char *keymap, void (*deactivate_cb)(owl_context*), void *cbdata)
 {
   owl_context *ctx = owl_context_new(mode, owl_editwin_ref(e), keymap,

editwin.c

@@ -61 +61 @@
 static const char *oe_copy_buf(owl_editwin *e, const char *buf, int len);
 static int oe_copy_region(owl_editwin *e);
-static G_GNUC_WARN_UNUSED_RESULT char *oe_chunk(owl_editwin *e, int start, int end);
+static CALLER_OWN char *oe_chunk(owl_editwin *e, int start, int end);
 static void oe_destroy_cbdata(owl_editwin *e);
 static void oe_dirty(owl_editwin *e);
@@ -70 +70 @@
 #define WHITESPACE " \n\t"
 
-static G_GNUC_WARN_UNUSED_RESULT owl_editwin *owl_editwin_allocate(void)
+static CALLER_OWN owl_editwin *owl_editwin_allocate(void)
 {
   owl_editwin *e = g_new0(owl_editwin, 1);
@@ -142 +142 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT owl_editwin *owl_editwin_new(owl_window *win, int winlines, int wincols, int style, owl_history *hist)
+CALLER_OWN owl_editwin *owl_editwin_new(owl_window *win, int winlines, int wincols, int style, owl_history *hist)
 {
   owl_editwin *e = owl_editwin_allocate();
@@ -1369 +1369 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_editwin_get_region(owl_editwin *e)
+CALLER_OWN char *owl_editwin_get_region(owl_editwin *e)
 {
   int start, end;
@@ -1388 +1388 @@
 }
 
-static G_GNUC_WARN_UNUSED_RESULT char *oe_chunk(owl_editwin *e, int start, int end)
+static CALLER_OWN char *oe_chunk(owl_editwin *e, int start, int end)
 {
   char *p;

errqueue.c

@@ -3 +3 @@
 void owl_errqueue_init(owl_errqueue *eq)
 {
-  owl_list_create(&(eq->errlist));
+  eq->errlist = g_ptr_array_new();
 }
 
 void owl_errqueue_append_err(owl_errqueue *eq, const char *msg)
 {
-  owl_list_append_element(&(eq->errlist), g_strdup(msg));
+  g_ptr_array_add(eq->errlist, g_strdup(msg));
 }
 
@@ -14 +14 @@
 void owl_errqueue_to_fmtext(const owl_errqueue *eq, owl_fmtext *fm)
 {
-  int i, j;
-
-  j=owl_list_get_size(&(eq->errlist));
-  for (i=0; i<j; i++) {
-    owl_fmtext_append_normal(fm, owl_list_get_element(&(eq->errlist), i));
+  int i;
+  for (i = 0; i < eq->errlist->len; i++) {
+    owl_fmtext_append_normal(fm, eq->errlist->pdata[i]);
     owl_fmtext_append_normal(fm, "\n");
   }

filter.c

@@ -200 +200 @@
 
 
-char G_GNUC_WARN_UNUSED_RESULT *owl_filter_print(const owl_filter *f)
+CALLER_OWN char *owl_filter_print(const owl_filter *f)
 {
   GString *out = g_string_new("");

fmtext.c

@@ -171 +171 @@
  * freeing the return
  */
-char G_GNUC_WARN_UNUSED_RESULT *owl_fmtext_print_plain(const owl_fmtext *f)
+CALLER_OWN char *owl_fmtext_print_plain(const owl_fmtext *f)
 {
   return owl_strip_format_chars(f->buff->str);
@@ -755 +755 @@
  * If format_fn is specified, passes it the list element value
  * and it will return a string which this needs to free. */
-void owl_fmtext_append_list(owl_fmtext *f, const owl_list *l, const char *join_with, char *(format_fn)(const char *))
-{
-  int i, size;
+void owl_fmtext_append_list(owl_fmtext *f, const GPtrArray *l, const char *join_with, char *(format_fn)(const char *))
+{
+  int i;
   const char *elem;
   char *text;
 
-  size = owl_list_get_size(l);
-  for (i=0; i<size; i++) {
-    elem = owl_list_get_element(l,i);
+  for (i = 0; i < l->len; i++) {
+    elem = l->pdata[i];
     if (elem && format_fn) {
       text = format_fn(elem);
@@ -773 +772 @@
       owl_fmtext_append_normal(f, elem);
     }
-    if ((i < size-1) && join_with) {
+    if ((i < l->len - 1) && join_with) {
       owl_fmtext_append_normal(f, join_with);
     }

functions.c

@@ -14 +14 @@
 #include "filterproc.h"
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_command(const char *cmdbuff)
+CALLER_OWN char *owl_function_command(const char *cmdbuff)
 {
   owl_function_debugmsg("executing command: %s", cmdbuff);
@@ -21 +21 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_command_argv(const char *const *argv, int argc)
+CALLER_OWN char *owl_function_command_argv(const char *const *argv, int argc)
 {
   return owl_cmddict_execute_argv(owl_global_get_cmddict(&g),
@@ -47 +47 @@
 void owl_function_show_commands(void)
 {
-  owl_list l;
+  GPtrArray *l;
   owl_fmtext fm;
 
@@ -53 +53 @@
   owl_fmtext_append_bold(&fm, "Commands:  ");
   owl_fmtext_append_normal(&fm, "(use 'show command <name>' for details)\n");
-  owl_list_create(&l);
-  owl_cmddict_get_names(owl_global_get_cmddict(&g), &l);
-  owl_fmtext_append_list(&fm, &l, "\n", owl_function_cmd_describe);
+  l = owl_cmddict_get_names(owl_global_get_cmddict(&g));
+  owl_fmtext_append_list(&fm, l, "\n", owl_function_cmd_describe);
   owl_fmtext_append_normal(&fm, "\n");
   owl_function_popless_fmtext(&fm);
-  owl_list_cleanup(&l, g_free);
+  owl_ptr_array_free(l, g_free);
   owl_fmtext_cleanup(&fm);
 }
@@ -81 +80 @@
 
 void owl_function_show_styles(void) {
-  owl_list l;
+  GPtrArray *l;
   owl_fmtext fm;
 
   owl_fmtext_init_null(&fm);
   owl_fmtext_append_bold(&fm, "Styles:\n");
-  owl_list_create(&l);
-  owl_global_get_style_names(&g, &l);
-  owl_fmtext_append_list(&fm, &l, "\n", owl_function_style_describe);
+  l = owl_global_get_style_names(&g);
+  owl_fmtext_append_list(&fm, l, "\n", owl_function_style_describe);
   owl_fmtext_append_normal(&fm, "\n");
   owl_function_popless_fmtext(&fm);
-  owl_list_cleanup(&l, g_free);
+  owl_ptr_array_free(l, g_free);
   owl_fmtext_cleanup(&fm);
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_style_describe(const char *name)
+CALLER_OWN char *owl_function_style_describe(const char *name)
 {
   const char *desc;
@@ -112 +110 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_cmd_describe(const char *name)
+CALLER_OWN char *owl_function_cmd_describe(const char *name)
 {
   const owl_cmd *cmd = owl_cmddict_find(owl_global_get_cmddict(&g), name);
@@ -250 +248 @@
  * owl_global_messagequeue_addmsg() for that.
  */
-G_GNUC_WARN_UNUSED_RESULT owl_message *owl_function_make_outgoing_aim(const char *body, const char *to)
+CALLER_OWN owl_message *owl_function_make_outgoing_aim(const char *body, const char *to)
 {
   owl_message *m;
@@ -271 +269 @@
  * owl_global_messagequeue_addmsg() for that.
  */
-G_GNUC_WARN_UNUSED_RESULT owl_message *owl_function_make_outgoing_loopback(const char *body)
+CALLER_OWN owl_message *owl_function_make_outgoing_loopback(const char *body)
 {
   owl_message *m;
@@ -1576 +1574 @@
   const char *name;
   char *var;
-  owl_list varnames;
-  int i, numvarnames;
+  GPtrArray *varnames;
+  int i;
   GString *str   = g_string_new("");
 
   g_string_append_printf(str, "%-20s = %s\n", "VARIABLE", "VALUE");
   g_string_append_printf(str, "%-20s   %s\n",  "--------", "-----");
-  owl_list_create(&varnames);
-  owl_variable_dict_get_names(owl_global_get_vardict(&g), &varnames);
-  numvarnames = owl_list_get_size(&varnames);
-  for (i=0; i<numvarnames; i++) {
-    name = owl_list_get_element(&varnames, i);
+  varnames = owl_variable_dict_get_names(owl_global_get_vardict(&g));
+  for (i = 0; i < varnames->len; i++) {
+    name = varnames->pdata[i];
     if (name && name[0]!='_') {
       g_string_append_printf(str, "\n%-20s = ", name);
@@ -1597 +1593 @@
   }
   g_string_append(str, "\n");
-  owl_list_cleanup(&varnames, g_free);
+  owl_ptr_array_free(varnames, g_free);
 
   owl_function_popless_text(str->str);
@@ -1605 +1601 @@
 void owl_function_show_variables(void)
 {
-  owl_list varnames;
+  GPtrArray *varnames;
   owl_fmtext fm;  
-  int i, numvarnames;
+  int i;
   const char *varname;
 
@@ -1613 +1609 @@
   owl_fmtext_append_bold(&fm, 
       "Variables: (use 'show variable <name>' for details)\n");
-  owl_list_create(&varnames);
-  owl_variable_dict_get_names(owl_global_get_vardict(&g), &varnames);
-  numvarnames = owl_list_get_size(&varnames);
-  for (i=0; i<numvarnames; i++) {
-    varname = owl_list_get_element(&varnames, i);
+  varnames = owl_variable_dict_get_names(owl_global_get_vardict(&g));
+  for (i = 0; i < varnames->len; i++) {
+    varname = varnames->pdata[i];
     if (varname && varname[0]!='_') {
       owl_variable_describe(owl_global_get_vardict(&g), varname, &fm);
     }
   }
-  owl_list_cleanup(&varnames, g_free);
+  owl_ptr_array_free(varnames, g_free);
   owl_function_popless_fmtext(&fm);
   owl_fmtext_cleanup(&fm);
@@ -1900 +1894 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT owl_editwin *owl_function_start_question(const char *line)
+CALLER_OWN owl_editwin *owl_function_start_question(const char *line)
 {
   owl_editwin *tw;
@@ -1915 +1909 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT owl_editwin *owl_function_start_password(const char *line)
+CALLER_OWN owl_editwin *owl_function_start_password(const char *line)
 {
   owl_editwin *tw;
@@ -1932 +1926 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_exec(int argc, const char *const *argv, const char *buff, int type)
+CALLER_OWN char *owl_function_exec(int argc, const char *const *argv, const char *buff, int type)
 {
   /* if type == 1 display in a popup
@@ -1975 +1969 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_perl(int argc, const char *const *argv, const char *buff, int type)
+CALLER_OWN char *owl_function_perl(int argc, const char *const *argv, const char *buff, int type)
 {
   /* if type == 1 display in a popup
@@ -2145 +2139 @@
  * Returns the name of the negated filter, which the caller must free.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_create_negative_filter(const char *filtername)
+CALLER_OWN char *owl_function_create_negative_filter(const char *filtername)
 {
   char *newname;
@@ -2215 +2209 @@
 {
   const owl_filter *f;
-  const owl_list *fl;
+  const GPtrArray *fl;
   char *tmp;
   owl_fmtext fm;
-  int i, j;
+  int i;
 
   owl_fmtext_init_null(&fm);
 
   fl=owl_global_get_puntlist(&g);
-  j=owl_list_get_size(fl);
   owl_fmtext_append_bold(&fm, "Active zpunt filters:\n");
 
-  for (i=0; i<j; i++) {
-    f=owl_list_get_element(fl, i);
+  for (i = 0; i < fl->len; i++) {
+    f = fl->pdata[i];
     owl_fmtext_appendf_normal(&fm, "[% 2d] ", i+1);
     tmp = owl_filter_print(f);
@@ -2242 +2235 @@
  * If 'related' is nonzero, encompass unclasses and .d classes as well.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_classinstfilt(const char *c, const char *i, int related) 
+CALLER_OWN char *owl_function_classinstfilt(const char *c, const char *i, int related) 
 {
   owl_filter *f;
@@ -2329 +2322 @@
  * the filter, which the caller must free.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_zuserfilt(const char *longuser)
+CALLER_OWN char *owl_function_zuserfilt(const char *longuser)
 {
   owl_filter *f;
@@ -2375 +2368 @@
  * Returns the name of the filter, which the caller must free.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_aimuserfilt(const char *user)
+CALLER_OWN char *owl_function_aimuserfilt(const char *user)
 {
   owl_filter *f;
@@ -2413 +2406 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_typefilt(const char *type)
+CALLER_OWN char *owl_function_typefilt(const char *type)
 {
   owl_filter *f;
@@ -2469 +2462 @@
 }
 
-static G_GNUC_WARN_UNUSED_RESULT char *owl_function_smartfilter_cc(const owl_message *m)
+static CALLER_OWN char *owl_function_smartfilter_cc(const owl_message *m)
 {
   const char *ccs;
@@ -2521 +2514 @@
  *    name to the AIM conversation with that user 
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_smartfilter(int type, int invert_related)
+CALLER_OWN char *owl_function_smartfilter(int type, int invert_related)
 {
   const owl_view *v;
@@ -2780 +2773 @@
 
   owl_function_punt(argv->len, (const char *const*) argv->pdata, direction);
-  g_ptr_array_foreach(argv, (GFunc)g_free, NULL);
-  g_ptr_array_free(argv, true);
+  owl_ptr_array_free(argv, g_free);
 }
 
@@ -2787 +2779 @@
 {
   owl_filter *f;
-  owl_list *fl;
-  int i, j;
+  GPtrArray *fl;
+  int i;
   fl=owl_global_get_puntlist(&g);
 
@@ -2799 +2791 @@
 
   /* Check for an identical filter */
-  j=owl_list_get_size(fl);
-  for (i=0; i<j; i++) {
-    if (owl_filter_equiv(f, owl_list_get_element(fl, i))) {
+  for (i = 0; i < fl->len; i++) {
+    if (owl_filter_equiv(f, fl->pdata[i])) {
       owl_function_debugmsg("found an equivalent punt filter");
       /* if we're punting, then just silently bow out on this duplicate */
@@ -2811 +2802 @@
       /* if we're unpunting, then remove this filter from the puntlist */
       if (direction==1) {
-        owl_filter_delete(owl_list_get_element(fl, i));
-        owl_list_remove_element(fl, i);
+        owl_filter_delete(g_ptr_array_remove_index(fl, i));
         owl_filter_delete(f);
         return;
@@ -2822 +2812 @@
     owl_function_debugmsg("punting");
     /* If we're punting, add the filter to the global punt list */
-    owl_list_append_element(fl, f);
+    g_ptr_array_add(fl, f);
   } else if (direction == 1) {
     owl_function_makemsg("No matching punt filter");
@@ -2830 +2820 @@
 void owl_function_show_keymaps(void)
 {
-  owl_list l;
+  GPtrArray *l;
   owl_fmtext fm;
   const owl_keymap *km;
   const owl_keyhandler *kh;
-  int i, numkm;
+  int i;
   const char *kmname;
 
@@ -2841 +2831 @@
   owl_fmtext_append_bold(&fm, "Keymaps:   ");
   owl_fmtext_append_normal(&fm, "(use 'show keymap <name>' for details)\n");
-  owl_list_create(&l);
-  owl_keyhandler_get_keymap_names(kh, &l);
-  owl_fmtext_append_list(&fm, &l, "\n", owl_function_keymap_summary);
+  l = owl_keyhandler_get_keymap_names(kh);
+  owl_fmtext_append_list(&fm, l, "\n", owl_function_keymap_summary);
   owl_fmtext_append_normal(&fm, "\n");
 
-  numkm = owl_list_get_size(&l);
-  for (i=0; i<numkm; i++) {
-    kmname = owl_list_get_element(&l, i);
+  for (i = 0; i < l->len; i++) {
+    kmname = l->pdata[i];
     km = owl_keyhandler_get_keymap(kh, kmname);
     owl_fmtext_append_bold(&fm, "\n\n----------------------------------------------------------------------------------------------------\n\n");
@@ -2856 +2844 @@
   
   owl_function_popless_fmtext(&fm);
-  owl_list_cleanup(&l, g_free);
+  owl_ptr_array_free(l, g_free);
   owl_fmtext_cleanup(&fm);
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_keymap_summary(const char *name)
+CALLER_OWN char *owl_function_keymap_summary(const char *name)
 {
   const owl_keymap *km 
@@ -2974 +2962 @@
 /* strips formatting from ztext and returns the unformatted text. 
  * caller is responsible for freeing. */
-G_GNUC_WARN_UNUSED_RESULT char *owl_function_ztext_stylestrip(const char *zt)
+CALLER_OWN char *owl_function_ztext_stylestrip(const char *zt)
 {
   owl_fmtext fm;
@@ -2997 +2985 @@
 #ifdef HAVE_LIBZEPHYR
   int x;
-  owl_list anyone;
+  GPtrArray *anyone;
   const char *user;
   char *tmp;
@@ -3032 +3020 @@
     } 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");
@@ -3044 +3031 @@
         }
       } 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);
 
@@ -3078 +3064 @@
         }
       }
-      owl_list_cleanup(&anyone, g_free);
+      owl_ptr_array_free(anyone, g_free);
     }
   }
@@ -3390 +3376 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  int i, j;
-  owl_list anyone;
+  int i;
+  GPtrArray *anyone;
   GList **zaldlist;
   GList *zaldptr;
@@ -3411 +3397 @@
   *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) {
@@ -3424 +3408 @@
   }
 
-  owl_list_cleanup(&anyone, g_free);
+  owl_ptr_array_free(anyone, g_free);
 #endif
 }
 
-void owl_function_aimsearch_results(const char *email, owl_list *namelist)
+void owl_function_aimsearch_results(const char *email, GPtrArray *namelist)
 {
   owl_fmtext fm;
-  int i, j;
+  int i;
 
   owl_fmtext_init_null(&fm);
@@ -3438 +3422 @@
   owl_fmtext_append_normal(&fm, ":\n");
 
-  j=owl_list_get_size(namelist);
-  for (i=0; i<j; i++) {
+  for (i = 0; i < namelist->len; i++) {
     owl_fmtext_append_normal(&fm, "  ");
-    owl_fmtext_append_normal(&fm, owl_list_get_element(namelist, i));
+    owl_fmtext_append_normal(&fm, namelist->pdata[i]);
     owl_fmtext_append_normal(&fm, "\n");
   }

global.c

@@ -47 +47 @@
   owl_dict_create(&(g->filters));
   g->filterlist = NULL;
-  owl_list_create(&(g->puntlist));
+  g->puntlist = g_ptr_array_new();
   g->messagequeue = g_queue_new();
   owl_dict_create(&(g->styledict));
@@ -172 +172 @@
 /* Pops the current context from the context stack and returns it. Caller is
  * responsible for freeing. */
-G_GNUC_WARN_UNUSED_RESULT owl_context *owl_global_pop_context_no_delete(owl_global *g)
+CALLER_OWN owl_context *owl_global_pop_context_no_delete(owl_global *g)
 {
   owl_context *c;
@@ -579 +579 @@
 /* puntlist */
 
-owl_list *owl_global_get_puntlist(owl_global *g) {
-  return(&(g->puntlist));
+GPtrArray *owl_global_get_puntlist(owl_global *g) {
+  return g->puntlist;
 }
 
 int owl_global_message_is_puntable(owl_global *g, const owl_message *m) {
-  const owl_list *pl;
-  int i, j;
-
-  pl=owl_global_get_puntlist(g);
-  j=owl_list_get_size(pl);
-  for (i=0; i<j; i++) {
-    if (owl_filter_message_match(owl_list_get_element(pl, i), m)) return(1);
-  }
-  return(0);
+  const GPtrArray *pl;
+  int i;
+
+  pl = owl_global_get_puntlist(g);
+  for (i = 0; i < pl->len; i++) {
+    if (owl_filter_message_match(pl->pdata[i], m)) return 1;
+  }
+  return 0;
 }
 
@@ -725 +724 @@
  * necessary.
  */
-owl_message G_GNUC_WARN_UNUSED_RESULT *owl_global_messagequeue_popmsg(owl_global *g)
+CALLER_OWN owl_message *owl_global_messagequeue_popmsg(owl_global *g)
 {
   owl_message *out;
@@ -754 +753 @@
 }
 
-void owl_global_get_style_names(const owl_global *g, owl_list *l) {
-  owl_dict_get_keys(&(g->styledict), l);
+CALLER_OWN GPtrArray *owl_global_get_style_names(const owl_global *g)
+{
+  return owl_dict_get_keys(&g->styledict);
 }
 

help.c

@@ -6 +6 @@
   owl_fmtext fm;
   const char *varname;
-  owl_list varnames;
-  int i, numvarnames;
+  GPtrArray *varnames;
+  int i;
 
   owl_fmtext_init_null(&fm);
@@ -129 +129 @@
   owl_fmtext_append_bold(&fm, 
                          "Variables:\n");
-  owl_list_create(&varnames);
-  owl_variable_dict_get_names(owl_global_get_vardict(&g), &varnames);
-  numvarnames = owl_list_get_size(&varnames);
-  for (i=0; i<numvarnames; i++) {
-    varname = owl_list_get_element(&varnames, i);
+  varnames = owl_variable_dict_get_names(owl_global_get_vardict(&g));
+  for (i = 0; i < varnames->len; i++) {
+    varname = varnames->pdata[i];
     if (varname && varname[0]!='_') {
       owl_variable_describe(owl_global_get_vardict(&g), varname, &fm);
     }
   }
-  owl_list_cleanup(&varnames, g_free);
+  owl_ptr_array_free(varnames, g_free);
 
   owl_fmtext_append_normal(&fm, "\n");

keybinding.c

@@ -14 +14 @@
 
 /* sets up a new keybinding for a command */
-G_GNUC_WARN_UNUSED_RESULT owl_keybinding *owl_keybinding_new(const char *keyseq, const char *command, void (*function_fn)(void), const char *desc)
+CALLER_OWN owl_keybinding *owl_keybinding_new(const char *keyseq, const char *command, void (*function_fn)(void), const char *desc)
 {
   owl_keybinding *kb = g_new(owl_keybinding, 1);
@@ -85 +85 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_keybinding_stack_tostring(int *j, int len)
+CALLER_OWN char *owl_keybinding_stack_tostring(int *j, int len)
 {
   GString *string;
@@ -100 +100 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_keybinding_tostring(const owl_keybinding *kb)
+CALLER_OWN char *owl_keybinding_tostring(const owl_keybinding *kb)
 {
   return owl_keybinding_stack_tostring(kb->keys, kb->len);

keymap.c

@@ -11 +11 @@
   km->name = g_strdup(name);
   km->desc = g_strdup(desc);
-  owl_list_create(&km->bindings);
+  km->bindings = g_ptr_array_new();
   km->parent = NULL;
   km->default_fn = default_fn;
@@ -24 +24 @@
   g_free(km->name);
   g_free(km->desc);
-  owl_list_cleanup(&km->bindings, (void (*)(void *))owl_keybinding_delete);
+  owl_ptr_array_free(km->bindings, (GDestroyNotify)owl_keybinding_delete);
 }
 
@@ -35 +35 @@
 int owl_keymap_create_binding(owl_keymap *km, const char *keyseq, const char *command, void (*function_fn)(void), const char *desc)
 {
-  owl_keybinding *kb, *curkb;
+  owl_keybinding *kb;
   int i;
 
@@ -44 +44 @@
    * otherwise just add this one. 
    */
-  for (i = owl_list_get_size(&km->bindings)-1; i>=0; i--) {
-    curkb = owl_list_get_element(&km->bindings, i);
-    if (owl_keybinding_equal(curkb, kb)) {
-      owl_list_remove_element(&km->bindings, i);
-      owl_keybinding_delete(curkb);
-    }
-  }
-  owl_list_append_element(&km->bindings, kb);
+  for (i = km->bindings->len-1; i >= 0; i--) {
+    if (owl_keybinding_equal(km->bindings->pdata[i], kb)) {
+      owl_keybinding_delete(g_ptr_array_remove_index(km->bindings, i));
+    }
+  }
+  g_ptr_array_add(km->bindings, kb);
   return 0;
 }
@@ -58 +56 @@
 int owl_keymap_remove_binding(owl_keymap *km, const char *keyseq)
 {
-  owl_keybinding *kb, *curkb;
+  owl_keybinding *kb;
   int i;
 
@@ -65 +63 @@
     return -1;
 
-  for (i = owl_list_get_size(&km->bindings)-1; i >= 0; i--) {
-    curkb = owl_list_get_element(&km->bindings, i);
-    if (owl_keybinding_equal(curkb, kb)) {
-      owl_list_remove_element(&km->bindings, i);
-      owl_keybinding_delete(curkb);
+  for (i = km->bindings->len-1; i >= 0; i--) {
+    if (owl_keybinding_equal(km->bindings->pdata[i], kb)) {
+      owl_keybinding_delete(g_ptr_array_remove_index(km->bindings, i));
       owl_keybinding_delete(kb);
       return(0);
@@ -80 +76 @@
 
 /* returns a summary line describing this keymap.  the caller must free. */
-G_GNUC_WARN_UNUSED_RESULT char *owl_keymap_summary(const owl_keymap *km)
+CALLER_OWN char *owl_keymap_summary(const owl_keymap *km)
 {
   if (!km || !km->name || !km->desc) return NULL;
@@ -139 +135 @@
 static void _owl_keymap_format_bindings(const owl_keymap *km, owl_fmtext *fm)
 {
-  int i, nbindings;
+  int i;
   const owl_keybinding *kb;
   
-  nbindings = owl_list_get_size(&km->bindings);
-  for (i=0; i<nbindings; i++) {
+  for (i = 0; i < km->bindings->len; i++) {
     char *kbstr;
     const owl_cmd *cmd;
     const char *tmpdesc, *desc = "";
 
-    kb = owl_list_get_element(&km->bindings, i);
+    kb = km->bindings->pdata[i];
     kbstr = owl_keybinding_tostring(kb);
     owl_fmtext_append_normal(fm, OWL_TABSTR);
@@ -214 +209 @@
 }
 
-void owl_keyhandler_get_keymap_names(const owl_keyhandler *kh, owl_list *l)
-{
-  owl_dict_get_keys(&kh->keymaps, l);
+CALLER_OWN GPtrArray *owl_keyhandler_get_keymap_names(const owl_keyhandler *kh)
+{
+  return owl_dict_get_keys(&kh->keymaps);
 }
 
@@ -274 +269 @@
    * keyhandler and keymap apart.  */
   for (km=kh->active; km; km=km->parent) {
-    for (i=owl_list_get_size(&km->bindings)-1; i>=0; i--) {
-      kb = owl_list_get_element(&km->bindings, i);
+    for (i = km->bindings->len-1; i >= 0; i--) {
+      kb = km->bindings->pdata[i];
       match = owl_keybinding_match(kb, kh);
       if (match == 1) {         /* subset match */

keypress.c

@@ -129 +129 @@
 /* OWL_META is definied in owl.h */
 
-char G_GNUC_WARN_UNUSED_RESULT *owl_keypress_tostring(int j, int esc)
+CALLER_OWN char *owl_keypress_tostring(int j, int esc)
 {
   GString *kb;

logging.c

@@ -80 +80 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_log_zephyr(const owl_message *m)
+CALLER_OWN char *owl_log_zephyr(const owl_message *m)
 {
     char *tmp = NULL;
@@ -104 +104 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_log_aim(const owl_message *m)
+CALLER_OWN char *owl_log_aim(const owl_message *m)
 {
     GString *buffer = NULL;
@@ -122 +122 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_log_jabber(const owl_message *m)
+CALLER_OWN char *owl_log_jabber(const owl_message *m)
 {
     GString *buffer = NULL;
@@ -135 +135 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_log_generic(const owl_message *m)
+CALLER_OWN char *owl_log_generic(const owl_message *m)
 {
     GString *buffer;

message.c

@@ -43 +43 @@
 
   owl_message_set_hostname(m, "");
-  owl_list_create(&(m->attributes));
+  m->attributes = g_ptr_array_new();
   
   /* save the time */
@@ -58 +58 @@
 void owl_message_set_attribute(owl_message *m, const char *attrname, const char *attrvalue)
 {
-  int i, j;
+  int i;
   owl_pair *p = NULL, *pair = NULL;
 
@@ -64 +64 @@
 
   /* look for an existing pair with this key, */
-  j=owl_list_get_size(&(m->attributes));
-  for (i=0; i<j; i++) {
-    p=owl_list_get_element(&(m->attributes), i);
+  for (i = 0; i < m->attributes->len; i++) {
+    p = m->attributes->pdata[i];
     if (owl_pair_get_key(p) == attrname) {
       g_free(owl_pair_get_value(p));
@@ -77 +76 @@
     pair = g_new(owl_pair, 1);
     owl_pair_create(pair, attrname, NULL);
-    owl_list_append_element(&(m->attributes), pair);
+    g_ptr_array_add(m->attributes, pair);
   }
   owl_pair_set_value(pair, owl_validate_or_convert(attrvalue));
@@ -87 +86 @@
 const char *owl_message_get_attribute_value(const owl_message *m, const char *attrname)
 {
-  int i, j;
+  int i;
   owl_pair *p;
   GQuark quark;
@@ -97 +96 @@
   attrname = g_quark_to_string(quark);
 
-  j=owl_list_get_size(&(m->attributes));
-  for (i=0; i<j; i++) {
-    p=owl_list_get_element(&(m->attributes), i);
+  for (i = 0; i < m->attributes->len; i++) {
+    p = m->attributes->pdata[i];
     if (owl_pair_get_key(p) == attrname) {
       return(owl_pair_get_value(p));
@@ -118 +116 @@
  */
 void owl_message_attributes_tofmtext(const owl_message *m, owl_fmtext *fm) {
-  int i, j;
+  int i;
   owl_pair *p;
   char *buff, *tmpbuff;
@@ -124 +122 @@
   owl_fmtext_init_null(fm);
 
-  j=owl_list_get_size(&(m->attributes));
-  for (i=0; i<j; i++) {
-    p=owl_list_get_element(&(m->attributes), i);
+  for (i = 0; i < m->attributes->len; i++) {
+    p = m->attributes->pdata[i];
 
     tmpbuff = g_strdup(owl_pair_get_value(p));
@@ -580 +577 @@
 
 /* caller must free return value. */
-G_GNUC_WARN_UNUSED_RESULT char *owl_message_get_cc(const owl_message *m)
+CALLER_OWN char *owl_message_get_cc(const owl_message *m)
 {
   const char *cur;
@@ -597 +594 @@
 
 /* caller must free return value */
-G_GNUC_WARN_UNUSED_RESULT GList *owl_message_get_cc_without_recipient(const owl_message *m)
+CALLER_OWN GList *owl_message_get_cc_without_recipient(const owl_message *m)
 {
   char *cc, *shortuser, *recip;
@@ -1004 +1001 @@
 void owl_message_cleanup(owl_message *m)
 {
-  int i, j;
+  int i;
   owl_pair *p;
 #ifdef HAVE_LIBZEPHYR    
@@ -1014 +1011 @@
 
   /* free all the attributes */
-  j=owl_list_get_size(&(m->attributes));
-  for (i=0; i<j; i++) {
-    p=owl_list_get_element(&(m->attributes), i);
+  for (i = 0; i < m->attributes->len; i++) {
+    p = m->attributes->pdata[i];
     g_free(owl_pair_get_value(p));
     g_free(p);
   }
 
-  owl_list_cleanup(&(m->attributes), NULL);
+  g_ptr_array_free(m->attributes, true);
  
   owl_message_invalidate_format(m);

messagelist.c

@@ -3 +3 @@
 #include <string.h>
 
-int owl_messagelist_create(owl_messagelist *ml)
+void owl_messagelist_create(owl_messagelist *ml)
 {
-  owl_list_create(&(ml->list));
-  return(0);
+  ml->list = g_ptr_array_new();
+}
+
+void owl_messagelist_cleanup(owl_messagelist *ml, bool free_messages)
+{
+  if (free_messages)
+    g_ptr_array_foreach(ml->list, (GFunc)owl_message_delete, NULL);
+  g_ptr_array_free(ml->list, true);
 }
 
 int owl_messagelist_get_size(const owl_messagelist *ml)
 {
-  return(owl_list_get_size(&(ml->list)));
+  return ml->list->len;
 }
 
 void *owl_messagelist_get_element(const owl_messagelist *ml, int n)
 {
-  return(owl_list_get_element(&(ml->list), n));
+  return ml->list->pdata[n];
 }
 
@@ -26 +32 @@
 
   first = 0;
-  last = owl_list_get_size(&(ml->list)) - 1;
+  last = ml->list->len - 1;
   while (first <= last) {
     mid = (first + last) / 2;
-    m = owl_list_get_element(&(ml->list), mid);
+    m = ml->list->pdata[mid];
     msg_id = owl_message_get_id(m);
     if (msg_id == target_id) {
@@ -44 +50 @@
 void owl_messagelist_append_element(owl_messagelist *ml, void *element)
 {
-  owl_list_append_element(&ml->list, element);
+  g_ptr_array_add(ml->list, element);
 }
 
@@ -51 +57 @@
 {
   /* mark a message as deleted */
-  owl_message_mark_delete(owl_list_get_element(&(ml->list), n));
+  owl_message_mark_delete(ml->list->pdata[n]);
   return(0);
 }
@@ -58 +64 @@
 {
   /* mark a message as deleted */
-  owl_message_unmark_delete(owl_list_get_element(&(ml->list), n));
+  owl_message_unmark_delete(ml->list->pdata[n]);
   return(0);
 }
@@ -65 +71 @@
 {
   /* expunge deleted messages */
-  int i, j;
-  owl_list newlist;
+  int i;
+  GPtrArray *newlist;
   owl_message *m;
 
-  owl_list_create(&newlist);
+  newlist = g_ptr_array_new();
   /*create a new list without messages marked as deleted */
-  j=owl_list_get_size(&(ml->list));
-  for (i=0; i<j; i++) {
-    m=owl_list_get_element(&(ml->list), i);
+  for (i = 0; i < ml->list->len; i++) {
+    m = ml->list->pdata[i];
     if (owl_message_is_delete(m)) {
       owl_message_delete(m);
     } else {
-      owl_list_append_element(&newlist, m);
+      g_ptr_array_add(newlist, m);
     }
   }
 
   /* free the old list */
-  owl_list_cleanup(&(ml->list), NULL);
+  g_ptr_array_free(ml->list, true);
 
   /* copy the new list to the old list */
@@ -92 +97 @@
 void owl_messagelist_invalidate_formats(const owl_messagelist *ml)
 {
-  int i, j;
+  int i;
   owl_message *m;
 
-  j=owl_list_get_size(&(ml->list));
-  for (i=0; i<j; i++) {
-    m=owl_list_get_element(&(ml->list), i);
+  for (i = 0; i < ml->list->len; i++) {
+    m = ml->list->pdata[i];
     owl_message_invalidate_format(m);
   }

owl.h

@@ -199 +199 @@
 #define OWL_ENABLE_ZCRYPT 1
 #endif
+
+/* Annotate functions in which the caller owns the return value and is
+ * responsible for ensuring it is freed. */
+#define CALLER_OWN G_GNUC_WARN_UNUSED_RESULT
 
 #define OWL_META(key) ((key)|010000)
@@ -251 +255 @@
                                  * WARNING:  this approach is hard to make
                                  * thread-safe... */
-  char G_GNUC_WARN_UNUSED_RESULT *(*get_tostring_fn)(const struct _owl_variable *v, const void *val);
+  CALLER_OWN char *(*get_tostring_fn)(const struct _owl_variable *v, const void *val);
                                 /* converts val to a string;
                                  * caller must free the result */
@@ -266 +270 @@
   GString *buff;
 } owl_fmtext;
-
-typedef struct _owl_list {
-  int size;
-  int avail;
-  void **list;
-} owl_list;
 
 typedef struct _owl_dict_el {
@@ -313 +311 @@
   
   /* These don't take any context */
-  char G_GNUC_WARN_UNUSED_RESULT *(*cmd_args_fn)(int argc, const char *const *argv, const char *buff);
+  CALLER_OWN char *(*cmd_args_fn)(int argc, const char *const *argv, const char *buff);
                                 /* takes argv and the full command as buff.
                                  * caller must free return value if !NULL */
@@ -320 +318 @@
 
   /* The following also take the active context if it's valid */
-  char G_GNUC_WARN_UNUSED_RESULT *(*cmd_ctxargs_fn)(void *ctx, int argc, const char *const *argv, const char *buff);
+  CALLER_OWN char *(*cmd_ctxargs_fn)(void *ctx, int argc, const char *const *argv, const char *buff);
                                 /* takes argv and the full command as buff.
                                  * caller must free return value if !NULL */
@@ -338 +336 @@
   char *zsig;
   char *message;
-  owl_list recips;
+  GPtrArray *recips;
   int cc;
   int noping;
@@ -359 +357 @@
   int delete;
   const char *hostname;
-  owl_list attributes;            /* this is a list of pairs */
+  GPtrArray *attributes;          /* this is a list of pairs */
   char *timestr;
   time_t time;
@@ -418 +416 @@
 
 typedef struct _owl_messagelist {
-  owl_list list;
+  GPtrArray *list;
 } owl_messagelist;
 
@@ -481 +479 @@
   char     *name;               /* name of keymap */
   char     *desc;               /* description */
-  owl_list  bindings;           /* key bindings */
+  GPtrArray *bindings;          /* key bindings */
   const struct _owl_keymap *parent;     /* parent */
   void (*default_fn)(owl_input j);      /* default action (takes a keypress) */
@@ -504 +502 @@
 
 typedef struct _owl_buddylist {
-  owl_list buddies;
+  GPtrArray *buddies;
 } owl_buddylist;
 
 typedef struct _owl_zbuddylist {
-  owl_list zusers;
+  GPtrArray *zusers;
 } owl_zbuddylist;
 
 typedef struct _owl_errqueue {
-  owl_list errlist;
+  GPtrArray *errlist;
 } owl_errqueue;
 
@@ -538 +536 @@
   owl_dict filters;
   GList *filterlist;
-  owl_list puntlist;
+  GPtrArray *puntlist;
   owl_vardict vars;
   owl_cmddict cmds;

perlconfig.c

@@ -23 +23 @@
 
 
-G_GNUC_WARN_UNUSED_RESULT SV *owl_new_sv(const char * str)
+CALLER_OWN SV *owl_new_sv(const char * str)
 {
   SV *ret = newSVpv(str, 0);
@@ -36 +36 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT AV *owl_new_av(const owl_list *l, SV *(*to_sv)(const void *))
+CALLER_OWN AV *owl_new_av(const GPtrArray *l, SV *(*to_sv)(const void *))
 {
   AV *ret;
@@ -44 +44 @@
   ret = newAV();
 
-  for (i = 0; i < owl_list_get_size(l); i++) {
-    element = owl_list_get_element(l, i);
+  for (i = 0; i < l->len; i++) {
+    element = l->pdata[i];
     av_push(ret, to_sv(element));
   }
@@ -52 +52 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT HV *owl_new_hv(const owl_dict *d, SV *(*to_sv)(const void *))
+CALLER_OWN HV *owl_new_hv(const owl_dict *d, SV *(*to_sv)(const void *))
 {
   HV *ret;
-  owl_list l;
+  GPtrArray *keys;
   const char *key;
   void *element;
@@ -63 +63 @@
 
   /* TODO: add an iterator-like interface to owl_dict */
-  owl_list_create(&l);
-  owl_dict_get_keys(d, &l);
-  for (i = 0; i < owl_list_get_size(&l); i++) {
-    key = owl_list_get_element(&l, i);
+  keys = owl_dict_get_keys(d);
+  for (i = 0; i < keys->len; i++) {
+    key = keys->pdata[i];
     element = owl_dict_find_element(d, key);
     (void)hv_store(ret, key, strlen(key), to_sv(element), 0);
   }
-  owl_list_cleanup(&l, g_free);
+  owl_ptr_array_free(keys, g_free);
 
   return ret;
 }
 
-G_GNUC_WARN_UNUSED_RESULT SV *owl_perlconfig_message2hashref(const owl_message *m)
+CALLER_OWN SV *owl_perlconfig_message2hashref(const owl_message *m)
 {
   HV *h, *stash;
@@ -115 +114 @@
   }
 
-  j=owl_list_get_size(&(m->attributes));
-  for(i=0; i<j; i++) {
-    pair=owl_list_get_element(&(m->attributes), i);
+  for (i = 0; i < m->attributes->len; i++) {
+    pair = m->attributes->pdata[i];
     (void)hv_store(h, owl_pair_get_key(pair), strlen(owl_pair_get_key(pair)),
                    owl_new_sv(owl_pair_get_value(pair)),0);
@@ -165 +163 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT SV *owl_perlconfig_curmessage2hashref(void)
+CALLER_OWN SV *owl_perlconfig_curmessage2hashref(void)
 {
   int curmsg;
@@ -183 +181 @@
    This has been somewhat addressed, but is still not lossless.
  */
-G_GNUC_WARN_UNUSED_RESULT owl_message *owl_perlconfig_hashref2message(SV *msg)
+CALLER_OWN owl_message *owl_perlconfig_hashref2message(SV *msg)
 {
   owl_message * m;
@@ -251 +249 @@
 /* Calls in a scalar context, passing it a hash reference.
    If return value is non-null, caller must free. */
-G_GNUC_WARN_UNUSED_RESULT char *owl_perlconfig_call_with_message(const char *subname, const owl_message *m)
+CALLER_OWN char *owl_perlconfig_call_with_message(const char *subname, const owl_message *m)
 {
   dSP ;
@@ -300 +298 @@
    If the return value is non-null, the caller must free it.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_perlconfig_message_call_method(const owl_message *m, const char *method, int argc, const char **argv)
+CALLER_OWN char *owl_perlconfig_message_call_method(const owl_message *m, const char *method, int argc, const char **argv)
 {
   dSP;
@@ -350 +348 @@
 
 /* caller must free result, if not NULL */
-G_GNUC_WARN_UNUSED_RESULT char *owl_perlconfig_initperl(const char *file, int *Pargc, char ***Pargv, char ***Penv)
+CALLER_OWN char *owl_perlconfig_initperl(const char *file, int *Pargc, char ***Pargv, char ***Penv)
 {
   int ret;
@@ -436 +434 @@
 
 /* caller is responsible for freeing returned string */
-G_GNUC_WARN_UNUSED_RESULT char *owl_perlconfig_execute(const char *line)
+CALLER_OWN char *owl_perlconfig_execute(const char *line)
 {
   STRLEN len;
@@ -506 +504 @@
 
 /* caller must free the result */
-G_GNUC_WARN_UNUSED_RESULT char *owl_perlconfig_perlcmd(const owl_cmd *cmd, int argc, const char *const *argv)
+CALLER_OWN char *owl_perlconfig_perlcmd(const owl_cmd *cmd, int argc, const char *const *argv)
 {
   int i, count;

perlglue.xs

@@ -329 +329 @@
 all_filters()
         PREINIT:
-                owl_list fl;
-        CODE:
-        {
-                owl_list_create(&fl);
-                owl_dict_get_keys(&g.filters, &fl);
-                RETVAL = owl_new_av(&fl, (SV*(*)(const void*))owl_new_sv);
+                GPtrArray *fl;
+        CODE:
+        {
+                fl = owl_dict_get_keys(&g.filters);
+                RETVAL = owl_new_av(fl, (SV*(*)(const void*))owl_new_sv);
                 sv_2mortal((SV*)RETVAL);
-                owl_list_cleanup(&fl, g_free);
+                owl_ptr_array_free(fl, g_free);
         }
         OUTPUT:
@@ -344 +343 @@
 all_styles()
         PREINIT:
-                owl_list l;
-        CODE:
-        {
-                owl_list_create(&l);
-                owl_global_get_style_names(&g, &l);
-                RETVAL = owl_new_av(&l, (SV*(*)(const void*))owl_new_sv);
+                GPtrArray *l;
+        CODE:
+        {
+                l = owl_global_get_style_names(&g);
+                RETVAL = owl_new_av(l, (SV*(*)(const void*))owl_new_sv);
                 sv_2mortal((SV*)RETVAL);
         }
@@ -355 +353 @@
                 RETVAL
         CLEANUP:
-                owl_list_cleanup(&l, g_free);
+                owl_ptr_array_free(l, g_free);
 
 
@@ -361 +359 @@
 all_variables()
         PREINIT:
-                owl_list l;
-        CODE:
-        {
-                owl_list_create(&l);
-                owl_dict_get_keys(owl_global_get_vardict(&g), &l);
-                RETVAL = owl_new_av(&l, (SV*(*)(const void*))owl_new_sv);
+                GPtrArray *l;
+        CODE:
+        {
+                l = owl_dict_get_keys(owl_global_get_vardict(&g));
+                RETVAL = owl_new_av(l, (SV*(*)(const void*))owl_new_sv);
                 sv_2mortal((SV*)RETVAL);
         }
@@ -372 +369 @@
                 RETVAL
         CLEANUP:
-                owl_list_cleanup(&l, g_free);
+                owl_ptr_array_free(l, g_free);
 
 
@@ -378 +375 @@
 all_keymaps()
         PREINIT:
-                owl_list l;
+                GPtrArray *l;
                 const owl_keyhandler *kh;
         CODE:
         {
                 kh = owl_global_get_keyhandler(&g);
-                owl_list_create(&l);
-                owl_keyhandler_get_keymap_names(kh, &l);
-                RETVAL = owl_new_av(&l, (SV*(*)(const void*))owl_new_sv);
+                l = owl_keyhandler_get_keymap_names(kh);
+                RETVAL = owl_new_av(l, (SV*(*)(const void*))owl_new_sv);
                 sv_2mortal((SV*)RETVAL);
         }
@@ -391 +387 @@
                 RETVAL
         CLEANUP:
-                owl_list_cleanup(&l, g_free);
+                owl_ptr_array_free(l, g_free);
 
 void

popwin.c

@@ -1 +1 @@
 #include "owl.h"
 
-G_GNUC_WARN_UNUSED_RESULT owl_popwin *owl_popwin_new(void)
+CALLER_OWN owl_popwin *owl_popwin_new(void)
 {
   owl_popwin *pw = g_new0(owl_popwin, 1);

tester.c

@@ -230 +230 @@
 int owl_dict_regtest(void) {
   owl_dict d;
-  owl_list l;
+  GPtrArray *l;
   int numfailed=0;
   char *av = g_strdup("aval"), *bv = g_strdup("bval"), *cv = g_strdup("cval"),
@@ -251 +251 @@
 
   FAIL_UNLESS("get_size", 3==owl_dict_get_size(&d));
-  owl_list_create(&l);
-  owl_dict_get_keys(&d, &l);
-  FAIL_UNLESS("get_keys result size", 3==owl_list_get_size(&l));
+  l = owl_dict_get_keys(&d);
+  FAIL_UNLESS("get_keys result size", 3 == l->len);
   
   /* these assume the returned keys are sorted */
-  FAIL_UNLESS("get_keys result val",0==strcmp("a",owl_list_get_element(&l,0)));
-  FAIL_UNLESS("get_keys result val",0==strcmp("b",owl_list_get_element(&l,1)));
-  FAIL_UNLESS("get_keys result val",0==strcmp("c",owl_list_get_element(&l,2)));
-
-  owl_list_cleanup(&l, g_free);
+  FAIL_UNLESS("get_keys result val", 0 == strcmp("a", l->pdata[0]));
+  FAIL_UNLESS("get_keys result val", 0 == strcmp("b", l->pdata[1]));
+  FAIL_UNLESS("get_keys result val", 0 == strcmp("c", l->pdata[2]));
+
+  owl_ptr_array_free(l, g_free);
   owl_dict_cleanup(&d, NULL);
 

text.c

@@ -7 +7 @@
 /* Returns a copy of 'in' with each line indented 'n'
  * characters. Result must be freed with g_free. */
-G_GNUC_WARN_UNUSED_RESULT char *owl_text_indent(const char *in, int n)
+CALLER_OWN char *owl_text_indent(const char *in, int n)
 {
   const char *ptr1, *ptr2, *last;
@@ -48 +48 @@
 
 /* caller must free the return */
-G_GNUC_WARN_UNUSED_RESULT char *owl_text_htmlstrip(const char *in)
+CALLER_OWN char *owl_text_htmlstrip(const char *in)
 {
   const char *ptr1, *end, *ptr2, *ptr3;
@@ -129 +129 @@
 
 /* Caller must free return */
-G_GNUC_WARN_UNUSED_RESULT char *owl_text_expand_tabs(const char *in)
+CALLER_OWN char *owl_text_expand_tabs(const char *in)
 {
   int len = 0;
@@ -188 +188 @@
 
 /* caller must free the return */
-G_GNUC_WARN_UNUSED_RESULT char *owl_text_wordwrap(const char *in, int col)
+CALLER_OWN char *owl_text_wordwrap(const char *in, int col)
 {
   char *out;
@@ -269 +269 @@
  * Caller must free returned string.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_text_substitute(const char *in, const char *from, const char *to)
+CALLER_OWN char *owl_text_substitute(const char *in, const char *from, const char *to)
 {
   char **split = g_strsplit(in, from, 0), *out;
@@ -284 +284 @@
  * On success returns the string, on error returns NULL.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_text_quote(const char *in, const char *toquote, const char *quotestr)
+CALLER_OWN char *owl_text_quote(const char *in, const char *toquote, const char *quotestr)
 {
   int i, x, r, place, escape;

util.c

@@ -35 +35 @@
  * duplicate slashes are removed.  Caller must free the return.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_util_makepath(const char *in)
+CALLER_OWN char *owl_util_makepath(const char *in)
 {
   int i, j, x;
@@ -98 +98 @@
 }
 
+void owl_ptr_array_free(GPtrArray *array, GDestroyNotify element_free_func)
+{
+  /* TODO: when we move to requiring glib 2.22+, use
+   * g_ptr_array_new_with_free_func instead. */
+  if (element_free_func)
+    g_ptr_array_foreach(array, (GFunc)element_free_func, NULL);
+  g_ptr_array_free(array, true);
+}
+
 /* Break a command line up into argv, argc.  The caller must free
    the returned values with g_strfreev.  If there is an error argc will be set
    to -1, argv will be NULL and the caller does not need to free anything. The
    returned vector is NULL-terminated. */
-G_GNUC_WARN_UNUSED_RESULT char **owl_parseline(const char *line, int *argc)
+CALLER_OWN char **owl_parseline(const char *line, int *argc)
 {
   GPtrArray *argv;
@@ -170 +179 @@
   /* check for unbalanced quotes */
   if (quote!='\0') {
-    /* TODO: when we move to requiring glib 2.22+, use
-     * g_ptr_array_new_with_free_func. */
-    g_ptr_array_foreach(argv, (GFunc)g_free, NULL);
-    g_ptr_array_free(argv, true);
+    owl_ptr_array_free(argv, g_free);
     if (argc) *argc = -1;
     return(NULL);
@@ -245 +251 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_string_build_quoted(const char *tmpl, ...)
+CALLER_OWN char *owl_string_build_quoted(const char *tmpl, ...)
 {
   GString *buf = g_string_new("");
@@ -257 +263 @@
 /* Returns a quoted version of arg suitable for placing in a
  * command-line. Result should be freed with g_free. */
-G_GNUC_WARN_UNUSED_RESULT char *owl_arg_quote(const char *arg)
+CALLER_OWN char *owl_arg_quote(const char *arg)
 {
   GString *buf = g_string_new("");;
@@ -265 +271 @@
 
 /* caller must free the return */
-G_GNUC_WARN_UNUSED_RESULT char *owl_util_minutes_to_timestr(int in)
+CALLER_OWN char *owl_util_minutes_to_timestr(int in)
 {
   int days, hours;
@@ -331 +337 @@
 
 /* Get the default tty name.  Caller must free the return */
-G_GNUC_WARN_UNUSED_RESULT char *owl_util_get_default_tty(void)
+CALLER_OWN char *owl_util_get_default_tty(void)
 {
   const char *tmp;
@@ -353 +359 @@
  * return.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_util_stripnewlines(const char *in)
+CALLER_OWN char *owl_util_stripnewlines(const char *in)
 {
   
@@ -384 +390 @@
  * Error conditions are the same as g_file_read_link.
  */
-G_GNUC_WARN_UNUSED_RESULT gchar *owl_util_recursive_resolve_link(const char *filename)
+CALLER_OWN gchar *owl_util_recursive_resolve_link(const char *filename)
 {
   gchar *last_path = g_strdup(filename);
@@ -511 +517 @@
    The caller is responsible for freeing the allocated string.
 */
-G_GNUC_WARN_UNUSED_RESULT char *owl_util_baseclass(const char *class)
+CALLER_OWN char *owl_util_baseclass(const char *class)
 {
   char *start, *end;
@@ -547 +553 @@
 /* Strips format characters from a valid utf-8 string. Returns the
    empty string if 'in' does not validate.  Caller must free the return. */
-G_GNUC_WARN_UNUSED_RESULT char *owl_strip_format_chars(const char *in)
+CALLER_OWN char *owl_strip_format_chars(const char *in)
 {
   char *r;
@@ -586 +592 @@
  * Caller must free the return.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_validate_or_convert(const char *in)
+CALLER_OWN char *owl_validate_or_convert(const char *in)
 {
   if (g_utf8_validate(in, -1, NULL)) {
@@ -602 +608 @@
  * Caller must free the return.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_validate_utf8(const char *in)
+CALLER_OWN char *owl_validate_utf8(const char *in)
 {
   char *out;
@@ -635 +641 @@
 
 /* caller must free the return */
-G_GNUC_WARN_UNUSED_RESULT char *owl_escape_highbit(const char *str)
+CALLER_OWN char *owl_escape_highbit(const char *str)
 {
   GString *out = g_string_new("");
@@ -698 +704 @@
 
 /* Read the rest of the input available in fp into a string. */
-G_GNUC_WARN_UNUSED_RESULT char *owl_slurp(FILE *fp)
+CALLER_OWN char *owl_slurp(FILE *fp)
 {
   char *buf = NULL;

variable.c

@@ -646 +646 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT owl_variable *owl_variable_newvar(const char *name, const char *summary, const char *description)
+CALLER_OWN owl_variable *owl_variable_newvar(const char *name, const char *summary, const char *description)
 {
   owl_variable * var = g_new0(owl_variable, 1);
@@ -729 +729 @@
 }
 
-void owl_variable_dict_get_names(const owl_vardict *d, owl_list *l) {
-  owl_dict_get_keys(d, l);
+CALLER_OWN GPtrArray *owl_variable_dict_get_names(const owl_vardict *d) {
+  return owl_dict_get_keys(d);
 }
 
@@ -825 +825 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_variable_get_tostring(const owl_vardict *d, const char *name)
+CALLER_OWN char *owl_variable_get_tostring(const owl_vardict *d, const char *name)
 {
   owl_variable *v;
@@ -834 +834 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_variable_get_default_tostring(const owl_vardict *d, const char *name)
+CALLER_OWN char *owl_variable_get_default_tostring(const owl_vardict *d, const char *name)
 {
   owl_variable *v;
@@ -995 +995 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_variable_bool_get_tostring_default(const owl_variable *v, const void *val)
+CALLER_OWN char *owl_variable_bool_get_tostring_default(const owl_variable *v, const void *val)
 {
   if (val == NULL) {
@@ -1031 +1031 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_variable_int_get_tostring_default(const owl_variable *v, const void *val)
+CALLER_OWN char *owl_variable_int_get_tostring_default(const owl_variable *v, const void *val)
 {
   if (val == NULL) {
@@ -1071 +1071 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_variable_enum_get_tostring(const owl_variable *v, const void *val)
+CALLER_OWN char *owl_variable_enum_get_tostring(const owl_variable *v, const void *val)
 {
   char **enums;
@@ -1112 +1112 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_variable_string_get_tostring_default(const owl_variable *v, const void *val)
+CALLER_OWN char *owl_variable_string_get_tostring_default(const owl_variable *v, const void *val)
 {
   if (val == NULL) {

view.c

@@ -37 +37 @@
   ml=&(v->ml);
 
-  /* nuke the old list */
-  owl_list_cleanup(&ml->list, NULL);
+  /* nuke the old list, don't free the messages */
+  owl_messagelist_cleanup(ml, false);
   owl_messagelist_create(&(v->ml));
 
@@ -159 +159 @@
 void owl_view_cleanup(owl_view *v)
 {
-  owl_list_cleanup(&v->ml.list, NULL);
+  owl_messagelist_cleanup(&v->ml, false);
   g_free(v->name);
 }

viewwin.c

@@ -12 +12 @@
  * will be used by the viewwin
  */
-G_GNUC_WARN_UNUSED_RESULT owl_viewwin *owl_viewwin_new_text(owl_window *win, const char *text)
+CALLER_OWN owl_viewwin *owl_viewwin_new_text(owl_window *win, const char *text)
 {
   owl_viewwin *v = g_new0(owl_viewwin, 1);
@@ -34 +34 @@
  * will be used by the viewwin
  */
-G_GNUC_WARN_UNUSED_RESULT owl_viewwin *owl_viewwin_new_fmtext(owl_window *win, const owl_fmtext *fmtext)
+CALLER_OWN owl_viewwin *owl_viewwin_new_fmtext(owl_window *win, const owl_fmtext *fmtext)
 {
   char *text;
@@ -237 +237 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT owl_editwin *owl_viewwin_set_typwin_active(owl_viewwin *v, owl_history *hist) {
+CALLER_OWN owl_editwin *owl_viewwin_set_typwin_active(owl_viewwin *v, owl_history *hist) {
   int lines, cols;
   owl_editwin *cmdline;

window.c

@@ -569 +569 @@
 };
 
-G_GNUC_WARN_UNUSED_RESULT GSource *owl_window_redraw_source_new(void)
+CALLER_OWN GSource *owl_window_redraw_source_new(void)
 {
   GSource *source;

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);

zcrypt.c

@@ -27 +27 @@
 #include "filterproc.h"
 
+/* Annotate functions in which the caller owns the return value and is
+ * responsible for ensuring it is freed. */
+#define CALLER_OWN G_GNUC_WARN_UNUSED_RESULT
+
 #define MAX_KEY      128
 #define MAX_LINE     128
@@ -53 +57 @@
 } ZWRITEOPTIONS;
 
-G_GNUC_WARN_UNUSED_RESULT char *GetZephyrVarKeyFile(const char *whoami, const char *class, const char *instance);
+CALLER_OWN char *GetZephyrVarKeyFile(const char *whoami, const char *class, const char *instance);
 int ParseCryptSpec(const char *spec, const char **keyfile);
-G_GNUC_WARN_UNUSED_RESULT char *BuildArgString(char **argv, int start, int end);
-G_GNUC_WARN_UNUSED_RESULT char *read_keystring(const char *keyfile);
+CALLER_OWN char *BuildArgString(char **argv, int start, int end);
+CALLER_OWN char *read_keystring(const char *keyfile);
 
 int do_encrypt(int zephyr, const char *class, const char *instance,
@@ -364 +368 @@
 /* Build a space-separated string from argv from elements between start  *
  * and end - 1.  malloc()'s the returned string. */
-G_GNUC_WARN_UNUSED_RESULT char *BuildArgString(char **argv, int start, int end)
+CALLER_OWN char *BuildArgString(char **argv, int start, int end)
 {
   int len = 1;
@@ -401 +405 @@
 #define MAX_SEARCH 3
 /* Find the class/instance in the .crypt-table */
-G_GNUC_WARN_UNUSED_RESULT char *GetZephyrVarKeyFile(const char *whoami, const char *class, const char *instance)
+CALLER_OWN char *GetZephyrVarKeyFile(const char *whoami, const char *class, const char *instance)
 {
   char *keyfile = NULL;
@@ -579 +583 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *slurp_stdin(int ignoredot, int *length) {
+CALLER_OWN char *slurp_stdin(int ignoredot, int *length) {
   char *buf;
   char *inptr;
@@ -611 +615 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *GetInputBuffer(ZWRITEOPTIONS *zoptions, int *length) {
+CALLER_OWN char *GetInputBuffer(ZWRITEOPTIONS *zoptions, int *length) {
   char *buf;
 
@@ -637 +641 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *read_keystring(const char *keyfile) {
+CALLER_OWN char *read_keystring(const char *keyfile) {
   char *keystring;
   FILE *fkey = fopen(keyfile, "r");

zephyr.c

@@ -524 +524 @@
  */
 #ifdef HAVE_LIBZEPHYR
-G_GNUC_WARN_UNUSED_RESULT char *owl_zephyr_get_field(const ZNotice_t *n, int j)
+CALLER_OWN char *owl_zephyr_get_field(const ZNotice_t *n, int j)
 {
   int i, count, save;
@@ -552 +552 @@
 }
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_zephyr_get_field_as_utf8(const ZNotice_t *n, int j)
+CALLER_OWN char *owl_zephyr_get_field_as_utf8(const ZNotice_t *n, int j)
 {
   int i, count, save;
@@ -584 +584 @@
 }
 #else
-G_GNUC_WARN_UNUSED_RESULT char *owl_zephyr_get_field(void *n, int j)
+CALLER_OWN char *owl_zephyr_get_field(void *n, int j)
 {
   return(g_strdup(""));
 }
-G_GNUC_WARN_UNUSED_RESULT char *owl_zephyr_get_field_as_utf8(void *n, int j)
+CALLER_OWN char *owl_zephyr_get_field_as_utf8(void *n, int j)
 {
   return owl_zephyr_get_field(n, j);
@@ -621 +621 @@
  * caller must free the return
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_zephyr_get_message(const ZNotice_t *n, const owl_message *m)
+CALLER_OWN char *owl_zephyr_get_message(const ZNotice_t *n, const owl_message *m)
 {
 #define OWL_NFIELDS     5
@@ -838 +838 @@
       zw.opcode = g_strdup(retnotice->z_opcode);
       zw.zsig   = g_strdup("");
-      owl_list_create(&(zw.recips));
-      owl_list_append_element(&(zw.recips), g_strdup(retnotice->z_recipient));
+      zw.recips = g_ptr_array_new();
+      g_ptr_array_add(zw.recips, g_strdup(retnotice->z_recipient));
 
       owl_log_outgoing_zephyr_error(&zw, buff);
@@ -942 +942 @@
 #endif
 
-G_GNUC_WARN_UNUSED_RESULT char *owl_zephyr_zlocate(const char *user, int auth)
+CALLER_OWN char *owl_zephyr_zlocate(const char *user, int auth)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -1042 +1042 @@
 
 /* caller must free the return */
-G_GNUC_WARN_UNUSED_RESULT char *owl_zephyr_makesubline(const char *class, const char *inst, const char *recip)
+CALLER_OWN char *owl_zephyr_makesubline(const char *class, const char *inst, const char *recip)
 {
   return g_strdup_printf("%s,%s,%s\n", class, inst, !strcmp(recip, "") ? "*" : recip);
@@ -1122 +1122 @@
  * free the return.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_zephyr_getsubs(void)
+CALLER_OWN char *owl_zephyr_getsubs(void)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -1242 +1242 @@
  * The caller must free the return
  */
-G_GNUC_WARN_UNUSED_RESULT char *short_zuser(const char *in)
+CALLER_OWN char *short_zuser(const char *in)
 {
   char *ptr = strrchr(in, '@');
@@ -1254 +1254 @@
  * The caller must free the return.
  */
-G_GNUC_WARN_UNUSED_RESULT char *long_zuser(const char *in)
+CALLER_OWN char *long_zuser(const char *in)
 {
   char *ptr = strrchr(in, '@');
@@ -1282 +1282 @@
  * caller must free the return.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_zephyr_smartstripped_user(const char *in)
+CALLER_OWN char *owl_zephyr_smartstripped_user(const char *in)
 {
   char *slash, *dot, *realm, *out;
@@ -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
 }

zwrite.c

@@ -5 +5 @@
 #include "owl.h"
 
-G_GNUC_WARN_UNUSED_RESULT owl_zwrite *owl_zwrite_new(const char *line)
+CALLER_OWN owl_zwrite *owl_zwrite_new(const char *line)
 {
   owl_zwrite *z = g_new(owl_zwrite, 1);
@@ -34 +34 @@
   z->cc=0;
   z->noping=0;
-  owl_list_create(&(z->recips));
+  z->recips = g_ptr_array_new();
   z->zwriteline = g_strdup(line);
 
@@ -97 +97 @@
       }
       /* we must already have users or a class or an instance */
-      if (owl_list_get_size(&(z->recips))<1 && (!z->class) && (!z->inst)) {
+      if (z->recips->len < 1 && (!z->class) && (!z->inst)) {
         badargs=1;
         break;
@@ -117 +117 @@
     } else {
       /* anything unattached is a recipient */
-      owl_list_append_element(&(z->recips), owl_validate_utf8(myargv[0]));
+      g_ptr_array_add(z->recips, owl_validate_utf8(myargv[0]));
       myargv++;
       myargc--;
@@ -131 +131 @@
   if (z->class == NULL &&
       z->inst == NULL &&
-      owl_list_get_size(&(z->recips))==0) {
+      z->recips->len == 0) {
     owl_function_error("You must specify a recipient for zwrite");
     return(-1);
@@ -162 +162 @@
 void owl_zwrite_send_ping(const owl_zwrite *z)
 {
-  int i, j;
+  int i;
   char *to;
 
@@ -173 +173 @@
   /* if there are no recipients we won't send a ping, which
      is what we want */
-  j=owl_list_get_size(&(z->recips));
-  for (i=0; i<j; i++) {
+  for (i = 0; i < z->recips->len; i++) {
     to = owl_zwrite_get_recip_n_with_realm(z, i);
     send_ping(to, z->class, z->inst);
@@ -191 +190 @@
 void owl_zwrite_set_message(owl_zwrite *z, const char *msg)
 {
-  int i, j;
+  int i;
   GString *message;
   char *tmp = NULL, *tmp2;
@@ -197 +196 @@
   g_free(z->message);
 
-  j=owl_list_get_size(&(z->recips));
-  if (j>0 && z->cc) {
+  if (z->recips->len > 0 && z->cc) {
     message = g_string_new("CC: ");
-    for (i=0; i<j; i++) {
+    for (i = 0; i < z->recips->len; i++) {
       tmp = owl_zwrite_get_recip_n_with_realm(z, i);
       g_string_append_printf(message, "%s ", tmp);
@@ -233 +231 @@
 int owl_zwrite_send_message(const owl_zwrite *z)
 {
-  int i, j, ret = 0;
+  int i, ret = 0;
   char *to = NULL;
 
   if (z->message==NULL) return(-1);
 
-  j=owl_list_get_size(&(z->recips));
-  if (j>0) {
-    for (i=0; i<j; i++) {
+  if (z->recips->len > 0) {
+    for (i = 0; i < z->recips->len; i++) {
       to = owl_zwrite_get_recip_n_with_realm(z, i);
       ret = send_zephyr(z->opcode, z->zsig, z->class, z->inst, to, z->message);
@@ -312 +309 @@
 int owl_zwrite_get_numrecips(const owl_zwrite *z)
 {
-  return(owl_list_get_size(&(z->recips)));
+  return z->recips->len;
 }
 
 const char *owl_zwrite_get_recip_n(const owl_zwrite *z, int n)
 {
-  return(owl_list_get_element(&(z->recips), n));
+  return z->recips->pdata[n];
 }
 
 /* Caller must free the result. */
-G_GNUC_WARN_UNUSED_RESULT char *owl_zwrite_get_recip_n_with_realm(const owl_zwrite *z, int n)
+CALLER_OWN char *owl_zwrite_get_recip_n_with_realm(const owl_zwrite *z, int n)
 {
   if (z->realm[0]) {
@@ -333 +330 @@
 {
   /* return true if at least one of the recipients is personal */
-  int i, j;
-  char *foo;
-
-  j=owl_list_get_size(&(z->recips));
-  for (i=0; i<j; i++) {
-    foo=owl_list_get_element(&(z->recips), i);
-    if (foo[0]!='@') return(1);
+  int i;
+  char *recip;
+
+  for (i = 0; i < z->recips->len; i++) {
+    recip = z->recips->pdata[i];
+    if (recip[0] != '@') return 1;
   }
   return(0);
@@ -352 +348 @@
 void owl_zwrite_cleanup(owl_zwrite *z)
 {
-  owl_list_cleanup(&(z->recips), &g_free);
+  owl_ptr_array_free(z->recips, g_free);
   g_free(z->cmd);
   g_free(z->zwriteline);
@@ -370 +366 @@
  * If not a CC, only the recip_index'th user will be replied to.
  */
-G_GNUC_WARN_UNUSED_RESULT char *owl_zwrite_get_replyline(const owl_zwrite *z, int recip_index)
+CALLER_OWN char *owl_zwrite_get_replyline(const owl_zwrite *z, int recip_index)
 {
   /* Match ordering in zwrite help. */
@@ -403 +399 @@
   }
   if (z->cc) {
-    for (i = 0; i < owl_list_get_size(&(z->recips)); i++) {
+    for (i = 0; i < z->recips->len; i++) {
       g_string_append_c(buf, ' ');
-      owl_string_append_quoted_arg(buf, owl_list_get_element(&(z->recips), i));
+      owl_string_append_quoted_arg(buf, z->recips->pdata[i]);
     }
-  } else if (recip_index < owl_list_get_size(&(z->recips))) {
+  } else if (recip_index < z->recips->len) {
     g_string_append_c(buf, ' ');
-    owl_string_append_quoted_arg(buf, owl_list_get_element(&(z->recips), recip_index));
+    owl_string_append_quoted_arg(buf, z->recips->pdata[recip_index]);
   }