Changeset 010a951 for tester.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:

• tester.c (modified) (3 diffs)

tester.c

@@ -269 +269 @@
   owl_vardict vd;
   int numfailed=0;
-  char buf[1024];
+  char *value;
   const void *v;
 
@@ -277 +277 @@
   FAIL_UNLESS("get bool", 0==owl_variable_get_bool(&vd,"rxping"));
   FAIL_UNLESS("get bool (no such)", -1==owl_variable_get_bool(&vd,"mumble"));
-  FAIL_UNLESS("get bool as string 1", 0==owl_variable_get_tostring(&vd,"rxping", buf, 1024));
-  FAIL_UNLESS("get bool as string 2", 0==strcmp(buf,"off"));
+  FAIL_UNLESS("get bool as string",
+              !strcmp((value = owl_variable_get_tostring(&vd,"rxping")), "off"));
+  g_free(value);
   FAIL_UNLESS("set bool 1", 0==owl_variable_set_bool_on(&vd,"rxping"));
   FAIL_UNLESS("get bool 2", 1==owl_variable_get_bool(&vd,"rxping"));
@@ -293 +294 @@
   FAIL_UNLESS("get int", 8==owl_variable_get_int(&vd,"typewinsize"));
   FAIL_UNLESS("get int (no such)", -1==owl_variable_get_int(&vd,"mmble"));
-  FAIL_UNLESS("get int as string 1", 0==owl_variable_get_tostring(&vd,"typewinsize", buf, 1024));
-  FAIL_UNLESS("get int as string 2", 0==strcmp(buf,"8"));
+  FAIL_UNLESS("get int as string",
+              !strcmp((value = owl_variable_get_tostring(&vd,"typewinsize")), "8"));
+  g_free(value);
   FAIL_UNLESS("set int 1", 0==owl_variable_set_int(&vd,"typewinsize",12));
   FAIL_UNLESS("get int 2", 12==owl_variable_get_int(&vd,"typewinsize"));