Changeset b75a8ac for variable.c

Timestamp:

Jun 27, 2011, 4:28:52 AM (13 years ago)

Author:

Jason Gross <jgross@mit.edu>

Children:

554787e8

Parents:

0d935a1

git-author:

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

git-committer:

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

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.

File:

• variable.c (modified) (4 diffs)

variable.c

@@ -940 +940 @@
 {
   if (val == NULL) {
-    return g_strdup("<null>");
+    return NULL;
   } else if (*(const int*)val == 0) {
     return g_strdup("off");
@@ -976 +976 @@
 {
   if (val == NULL) {
-    return g_strdup("<null>");
+    return NULL;
   } else {
     return g_strdup_printf("%d", *(const int*)val);
@@ -1020 +1020 @@
 
   if (val == NULL) {
-    return g_strdup("<null>");
+    return NULL;
   }
   enums = g_strsplit_set(v->validsettings, ",", 0);
@@ -1056 +1056 @@
 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);
+}
+