Changeset f25df21

Timestamp:

Mar 24, 2011, 4:05:29 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

c809f5e

Parents:

e56303f

git-author:

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

git-committer:

David Benjamin <davidben@mit.edu> (03/24/11 16:05:29)

Message:

Don't call owl_list_create in owl_dict_get_keys

Until we get rid of this owl_list thing altogether, there should be a
convention as to who initializes the thing. Otherwise, we leak memory
from people initializing it too many times.

Whoever reviews this probably wants to look over this very carefully in
case I missed one of the owl_list_creates.

Also kill the various wrappers over owl_list_cleanup as they are not the
inverse of any operation.

Files:

• cmd.c (modified) (2 diffs)
• dict.c (modified) (1 diff)
• functions.c (modified) (8 diffs)
• global.c (modified) (1 diff)
• help.c (modified) (2 diffs)
• keymap.c (modified) (1 diff)
• perlconfig.c (modified) (1 diff)
• perlglue.xs (modified) (1 diff)
• tester.c (modified) (1 diff)
• variable.c (modified) (1 diff)

cmd.c

@@ -33 +33 @@
 }
 
-/* free the list with owl_cmddict_namelist_cleanup */
 void owl_cmddict_get_names(const owl_cmddict *d, owl_list *l) {
   owl_dict_get_keys(d, l);
@@ -40 +39 @@
 const owl_cmd *owl_cmddict_find(const owl_cmddict *d, const char *name) {
   return owl_dict_find_element(d, name);
-}
-
-void owl_cmddict_namelist_cleanup(owl_list *l)
-{
-  owl_list_cleanup(l, g_free);
 }
 

dict.c

@@ -58 +58 @@
 }
 
-/* creates a list and fills it in with keys.  duplicates the keys, 
+/* Appends dictionary keys to a list.  Duplicates the keys,
  * so they will need to be freed by the caller. */
 int owl_dict_get_keys(const owl_dict *d, owl_list *l) {
   int i;
   char *dupk;
-  if (owl_list_create(l)) return(-1);
   for (i=0; i<d->size; i++) {
     if ((dupk = g_strdup(d->els[i].k)) == NULL) return(-1);

functions.c

@@ -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);
   owl_fmtext_append_normal(&fm, "\n");
   owl_function_popless_fmtext(&fm);
-  owl_cmddict_namelist_cleanup(&l);
+  owl_list_cleanup(&l, g_free);
   owl_fmtext_cleanup(&fm);
 }
@@ -85 +86 @@
   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);
@@ -1623 +1625 @@
   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);
@@ -1637 +1640 @@
   }
   g_string_append(str, "\n");
-  owl_variable_dict_namelist_cleanup(&varnames);
+  owl_list_cleanup(&varnames, g_free);
 
   owl_function_popless_text(str->str);
@@ -1653 +1656 @@
   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);
@@ -1661 +1665 @@
     }
   }
-  owl_variable_dict_namelist_cleanup(&varnames);
+  owl_list_cleanup(&varnames, g_free);
   owl_function_popless_fmtext(&fm);
   owl_fmtext_cleanup(&fm);
@@ -2874 +2878 @@
   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);
@@ -2888 +2893 @@
   
   owl_function_popless_fmtext(&fm);
-  owl_keyhandler_keymap_namelist_cleanup(&l);
+  owl_list_cleanup(&l, g_free);
   owl_fmtext_cleanup(&fm);
 }

global.c

@@ -764 +764 @@
 }
 
-/* creates a list and fills it in with keys.  duplicates the keys, 
- * so they will need to be freed by the caller. */
 int owl_global_get_style_names(const owl_global *g, owl_list *l) {
   return owl_dict_get_keys(&(g->styledict), l);

help.c

@@ -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);
@@ -137 +138 @@
     }
   }
-  owl_variable_dict_namelist_cleanup(&varnames);
+  owl_list_cleanup(&varnames, g_free);
 
   owl_fmtext_append_normal(&fm, "\n");

keymap.c

@@ -217 +217 @@
 }
 
-/* free the list with owl_cmddict_namelist_cleanup */
 void owl_keyhandler_get_keymap_names(const owl_keyhandler *kh, owl_list *l)
 {
   owl_dict_get_keys(&kh->keymaps, l);
 }
-
-void owl_keyhandler_keymap_namelist_cleanup(owl_list *l)
-{
-  owl_list_cleanup(l, g_free);
-}
-
 
 

perlconfig.c

@@ -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++) {

perlglue.xs

@@ -389 +389 @@
         {
                 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);

tester.c

@@ -248 +248 @@
 
   FAIL_UNLESS("get_size", 3==owl_dict_get_size(&d));
+  owl_list_create(&l);
   FAIL_UNLESS("get_keys", 0==owl_dict_get_keys(&d, &l));
   FAIL_UNLESS("get_keys result size", 3==owl_list_get_size(&l));

variable.c

@@ -632 +632 @@
 }
 
-/* free the list with owl_variable_dict_namelist_cleanup */
 void owl_variable_dict_get_names(const owl_vardict *d, owl_list *l) {
   owl_dict_get_keys(d, l);
-}
-
-void owl_variable_dict_namelist_cleanup(owl_list *l)
-{
-  owl_list_cleanup(l, g_free);
 }