[Emacs-diffs] Changes to emacs/src/dbusbind.c,v

[Michael Albinus]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Michael Albinus <albinus>       07/12/14 21:49:52

Index: dbusbind.c
===================================================================
RCS file: /sources/emacs/emacs/src/dbusbind.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- dbusbind.c  8 Dec 2007 12:53:37 -0000       1.6
+++ dbusbind.c  14 Dec 2007 21:49:52 -0000      1.7
@@ -112,7 +112,7 @@
    message.  */
 char *
 xd_retrieve_value (dtype, object)
-     uint dtype;
+     unsigned int dtype;
      Lisp_Object object;
 {
 
@@ -146,7 +146,7 @@
    partly supported; they result always in a Lisp list.  */
 Lisp_Object
 xd_retrieve_arg (dtype, iter)
-     uint dtype;
+     unsigned int dtype;
      DBusMessageIter *iter;
 {
 
@@ -316,7 +316,7 @@
   DBusMessage *reply;
   DBusMessageIter iter;
   DBusError derror;
-  uint dtype;
+  unsigned int dtype;
   int i;
   char *value;
 
@@ -459,7 +459,7 @@
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
   DBusConnection *connection;
   DBusMessage *dmessage;
-  uint dtype;
+  unsigned int dtype;
   int i;
   char *value;
 
@@ -549,7 +549,7 @@
   DBusConnection *connection;
   DBusMessage *dmessage;
   DBusMessageIter iter;
-  uint dtype;
+  unsigned int dtype;
   char uname[DBUS_MAXIMUM_NAME_LENGTH];
   char path[DBUS_MAXIMUM_MATCH_RULE_LENGTH]; /* Unlimited in D-Bus spec.  */
   char interface[DBUS_MAXIMUM_NAME_LENGTH];
@@ -605,11 +605,13 @@
     {
       key = XCAR (value);
       /* key has the structure (SERVICE UNAME PATH HANDLER).  */
-      if (((uname == NULL) || (NILP (XCAR (XCDR (key)))) ||
-          (strcmp (uname, SDATA (XCAR (XCDR (key)))) == 0)) &&
-         ((path == NULL) || (NILP (XCAR (XCDR (XCDR (key))))) ||
-          (strcmp (path, SDATA (XCAR (XCDR (XCDR (key))))) == 0)) &&
-         (!NILP (XCAR (XCDR (XCDR (XCDR (key)))))))
+      if (((uname == NULL)
+          || (NILP (XCAR (XCDR (key))))
+          || (strcmp (uname, SDATA (XCAR (XCDR (key)))) == 0))
+         && ((path == NULL)
+             || (NILP (XCAR (XCDR (XCDR (key)))))
+             || (strcmp (path, SDATA (XCAR (XCDR (XCDR (key))))) == 0))
+         && (!NILP (XCAR (XCDR (XCDR (XCDR (key)))))))
        {
          EVENT_INIT (event);
          event.kind = DBUS_EVENT;
@@ -710,10 +712,10 @@
      will register for the corresponding unique name, if any.  Signals
      are sent always with the unique name as sender.  Note: the unique
      name of "org.freedesktop.DBus" is that string itself.  */
-  if ((!NILP (service)) &&
-      (strlen (SDATA (service)) > 0) &&
-      (strcmp (SDATA (service), DBUS_SERVICE_DBUS) != 0) &&
-      (strncmp (SDATA (service), ":", 1) != 0))
+  if ((!NILP (service))
+      && (strlen (SDATA (service)) > 0)
+      && (strcmp (SDATA (service), DBUS_SERVICE_DBUS) != 0)
+      && (strncmp (SDATA (service), ":", 1) != 0))
     unique_name = call2 (intern ("dbus-get-name-owner"), bus, service);
   else
     unique_name = service;