changeset 103785:50effbe728da

* dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message) (Fdbus_register_signal, Fdbus_register_method): Cleanup memory of error flag.
author Michael Albinus <michael.albinus@gmx.de>
date Wed, 08 Jul 2009 12:58:57 +0000
parents b60f04c19068
children 02ba23495867
files src/dbusbind.c
diffstat 1 files changed, 12 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/dbusbind.c	Wed Jul 08 12:43:42 2009 +0000
+++ b/src/dbusbind.c	Wed Jul 08 12:58:57 2009 +0000
@@ -716,6 +716,9 @@
   if (connection == NULL)
     XD_SIGNAL2 (build_string ("No connection"), bus);
 
+  /* Cleanup.  */
+  dbus_error_free (&derror);
+
   /* Return the result.  */
   return connection;
 }
@@ -935,6 +938,7 @@
     }
 
   /* Cleanup.  */
+  dbus_error_free (&derror);
   dbus_message_unref (dmessage);
   dbus_message_unref (reply);
 
@@ -1562,8 +1566,10 @@
   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 @@
 	  XD_ERROR (derror);
 	}
 
+      /* Cleanup.  */
+      dbus_error_free (&derror);
+
       XD_DEBUG_MESSAGE ("Matching rule \"%s\" created", rule);
     }
 
@@ -1784,6 +1793,9 @@
   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));
 }