diff options
author | John (J5) Palmieri <johnp@redhat.com> | 2005-11-30 19:32:27 +0000 |
---|---|---|
committer | John (J5) Palmieri <johnp@redhat.com> | 2005-11-30 19:32:27 +0000 |
commit | 0ca96ec548a6e4a1e39429f3c0480adfe7e2eab8 (patch) | |
tree | 90cf95cc76cdd8e3242eb94e9ae7703b8fbd829d /tools/dbus-launch.c | |
parent | 111118fd8a9240440ec0e4b9710bebf91e186881 (diff) |
* dbus/dbus-auth.c, dbus/dbus-connection.c, dbus/dbus-keyring.c,
dbus/dbus-server-debug-pipe.c, glib/dbus-binding-tool-glib.c
glib/dbus-glib-tool.c, glib/dbus-gparser.c, glib/dbus-gproxy.c
test/test-segfault.c, test/test-utils.c,
test/glib/test-dbus-glib.c, tools/dbus-cleanup-sockets.c
tools/dbus-launch.c, tools/dbus-tree-view.c, tools/dbus-viewer.c:
Various cleanup of dead code and compiler warnings (patch from
Kjartan Maraas <kmaraas at gnome.org>)
Diffstat (limited to 'tools/dbus-launch.c')
-rw-r--r-- | tools/dbus-launch.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c index ad4fd5a4..beb298c1 100644 --- a/tools/dbus-launch.c +++ b/tools/dbus-launch.c @@ -137,7 +137,7 @@ read_line (int fd, while (TRUE) { - size_t chunk; + ssize_t chunk; size_t to_read; again: @@ -190,7 +190,7 @@ read_pid (int fd, while (TRUE) { - size_t chunk; + ssize_t chunk; size_t to_read; again: @@ -323,7 +323,6 @@ kill_bus_when_session_ends (void) int x_fd; fd_set read_set; fd_set err_set; - int ret; struct sigaction act; sigset_t empty_mask; #ifdef DBUS_BUILD_X11 @@ -336,7 +335,7 @@ kill_bus_when_session_ends (void) act.sa_handler = signal_handler; act.sa_mask = empty_mask; act.sa_flags = 0; - sigaction (SIGHUP, &act, 0); + sigaction (SIGHUP, &act, NULL); #ifdef DBUS_BUILD_X11 xdisplay = XOpenDisplay (NULL); @@ -386,8 +385,8 @@ kill_bus_when_session_ends (void) FD_SET (x_fd, &err_set); } - ret = select (MAX (tty_fd, x_fd) + 1, - &read_set, NULL, &err_set, NULL); + select (MAX (tty_fd, x_fd) + 1, + &read_set, NULL, &err_set, NULL); if (got_sighup) { |