Changes in dict.c [4c7c21f:f271129]

File:

• dict.c (modified) (3 diffs)

dict.c

@@ -6 +6 @@
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #include "owl.h"
-
 
 #define INITSIZE 30
@@ -56 +52 @@
 }
 
-/* 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 +105 @@
 /* Doesn't free the value of the element, but does
  * return it so the caller can free it. */
-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;
   int pos, found;