Changeset f4e857f

Timestamp:

Jun 27, 2011, 4:28:51 AM (14 years ago)

Author:

Jason Gross <jgross@mit.edu>

Children:

0d935a1

Parents:

eeba011

git-author:

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

git-committer:

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

Message:

Removed some NULL checks for things that really shouldn't ever be NULL

If a BarnOwl variable can't be gotten, then something is horribly wrong,
and if it can't be gotten as a string, then perl will be confused (and
something is probably horribly wrong anyway).

Additionally, our variable descriptions shoud be descriptive.  Valid
settings should not be NULL (and NULL is more likely indicative of
forgetting to set it than actually wanting an empty valid set).

File:

• variable.c (modified) (7 diffs)

variable.c

@@ -726 +726 @@
 
 const char *owl_variable_get_validsettings(const owl_variable *v) {
-  if (v->validsettings) {
-    return v->validsettings;
-  } else {
-    return "";
-  }
+  return v->validsettings;
 }
 
@@ -758 +754 @@
     return -1;
   }
-  if (msg && v->get_tostring_fn) {
+  if (msg) {
     tostring = v->get_tostring_fn(v, v->get_fn(v));
     owl_function_makemsg("%s = '%s'", name, tostring);
@@ -797 +793 @@
   if (!name) return NULL;
   v = owl_dict_find_element(d, name);
-  if (v == NULL || !v->get_tostring_fn) return NULL;
+  if (v == NULL) return NULL;
   return v->get_tostring_fn(v, v->get_fn(v));
 }
@@ -806 +802 @@
   if (!name) return NULL;
   v = owl_dict_find_element(d, name);
-  if (v == NULL || !v->get_tostring_fn) return NULL;
+  if (v == NULL) return NULL;
   if (v->type == OWL_VARIABLE_INT || v->type == OWL_VARIABLE_BOOL) {
     return v->get_tostring_fn(v, &(v->ival_default));
@@ -819 +815 @@
   if (!name) return(NULL);
   v = owl_dict_find_element(d, name);
-  if (v == NULL || !v->get_fn) return NULL;
+  if (v == NULL) return NULL;
   return v;
 }
@@ -862 +858 @@
 
   if (!name
-      || (v = owl_dict_find_element(d, name)) == NULL 
-      || !v->get_fn) {
+      || (v = owl_dict_find_element(d, name)) == NULL) {
     owl_fmtext_appendf_normal(fm, "     No such variable '%s'\n", name);
     return;
@@ -883 +878 @@
 
   if (!name
-      || (v = owl_dict_find_element(d, name)) == NULL 
-      || !v->get_fn) {
+      || (v = owl_dict_find_element(d, name)) == NULL) { 
     owl_fmtext_append_normal(fm, "No such variable...\n");
     return;