Changes in dict.c [4c7c21f:f25df21]

File:

• dict.c (modified) (5 diffs)

dict.c

@@ -15 +15 @@
 #define GROWBY 3 / 2
 
-void owl_dict_create(owl_dict *d) {
+int owl_dict_create(owl_dict *d) {
   d->size=0;
   d->els=g_new(owl_dict_el, INITSIZE);
   d->avail=INITSIZE;
+  if (d->els==NULL) return(-1);
+  return(0);
 }
 
@@ -58 +60 @@
 /* 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) {
+int owl_dict_get_keys(const owl_dict *d, owl_list *l) {
   int i;
+  char *dupk;
   for (i=0; i<d->size; i++) {
-    owl_list_append_element(l, g_strdup(d->els[i].k));
+    if ((dupk = g_strdup(d->els[i].k)) == NULL) return(-1);
+    owl_list_append_element(l, dupk);
   }
+  return(0);
 }
 
@@ -79 +84 @@
 {
   int pos, found;
+  char *dupk;
   found = _owl_dict_find_pos(d, k, &pos);
   if (found && delete_on_replace) {
@@ -93 +99 @@
       if (d->els==NULL) return(-1);
     }
+    if ((dupk = g_strdup(k)) == NULL) return(-1);
     if (pos!=d->size) {
       /* shift forward to leave us a slot */
@@ -99 +106 @@
     }
     d->size++;
-    d->els[pos].k = g_strdup(k);
+    d->els[pos].k = dupk;
     d->els[pos].v = v;    
     return(0);