Changeset 5001a3d

Timestamp:

Feb 19, 2013, 8:29:04 PM (11 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10

Children:

897fc1c

Parents:

353719a

git-author:

David Benjamin <davidben@mit.edu> (06/09/12 22:09:03)

git-committer:

David Benjamin <davidben@mit.edu> (02/19/13 20:29:04)

Message:

g_strdup validsettings

This'll allow perl to set it too.

Files:

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

owl.h

@@ -236 +236 @@
   int   type;  /* OWL_VARIABLE_* */
   char *default_str;            /* the default value as a string */
-  const char *validsettings;    /* documentation of valid settings */
+  char *validsettings;          /* documentation of valid settings */
   char *summary;                /* summary of usage */
   char *description;            /* detailed description */
-  GValue val;                    /* current value */
+  GValue val;                   /* current value */
   GClosure *set_fromstring_fn;
                                 /* sets the variable to a value

variable.c

@@ -623 +623 @@
     newvar->summary = g_strdup(init_params->summary);
     newvar->description = g_strdup(init_params->description);
-    newvar->validsettings = init_params->validsettings;
+    newvar->validsettings = g_strdup(init_params->validsettings);
     GCallback fn = NULL;
     switch (init_params->type) {
@@ -719 +719 @@
     owl_variable * var = owl_variable_newvar(name, summ, desc);
     var->type = OWL_VARIABLE_STRING;
-    var->validsettings = "<string>";
+    var->validsettings = g_strdup("<string>");
     g_value_init(&var->val, G_TYPE_STRING);
     OWL_VARIABLE_SETUP_DEFAULT_FUNCS(var, string, STRING);
@@ -743 +743 @@
     owl_variable * var = owl_variable_newvar(name, summ, desc);
     var->type = OWL_VARIABLE_INT;
-    var->validsettings = "<int>";
+    var->validsettings = g_strdup("<int>");
     g_value_init(&var->val, G_TYPE_INT);
     OWL_VARIABLE_SETUP_DEFAULT_FUNCS(var, int, INT);
@@ -767 +767 @@
     owl_variable * var = owl_variable_newvar(name, summ, desc);
     var->type = OWL_VARIABLE_BOOL;
-    var->validsettings = "on,off";
+    var->validsettings = g_strdup("on,off");
     g_value_init(&var->val, G_TYPE_BOOLEAN);
     OWL_VARIABLE_SETUP_DEFAULT_FUNCS(var, bool, BOOLEAN);
@@ -795 +795 @@
   g_free(v->description);
   g_free(v->default_str);
+  g_free(v->validsettings);
   g_value_unset(&(v->val));
   g_closure_unref(v->get_tostring_fn);