Changeset 63d3e4e

Timestamp:

Feb 21, 2013, 4:42:21 PM (11 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10

Children:

523146b

Parents:

f41956d

git-author:

David Benjamin <davidben@mit.edu> (06/10/12 15:14:15)

git-committer:

David Benjamin <davidben@mit.edu> (02/21/13 16:42:21)

Message:

Make GClosure invokes more mechanical

We don't really need some of those g_value_unsets, but we may as well
avoid making assumptions. Someone else might copy-and-paste the code
later and get it wrong.

File:

• variable.c (modified) (4 diffs)

variable.c

@@ -812 +812 @@
   char *tostring;
   GValue values[] = {G_VALUE_INIT, G_VALUE_INIT};
-  GValue *value_box = &values[1];
   GValue return_box = G_VALUE_INIT;
+
   int set_successfully = -1;
   if (!v->set_fromstring_fn) {
@@ -819 +819 @@
     return -1;   
   }
+
   g_value_init(&values[0], G_TYPE_POINTER);
   g_value_set_pointer(&values[0], NULL);
-  g_value_init(value_box, G_TYPE_STRING);
-  g_value_set_static_string(value_box, value);
+  g_value_init(&values[1], G_TYPE_STRING);
+  g_value_set_static_string(&values[1], value);
   g_value_init(&return_box, G_TYPE_INT);
   g_closure_invoke(v->set_fromstring_fn, &return_box, 2, values, NULL);
+
   set_successfully = g_value_get_int(&return_box);
   if (0 != set_successfully) {
@@ -838 +840 @@
     g_free(tostring);
   }
-  g_value_unset(value_box);
+
+  g_value_unset(&return_box);
+  g_value_unset(&values[1]);
+  g_value_unset(&values[0]);
   return set_successfully;
 }
@@ -889 +894 @@
 
   ret = g_value_dup_string(&tostring_box);
+
   g_value_unset(&tostring_box);
-
+  g_value_unset(&instance);
   return ret;
 }