Changeset bbd74a9

Timestamp:

Mar 7, 2010, 10:25:56 PM (15 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:

0fef6eb

Parents:

3b0edaa

git-author:

Anders Kaseorg <andersk@mit.edu> (02/27/10 20:13:32)

git-committer:

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

Message:

Rename owl_variable.free_fn to delete_fn.

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

Files:

• owl.h (modified) (1 diff)
• variable.c (modified) (8 diffs)

owl.h

@@ -252 +252 @@
                                 /* converts val to a string 
                                  * and puts into buf */
-  void  (*free_fn)(struct _owl_variable *v);
+  void (*delete_fn)(struct _owl_variable *v);
                                 /* frees val as needed */
 } owl_variable;

variable.c

@@ -482 +482 @@
       if (!cur->get_tostring_fn) 
         cur->get_tostring_fn = owl_variable_string_get_tostring_default;      
-      if (!cur->free_fn) 
-        cur->free_fn = owl_variable_free_default;
+      if (!cur->delete_fn)
+        cur->delete_fn = owl_variable_delete_default;
       cur->set_fn(cur, cur->pval_default);
       break;
@@ -497 +497 @@
       if (!cur->get_tostring_fn) 
         cur->get_tostring_fn = owl_variable_bool_get_tostring_default;      
-      if (!cur->free_fn) 
-        cur->free_fn = owl_variable_free_default;
+      if (!cur->delete_fn)
+        cur->delete_fn = owl_variable_delete_default;
       cur->val = owl_malloc(sizeof(int));
       cur->set_fn(cur, &cur->ival_default);
@@ -513 +513 @@
       if (!cur->get_tostring_fn) 
         cur->get_tostring_fn = owl_variable_int_get_tostring_default;      
-      if (!cur->free_fn) 
-        cur->free_fn = owl_variable_free_default;
+      if (!cur->delete_fn)
+        cur->delete_fn = owl_variable_delete_default;
       cur->val = owl_malloc(sizeof(int));
       cur->set_fn(cur, &cur->ival_default);
@@ -562 +562 @@
     var->get_fn = owl_variable_get_default;
     var->get_tostring_fn = owl_variable_string_get_tostring_default;
-    var->free_fn = owl_variable_free_default;
+    var->delete_fn = owl_variable_delete_default;
     var->set_fn(var, initval);
     owl_variable_dict_add_variable(vd, var);
@@ -582 +582 @@
     var->get_fn = owl_variable_get_default;
     var->get_tostring_fn = owl_variable_int_get_tostring_default;
-    var->free_fn = owl_variable_free_default;
+    var->delete_fn = owl_variable_delete_default;
     var->val = owl_malloc(sizeof(int));
     var->set_fn(var, &initval);
@@ -603 +603 @@
     var->get_fn = owl_variable_get_default;
     var->get_tostring_fn = owl_variable_bool_get_tostring_default;
-    var->free_fn = owl_variable_free_default;
+    var->delete_fn = owl_variable_delete_default;
     var->val = owl_malloc(sizeof(int));
     var->set_fn(var, &initval);
@@ -625 +625 @@
 void owl_variable_delete(owl_variable *v)
 {
-  if (v->free_fn) v->free_fn(v);
+  if (v->delete_fn) v->delete_fn(v);
   owl_free(v);
 }
@@ -845 +845 @@
 }
 
-void owl_variable_free_default(owl_variable *v) {
+void owl_variable_delete_default(owl_variable *v)
+{
   if (v->val) owl_free(v->val);
 }