From: Havoc Pennington <hp@pobox.com>
Date: Tue, 31 Aug 2010 16:00:26 +0000 (-0400)
Subject: fix some "unused result" warnings in dbus-launch and dbus-spawn
X-Git-Tag: dbus-1.4.0^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ade5c7ad33484a8b8f7c11591d4e80a83e7ff369;p=thirdparty%2Fdbus.git

fix some "unused result" warnings in dbus-launch and dbus-spawn

Needed to avoid -Werror
---

diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c
index c3be1b780..dcd111d98 100644
--- a/dbus/dbus-spawn.c
+++ b/dbus/dbus-spawn.c
@@ -1079,7 +1079,8 @@ babysit (pid_t grandchild_pid,
       else if (pfds[1].revents & _DBUS_POLLIN)
         {
           char b;
-          read (sigchld_pipe[READ_END], &b, 1);
+          if (read (sigchld_pipe[READ_END], &b, 1) == -1)
+            /* ignore */;
           /* do waitpid check */
           check_babysit_events (grandchild_pid, parent_pipe, 0);
         }
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
index ec4c9a5ac..6fa9c92bf 100644
--- a/tools/dbus-launch.c
+++ b/tools/dbus-launch.c
@@ -365,9 +365,9 @@ print_variables (const char *bus_address, pid_t bus_pid, long bus_wid,
 {
   if (binary_syntax)
     {
-      write (1, bus_address, strlen (bus_address) + 1);
-      write (1, &bus_pid, sizeof bus_pid);
-      write (1, &bus_wid, sizeof bus_wid);
+      do_write (1, bus_address, strlen (bus_address) + 1);
+      do_write (1, &bus_pid, sizeof bus_pid);
+      do_write (1, &bus_wid, sizeof bus_wid);
       return;
     }
   else if (c_shell_syntax)