Changeset a1074de

Timestamp:

Mar 7, 2010, 10:26:09 PM (14 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.6, release-1.7, release-1.8, release-1.9

Children:

bf7aa1d

Parents:

0e57335

git-author:

Anders Kaseorg <andersk@mit.edu> (02/27/10 22:21:53)

git-committer:

Anders Kaseorg <andersk@mit.edu> (03/07/10 22:26:09)

Message:

owl_dict_insert_element: Rename free_on_replace argument to delete_on_replace.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-by: Nelson Elhage <nelhage@mit.edu>

Files:

• dict.c (modified) (2 diffs)
• filterelement.c (modified) (2 diffs)
• tester.c (modified) (1 diff)

dict.c

@@ -71 +71 @@
 }
 
-void owl_dict_noop_free(void *x) {
+void owl_dict_noop_delete(void *x)
+{
   return;
 }
@@ -77 +78 @@
 /* Returns 0 on success.  Will copy the key but make 
    a reference to the value.  Will clobber an existing 
-   entry with the same key iff free_on_replace!=NULL,
-   and will run free_on_replace on the old element.
+   entry with the same key iff delete_on_replace!=NULL,
+   and will run delete_on_replace on the old element.
    Will return -2 if replace=NULL and match was found.
 */
-int owl_dict_insert_element(owl_dict *d, const char *k, void *v, void (*free_on_replace)(void *old)) {
+int owl_dict_insert_element(owl_dict *d, const char *k, void *v, void (*delete_on_replace)(void *old))
+{
   int pos, found;
   char *dupk;
   found = _owl_dict_find_pos(d, k, &pos);
-  if (found && free_on_replace) {
-    free_on_replace(d->els[pos].v);
+  if (found && delete_on_replace) {
+    delete_on_replace(d->els[pos].v);
     d->els[pos].v = v;
     return(0);
-  } else if (found && !free_on_replace) {
+  } else if (found && !delete_on_replace) {
     return(-2);
   } else {

filterelement.c

@@ -292 +292 @@
   owl_dict_create(&filters);
 
-  owl_dict_insert_element(&filters, f->name, &fe_visiting, owl_dict_noop_free);
+  owl_dict_insert_element(&filters, f->name, &fe_visiting, owl_dict_noop_delete);
 
   rv = _owl_filterelement_is_toodeep(fe, &filters);
@@ -311 +311 @@
     } else if (nval == NULL) {
       f = owl_global_get_filter(&g, fe->field);
-      owl_dict_insert_element(seen, fe->field, &fe_visiting, owl_dict_noop_free);
+      owl_dict_insert_element(seen, fe->field, &fe_visiting, owl_dict_noop_delete);
       if(f) rv = _owl_filterelement_is_toodeep(f->root, seen);
-      owl_dict_insert_element(seen, fe->field, &fe_visited, owl_dict_noop_free);
+      owl_dict_insert_element(seen, fe->field, &fe_visited, owl_dict_noop_delete);
     }
   } else {

tester.c

@@ -113 +113 @@
   printf("# BEGIN testing owl_dict\n");
   FAIL_UNLESS("create", 0==owl_dict_create(&d));
-  FAIL_UNLESS("insert b", 0==owl_dict_insert_element(&d, "b", bv, owl_dict_noop_free));
-  FAIL_UNLESS("insert d", 0==owl_dict_insert_element(&d, "d", dv, owl_dict_noop_free));
-  FAIL_UNLESS("insert a", 0==owl_dict_insert_element(&d, "a", av, owl_dict_noop_free));
-  FAIL_UNLESS("insert c", 0==owl_dict_insert_element(&d, "c", cv, owl_dict_noop_free));
+  FAIL_UNLESS("insert b", 0==owl_dict_insert_element(&d, "b", bv, owl_dict_noop_delete));
+  FAIL_UNLESS("insert d", 0==owl_dict_insert_element(&d, "d", dv, owl_dict_noop_delete));
+  FAIL_UNLESS("insert a", 0==owl_dict_insert_element(&d, "a", av, owl_dict_noop_delete));
+  FAIL_UNLESS("insert c", 0==owl_dict_insert_element(&d, "c", cv, owl_dict_noop_delete));
   FAIL_UNLESS("reinsert d (no replace)", -2==owl_dict_insert_element(&d, "d", dv, 0));
   FAIL_UNLESS("find a", av==owl_dict_find_element(&d, "a"));