Changeset fa981f3 for variable.c

Timestamp:

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

Author:

Jason Gross <jgross@mit.edu>

Branches:

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

Children:

785ee77

Parents:

1dab38e

git-author:

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

git-committer:

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

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) (3 diffs)

variable.c

@@ -770 +770 @@
 
 const char *owl_variable_get_validsettings(const owl_variable *v) {
-  if (v->validsettings) {
-    return v->validsettings;
-  } else {
-    return "";
-  }
+  return v->validsettings;
 }
 
@@ -796 +792 @@
     return -1;
   }
-  if (msg && v->get_tostring_fn) {
+  if (msg) {
     tostring = v->get_tostring_fn(v, v->get_fn(v));
     if (tostring)
@@ -847 +843 @@
 owl_variable *owl_variable_get_var(const owl_vardict *d, const char *name)
 {
-  owl_variable *v;
-  if (!name) return(NULL);
-  v = owl_dict_find_element(d, name);
-  if (v == NULL || !v->get_fn) return NULL;
-  return v;
+  return owl_dict_find_element(d, name);
 }