Changeset ce68f23 for perlconfig.c

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:

• perlconfig.c (modified) (4 diffs)

perlconfig.c

@@ -36 +36 @@
 }
 
-CALLER_OWN 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));
   }
@@ -55 +55 @@
 {
   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;