From b4a1100f4f81534e2aac0141afda750f318223d4 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 17 Mar 2003 01:54:37 +0000 Subject: 2003-03-16 Havoc Pennington * dbus/dbus-watch.c (_dbus_watch_new): handle failure to malloc the watch * dbus/dbus-server-debug-pipe.c (_dbus_transport_debug_pipe_new): add some missing dbus_set_result * bus/dispatch.c (bus_dispatch_add_connection): handle failure to alloc the DBusMessageHandler * dbus/dbus-transport.c (_dbus_transport_disconnect): don't ref the transport here, since we call this from the finalizer; it resulted in a double-finalize. * dbus/dbus-transport.c (_dbus_transport_disconnect): fix a bug where we tried to use transport->connection that was NULL, happened when transport was disconnected early on due to OOM * bus/*.c: adapt to handle OOM for watches/timeouts * dbus/dbus-transport-unix.c: port to handle OOM during watch handling * dbus/dbus-auth.c (_dbus_auth_get_unused_bytes): return a reference to unused bytes instead of a copy * dbus/dbus-server.c (dbus_server_handle_watch): return FALSE for out of memory * dbus/dbus-connection.c (dbus_connection_handle_watch): return FALSE on OOM * dbus/dbus-timeout.c (dbus_timeout_handle): return FALSE for out of memory --- dbus/dbus-server-protected.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'dbus/dbus-server-protected.h') diff --git a/dbus/dbus-server-protected.h b/dbus/dbus-server-protected.h index bbedeea3..d47215b7 100644 --- a/dbus/dbus-server-protected.h +++ b/dbus/dbus-server-protected.h @@ -36,17 +36,17 @@ typedef struct DBusServerVTable DBusServerVTable; struct DBusServerVTable { - void (* finalize) (DBusServer *server); + void (* finalize) (DBusServer *server); /**< The finalize method must free the server. */ - void (* handle_watch) (DBusServer *server, - DBusWatch *watch, - unsigned int flags); + dbus_bool_t (* handle_watch) (DBusServer *server, + DBusWatch *watch, + unsigned int flags); /**< The handle_watch method handles reading/writing * data as indicated by the flags. */ - void (* disconnect) (DBusServer *server); + void (* disconnect) (DBusServer *server); /**< Disconnect this server. */ }; -- cgit