Changeset ca749a9

Timestamp:

Jul 3, 2011, 8:43:06 PM (13 years ago)

Author:

Jason Gross <jgross@mit.edu>

Branches:

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

Children:

b4a678a

Parents:

ca54fd6

git-author:

Jason Gross <jgross@mit.edu> (06/27/11 04:14:36)

git-committer:

Jason Gross <jgross@mit.edu> (07/03/11 20:43:06)

Message:

Make variable getters return NULL instead of "<null>"

This fixes trac-#184:
Since commit 010a9511420887329269aa51e7598533e826c57f, the default zsigs
show up as empty; BarnOwl::default_zephyr_signature() checks
BarnOwl::getvar('zsigproc') as a boolean (which may be incorrect if you
happen to have a zsigproc called 0). As of that commit, BarnOwl::getvar
returns "<null>" instead of undef.

Files:

• commands.c (modified) (1 diff)
• functions.c (modified) (1 diff)
• variable.c (modified) (8 diffs)

commands.c

@@ -1655 +1655 @@
   if (v) {
     value = owl_variable_get_tostring(v);
-    owl_function_makemsg("%s = '%s'", var, value);
+    if (value == NULL)
+      owl_function_makemsg("%s = <null>", var);
+    else
+      owl_function_makemsg("%s = '%s'", var, value);
     g_free(value);
   } else {

functions.c

@@ -1589 +1589 @@
       var = owl_variable_get_tostring(v);
       if (var) {
-        g_string_append(str, var);
-        g_free(var);
+        g_string_append(str, var);
+        g_free(var);
+      } else {
+        g_string_append(str, "<null>");
       }
     }

variable.c

@@ -795 +795 @@
   if (msg && v->get_tostring_fn) {
     tostring = v->get_tostring_fn(v, v->get_fn(v));
-    owl_function_makemsg("%s = '%s'", owl_variable_get_name(v), tostring);
+    if (tostring)
+      owl_function_makemsg("%s = '%s'", owl_variable_get_name(v), tostring);
+    else
+      owl_function_makemsg("%s = <null>", owl_variable_get_name(v));
     g_free(tostring);
   }    
@@ -897 +900 @@
 void owl_variable_describe(const owl_variable *v, owl_fmtext *fm)
 {
-  char *default_buf = owl_variable_get_default_tostring(v);
-
-  owl_fmtext_appendf_normal(fm, OWL_TABSTR "%-20s - %s (default: '%s')\n",
-                            owl_variable_get_name(v),
-                            owl_variable_get_summary(v), default_buf);
+  char *tostring = owl_variable_get_default_tostring(v);
+  char *default_buf;
+
+  if (tostring)
+    default_buf = g_strdup_printf("'%s'", tostring);
+  else
+    default_buf = g_strdup("<null>");
+  owl_fmtext_appendf_normal(fm, OWL_TABSTR "%-20s - %s (default: %s)\n",
+                            owl_variable_get_name(v),
+                            owl_variable_get_summary(v), default_buf);
   g_free(default_buf);
+  g_free(tostring);
 }
 
@@ -917 +926 @@
   owl_fmtext_append_normal(fm, "Current:        ");
   tostring = owl_variable_get_tostring(v);
-  owl_fmtext_append_normal(fm, tostring);
+  owl_fmtext_append_normal(fm, (tostring ? tostring : "<null>"));
   g_free(tostring);
   owl_fmtext_append_normal(fm, "\n\n");
@@ -924 +933 @@
   tostring = owl_variable_get_default_tostring(v);
   owl_fmtext_append_normal(fm, "Default:        ");
-  owl_fmtext_append_normal(fm, tostring);
+  owl_fmtext_append_normal(fm, (tostring ? tostring : "<null>"));
   owl_fmtext_append_normal(fm, "\n\n");
 
@@ -984 +993 @@
 {
   if (val == NULL) {
-    return g_strdup("<null>");
+    return NULL;
   } else if (*(const int*)val == 0) {
     return g_strdup("off");
@@ -1020 +1029 @@
 {
   if (val == NULL) {
-    return g_strdup("<null>");
+    return NULL;
   } else {
     return g_strdup_printf("%d", *(const int*)val);
@@ -1064 +1073 @@
 
   if (val == NULL) {
-    return g_strdup("<null>");
+    return NULL;
   }
   enums = g_strsplit_set(v->validsettings, ",", 0);
@@ -1100 +1109 @@
 CALLER_OWN char *owl_variable_string_get_tostring_default(const owl_variable *v, const void *val)
 {
-  if (val == NULL) {
-    return g_strdup("<null>");
-  } else {
-    return g_strdup((const char*)val);
-  }
-}
-
+  return g_strdup((const char*)val);
+}
+