From 02dfd4fb3427a6afef6b9b99d39de6248a20e0cb Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Thu, 13 Feb 2003 19:06:42 +0000 Subject: 2003-02-13 Anders Carlsson * bus/Makefile.am: Add utils.[ch] * bus/connection.c: (bus_connection_foreach): Fix a warning. * bus/desktop-file.c: (grow_lines_in_section), (grow_sections), (unescape_string), (new_section), (parse_section_start), (parse_key_value), (report_error), (bus_desktop_file_load), (bus_desktop_file_get_string): * bus/desktop-file.h: Use DBusError for error reporting. * bus/dispatch.c: (send_one_message), (bus_dispatch_message_handler): * bus/driver.c: (bus_driver_send_service_deleted), (bus_driver_send_service_created), (bus_driver_send_service_lost), (bus_driver_send_service_acquired), (bus_driver_handle_hello), (bus_driver_send_welcome_message), (bus_driver_handle_list_services), (bus_driver_handle_acquire_service), (bus_driver_handle_service_exists): * bus/loop.c: (bus_loop_run): * bus/main.c: Use BUS_HANDLE_OOM instead of _DBUS_HANDLE_OOM. * bus/utils.c: (bus_wait_for_memory): * bus/utils.h: New files with general utility functions. * dbus/dbus-internals.h: Remove _DBUS_HANDLE_OOM. --- bus/loop.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'bus/loop.c') diff --git a/bus/loop.c b/bus/loop.c index 6c621177..25ebc717 100644 --- a/bus/loop.c +++ b/bus/loop.c @@ -22,6 +22,7 @@ */ #include "loop.h" +#include "utils.h" #include #include @@ -100,12 +101,6 @@ bus_loop_remove_watch (DBusWatch *watch, watch, function, data); } -static void -wait_for_memory (void) -{ - _dbus_sleep_milliseconds (500); -} - void bus_loop_run (void) { @@ -133,14 +128,14 @@ bus_loop_run (void) fds = dbus_new0 (DBusPollFD, n_fds); while (fds == NULL) { - wait_for_memory (); + bus_wait_for_memory (); fds = dbus_new0 (DBusPollFD, n_fds); } watches_for_fds = dbus_new (WatchCallback*, n_fds); while (watches_for_fds == NULL) { - wait_for_memory (); + bus_wait_for_memory (); watches_for_fds = dbus_new (WatchCallback*, n_fds); } -- cgit