From f14f2196cc129e4e17f993773d57000784958bcf Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Sun, 29 Aug 2004 02:14:52 +0000 Subject: 2004-08-28 Havoc Pennington * dbus/dbus-userdb.c (_dbus_is_console_user): remove unused variable More fixes from Steve Grubb * dbus/dbus-sysdeps.c (_dbus_connect_tcp_socket): fix fd leak (_dbus_listen_tcp_socket): fix fd leak * dbus/dbus-spawn.c (read_pid, read_ints): move the "again:" for EINTR to a bit lower in the code --- dbus/dbus-spawn.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'dbus/dbus-spawn.c') diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c index a7008303..03947cce 100644 --- a/dbus/dbus-spawn.c +++ b/dbus/dbus-spawn.c @@ -72,13 +72,13 @@ read_ints (int fd, { size_t chunk; size_t to_read; - - again: to_read = sizeof (int) * n_ints_in_buf - bytes; if (to_read == 0) break; + + again: chunk = read (fd, ((char*)buf) + bytes, @@ -128,11 +128,12 @@ read_pid (int fd, size_t chunk; size_t to_read; - again: to_read = sizeof (pid_t) - bytes; if (to_read == 0) break; + + again: chunk = read (fd, ((char*)buf) + bytes, -- cgit