Changeset 010a951 for functions.c

Timestamp:

Mar 5, 2011, 3:25:29 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

e3a75ed

Parents:

9620c8d

git-author:

David Benjamin <davidben@mit.edu> (02/28/11 10:53:18)

git-committer:

David Benjamin <davidben@mit.edu> (03/05/11 15:25:29)

Message:

Make owl_variable's get_tostring_fn return a newly allocated string

The mess with buffer lengths and whatnot is obnoxious. Note that this
does change semantics slightly: instead of (optionally) filling a buffer
and giving a return code for good vs no-variable/invalid, we now return
NULL for missing variables and always return a string if the variable
exists. This also appears to be more accurate from the perspective of
the calls anyway.

File:

• functions.c (modified) (2 diffs)

functions.c

@@ -1616 +1616 @@
 {
   const char *name;
-  char var[LINE];
+  char *var;
   owl_list varnames;
   int i, numvarnames;
@@ -1629 +1629 @@
     if (name && name[0]!='_') {
       g_string_append_printf(str, "\n%-20s = ", name);
-      owl_variable_get_tostring(owl_global_get_vardict(&g), name, var, LINE);
-      g_string_append(str, var);
+      var = owl_variable_get_tostring(owl_global_get_vardict(&g), name);
+      if (var) {
+        g_string_append(str, var);
+        g_free(var);
+      }
     }
   }