Changeset 010a951 for commands.c

Timestamp:

Mar 5, 2011, 3:25:29 PM (14 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:

• commands.c (modified) (3 diffs)

commands.c

@@ -1614 +1614 @@
 {
   const char *var;
-  char valbuff[1024];
+  char *value;
 
   if (argc==1) {
@@ -1626 +1626 @@
   var=argv[1];
     
-  if (0 == owl_variable_get_tostring(owl_global_get_vardict(&g), 
-                                     var, valbuff, 1024)) {
-    owl_function_makemsg("%s = '%s'", var, valbuff);
+  value = owl_variable_get_tostring(owl_global_get_vardict(&g), var);
+  if (value) {
+    owl_function_makemsg("%s = '%s'", var, value);
+    g_free(value);
   } else {
     owl_function_makemsg("Unknown variable '%s'.", var);
@@ -2507 +2508 @@
 char *owl_command_getvar(int argc, const char *const *argv, const char *buff)
 {
-  char tmpbuff[1024];
   if (argc != 2) {
     owl_function_makemsg("Wrong number of arguments for %s", argv[0]);
     return NULL;
   }
-  if (owl_variable_get_tostring(owl_global_get_vardict(&g), 
-                                argv[1], tmpbuff, 1024)) {
-    return NULL;
-  }
-  return g_strdup(tmpbuff); 
+  return owl_variable_get_tostring(owl_global_get_vardict(&g), argv[1]);
 }