diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-04-17 20:25:33 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-04-17 20:25:33 +0000 |
| commit | 4219b08bfa318443419c7a3acde28f0b237b05fe (patch) | |
| tree | 268ad40f508ed47d1951e28cdef69b5489347bb2 /dbus/dbus-transport-unix.c | |
| parent | dac0a1f8933889fd94fed7fecdcc4ec6fb3a3fb0 (diff) | |
2003-04-17 Havoc Pennington <hp@redhat.com>
* dbus/dbus-mainloop.c (_dbus_loop_iterate): fix logic so that if
there was an OOM watch we skipped, we always return TRUE so we
iterate again to have a look at it again. Fixes test suite hang.
Code rearrangement also lets us lose some memset and only iterate
over callbacks once.
* bus/driver.c (bus_driver_handle_message): sense of test for
reply was backward
Diffstat (limited to 'dbus/dbus-transport-unix.c')
| -rw-r--r-- | dbus/dbus-transport-unix.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/dbus/dbus-transport-unix.c b/dbus/dbus-transport-unix.c index 50d86301..82b28e0d 100644 --- a/dbus/dbus-transport-unix.c +++ b/dbus/dbus-transport-unix.c @@ -725,14 +725,17 @@ unix_handle_watch (DBusTransport *transport, if (watch == unix_transport->read_watch && (flags & DBUS_WATCH_READABLE)) { -#if 0 +#if 1 _dbus_verbose ("handling read watch\n"); #endif if (!do_authentication (transport, TRUE, FALSE)) return FALSE; if (!do_reading (transport)) - return FALSE; + { + _dbus_verbose ("no memory to read\n"); + return FALSE; + } } else if (watch == unix_transport->write_watch && (flags & DBUS_WATCH_WRITABLE)) @@ -745,7 +748,10 @@ unix_handle_watch (DBusTransport *transport, return FALSE; if (!do_writing (transport)) - return FALSE; + { + _dbus_verbose ("no memory to write\n"); + return FALSE; + } } #ifdef DBUS_ENABLE_VERBOSE_MODE else |