[maemo-commits] [maemo-commits] r14648 - projects/haf/trunk/dbus/debian/patches

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2007-10-29 08:33:53 +0200 (Mon, 29 Oct 2007)
New Revision: 14648

Modified:
   projects/haf/trunk/dbus/debian/patches/33-dbus-spawn-poll-fixes.patch
Log:
beautifications


Modified: projects/haf/trunk/dbus/debian/patches/33-dbus-spawn-poll-fixes.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/33-dbus-spawn-poll-fixes.patch	2007-10-26 15:14:50 UTC (rev 14647)
+++ projects/haf/trunk/dbus/debian/patches/33-dbus-spawn-poll-fixes.patch	2007-10-29 06:33:53 UTC (rev 14648)
@@ -1,6 +1,6 @@
 diff -pur dbus-1.0.2/dbus/dbus-spawn.c dbus-1.0.2.new/dbus/dbus-spawn.c
 --- dbus-1.0.2/dbus/dbus-spawn.c	2006-12-11 21:21:09.000000000 +0200
-+++ dbus-1.0.2.new/dbus/dbus-spawn.c	2007-10-26 13:15:53.857260096 +0300
++++ dbus-1.0.2.new/dbus/dbus-spawn.c	2007-10-29 08:31:56.256664752 +0200
 @@ -551,9 +551,20 @@ babysitter_iteration (DBusBabysitter *si
      {
        int ret;
@@ -24,17 +24,15 @@
        
        if (ret > 0)
          {
-@@ -990,7 +1001,15 @@ babysit (pid_t grandchild_pid,
+@@ -989,8 +1000,12 @@ babysit (pid_t grandchild_pid,
+       pfds[1].fd = sigchld_pipe[READ_END];
        pfds[1].events = _DBUS_POLLIN;
        pfds[1].revents = 0;
-       
+-      
 -      _dbus_poll (pfds, _DBUS_N_ELEMENTS (pfds), -1);
-+poll_again:
-+      if (_dbus_poll (pfds, _DBUS_N_ELEMENTS (pfds), -1) < 0)
-+        {
-+          if (errno == EINTR)
-+            goto poll_again;
 +
++      if (_dbus_poll (pfds, _DBUS_N_ELEMENTS (pfds), -1) < 0 && errno != EINTR)
++        {
 +          _dbus_warn ("_dbus_poll() error: %s\n", strerror (errno));
 +          exit (1);
 +        }