summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2011-05-10 10:51:50 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2011-05-10 10:51:50 +0100
commitf0c09567711f944f25988ba992c86a7265ba5324 (patch)
tree21614f613870453954707ff20254115ef86a80e3
parent09d85a945760d06447aea09a38ea99d0dc54de2a (diff)
dbus-binding-tool: don't pass garbage arguments to async callbacks on errorwip-garbage-out-values-7206-b
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=7206
-rw-r--r--dbus/dbus-binding-tool-glib.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/dbus/dbus-binding-tool-glib.c b/dbus/dbus-binding-tool-glib.c
index 8f1a0e5..094d7b1 100644
--- a/dbus/dbus-binding-tool-glib.c
+++ b/dbus/dbus-binding-tool-glib.c
@@ -1268,9 +1268,15 @@ write_formal_declarations_for_direction (InterfaceInfo *iface, MethodInfo *metho
else if ((g_type_is_a (gtype, G_TYPE_BOXED)
|| g_type_is_a (gtype, G_TYPE_OBJECT)
|| g_type_is_a (gtype, G_TYPE_POINTER)))
- type_suffix = "*";
+ {
+ type_suffix = "*";
+ type_initializer = " = NULL";
+ }
else
- type_suffix = "";
+ {
+ type_suffix = "";
+ type_initializer = " = 0";
+ }
if (direction != dir)
continue;