Changeset ce68f23 for dict.c

Timestamp:

Jun 25, 2011, 3:26:16 AM (14 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:

• dict.c (modified) (1 diff)

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