Changeset d4927a7 for variable.c

Timestamp:

Feb 11, 2011, 4:31:46 PM (13 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

3472845

Parents:

ddbbcffa

git-author:

Anders Kaseorg <andersk@mit.edu> (08/27/09 00:55:10)

git-committer:

Anders Kaseorg <andersk@mit.edu> (02/11/11 16:31:46)

Message:

Replace owl_strdup with g_strdup.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-by: Karl Ramm <kcr@mit.edu>

File:

• variable.c (modified) (5 diffs)

variable.c

@@ -482 +482 @@
     *cur = *var;
     /* strdup all the strings so we can delete them consistently. */
-    cur->name = owl_strdup(var->name);
-    cur->summary = owl_strdup(var->summary);
-    cur->description = owl_strdup(var->description);
+    cur->name = g_strdup(var->name);
+    cur->summary = g_strdup(var->summary);
+    cur->description = g_strdup(var->description);
     switch (cur->type) {
     case OWL_VARIABLE_OTHER:
@@ -552 +552 @@
 owl_variable * owl_variable_newvar(const char *name, const char *summary, const char * description) {
   owl_variable * var = g_new0(owl_variable, 1);
-  var->name = owl_strdup(name);
-  var->summary = owl_strdup(summary);
-  var->description = owl_strdup(description);
+  var->name = g_strdup(name);
+  var->summary = g_strdup(summary);
+  var->description = g_strdup(description);
   return var;
 }
@@ -560 +560 @@
 void owl_variable_update(owl_variable *var, const char *summary, const char *desc) {
   if(var->summary) g_free(var->summary);
-  var->summary = owl_strdup(summary);
+  var->summary = g_strdup(summary);
   if(var->description) g_free(var->description);
-  var->description = owl_strdup(desc);
+  var->description = g_strdup(desc);
 }
 
@@ -570 +570 @@
     owl_variable_update(old, summ, desc);
     if(old->pval_default) g_free(old->pval_default);
-    old->pval_default = owl_strdup(initval);
+    old->pval_default = g_strdup(initval);
   } else {
     owl_variable * var = owl_variable_newvar(name, summ, desc);
     var->type = OWL_VARIABLE_STRING;
-    var->pval_default = owl_strdup(initval);
+    var->pval_default = g_strdup(initval);
     var->set_fn = owl_variable_string_set_default;
     var->set_fromstring_fn = owl_variable_string_set_fromstring_default;
@@ -1009 +1009 @@
   }
   if (v->val) g_free(v->val);
-  v->val = owl_strdup(newval);
+  v->val = g_strdup(newval);
   return(0);
 }