summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHavoc Pennington <hp@pobox.com>2010-08-31 12:00:26 -0400
committerLennart Poettering <lennart@poettering.net>2010-09-06 19:30:42 +0200
commitade5c7ad33484a8b8f7c11591d4e80a83e7ff369 (patch)
tree24de46ffb340335c13b3fa635c3ccf270190f755
parentd365dd8141e709222f3a619d7b04ec4ded6429fd (diff)
fix some "unused result" warnings in dbus-launch and dbus-spawndbus-1.4.0
Needed to avoid -Werror
-rw-r--r--dbus/dbus-spawn.c3
-rw-r--r--tools/dbus-launch.c6
2 files changed, 5 insertions, 4 deletions
diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c
index c3be1b78..dcd111d9 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 ec4c9a5a..6fa9c92b 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)