diff options
author | Michael Albinus <michael.albinus@gmx.de> | 2009-07-08 12:59:47 +0000 |
---|---|---|
committer | Michael Albinus <michael.albinus@gmx.de> | 2009-07-08 12:59:47 +0000 |
commit | c1d5ce9488bba9b3bc2b1dffe5e3615a409c4854 (patch) | |
tree | 22bb498dbedac9110e6e0d3b450db9729637c0c5 /src/dbusbind.c | |
parent | 93c3eb7c61e2992e80ff14bd98fb68e4e66dca41 (diff) |
* dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message)
(Fdbus_register_signal, Fdbus_register_method): Cleanup memory of
error flag.
Diffstat (limited to 'src/dbusbind.c')
-rw-r--r-- | src/dbusbind.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/dbusbind.c b/src/dbusbind.c index 670ef6b1af..8100c75439 100644 --- a/src/dbusbind.c +++ b/src/dbusbind.c @@ -716,6 +716,9 @@ xd_initialize (bus) if (connection == NULL) XD_SIGNAL2 (build_string ("No connection"), bus); + /* Cleanup. */ + dbus_error_free (&derror); + /* Return the result. */ return connection; } @@ -935,6 +938,7 @@ usage: (dbus-call-method BUS SERVICE PATH INTERFACE METHOD &optional :timeout TI } /* Cleanup. */ + dbus_error_free (&derror); dbus_message_unref (dmessage); dbus_message_unref (reply); @@ -1562,8 +1566,10 @@ xd_read_message (bus) XD_DEBUG_MESSAGE ("Event stored: %s", SDATA (format2 ("%s", event.arg, Qnil))); + /* Cleanup. */ cleanup: dbus_message_unref (dmessage); + RETURN_UNGCPRO (Qnil); } @@ -1716,6 +1722,9 @@ usage: (dbus-register-signal BUS SERVICE PATH INTERFACE SIGNAL HANDLER &rest ARG XD_ERROR (derror); } + /* Cleanup. */ + dbus_error_free (&derror); + XD_DEBUG_MESSAGE ("Matching rule \"%s\" created", rule); } @@ -1784,6 +1793,9 @@ used for composing the returning D-Bus message. */) if (NILP (Fmember (key1, value))) Fputhash (key, Fcons (key1, value), Vdbus_registered_functions_table); + /* Cleanup. */ + dbus_error_free (&derror); + /* Return object. */ return list2 (key, list3 (service, path, handler)); } |