Changeset ce68f23 for perlglue.xs

Timestamp:

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

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

c266281

Parents:

3cdd6d2

git-author:

David Benjamin <davidben@mit.edu> (06/11/11 20:06:46)

git-committer:

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

Message:

Make owl_dict_get_keys return a GPtrArray

Almost all the remaining uses of owl_list are tightly coupled into this
one giant blob.

File:

• perlglue.xs (modified) (7 diffs)

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