[Emacs-diffs] emacs/src dbusbind.c

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       09/07/08 12:58:57

Modified files:
        src            : dbusbind.c 

Log message:
        * dbusbind.c (xd_initialize, Fdbus_call_method, xd_read_message)
        (Fdbus_register_signal, Fdbus_register_method): Cleanup memory of
        error flag.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/dbusbind.c?cvsroot=emacs&r1=1.38&r2=1.39

Patches:
Index: dbusbind.c
===================================================================
RCS file: /sources/emacs/emacs/src/dbusbind.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- dbusbind.c  28 Jun 2009 15:21:53 -0000      1.38
+++ dbusbind.c  8 Jul 2009 12:58:57 -0000       1.39
@@ -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));
 }