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. --- ChangeLog | 35 ++++++++++++++++ bus/Makefile.am | 5 ++- bus/connection.c | 2 +- bus/desktop-file.c | 98 +++++++++++++++++++++------------------------ bus/desktop-file.h | 6 ++- bus/dispatch.c | 9 +++-- bus/driver.c | 109 +++++++++++++++++++++++++------------------------- bus/loop.c | 11 ++--- bus/main.c | 1 + bus/utils.c | 33 +++++++++++++++ bus/utils.h | 32 +++++++++++++++ dbus/dbus-internals.h | 2 - 12 files changed, 219 insertions(+), 124 deletions(-) create mode 100644 bus/utils.c create mode 100644 bus/utils.h diff --git a/ChangeLog b/ChangeLog index a9441998..f2d1fddf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,38 @@ +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. + 2003-02-13 Anders Carlsson * dbus/dbus-errors.c: (dbus_result_to_string), (dbus_error_init), diff --git a/bus/Makefile.am b/bus/Makefile.am index a9dbfa89..1fd48af6 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -20,7 +20,10 @@ libdbus_daemon_la_SOURCES= \ loop.c \ loop.h \ services.c \ - services.h + services.h \ + utils.c \ + utils.h + libdbus_daemon_la_LIBADD= \ $(top_builddir)/dbus/libdbus-convenience.la diff --git a/bus/connection.c b/bus/connection.c index 2b2a0432..2119ed9a 100644 --- a/bus/connection.c +++ b/bus/connection.c @@ -232,5 +232,5 @@ void bus_connection_foreach (BusConnectionForeachFunction function, void *data) { - _dbus_list_foreach (&connections, function, data); + _dbus_list_foreach (&connections, (DBusForeachFunction)function, data); } diff --git a/bus/desktop-file.c b/bus/desktop-file.c index 138095d8..0ab6afc8 100644 --- a/bus/desktop-file.c +++ b/bus/desktop-file.c @@ -24,13 +24,7 @@ #include #include #include "desktop-file.h" - -typedef enum -{ - BUS_DESKTOP_PARSE_ERROR_INVALID_SYNTAX, - BUS_DESKTOP_PARSE_ERROR_INVALID_ESCAPES, - BUS_DESKTOP_PARSE_ERROR_INVALID_CHARS -} BusDesktopParseError; +#include "utils.h" typedef struct { @@ -87,10 +81,10 @@ unsigned char valid[256] = { 0x0 , 0x0 , 0x0 , 0x0 , 0x0 , 0x0 , 0x0 , 0x0 , 0x0 , 0x0 , 0x0 , 0x0 , 0x0 , 0x0 , 0x0 , 0x0 , }; -static void report_error (BusDesktopFileParser *parser, - char *message, - BusDesktopParseError error_code, - DBusResultCode *result); +static void report_error (BusDesktopFileParser *parser, + char *message, + const char *error_name, + DBusError *error); static void parser_free (BusDesktopFileParser *parser) @@ -143,8 +137,8 @@ grow_lines_in_section (BusDesktopFileSection *section) else new_n_lines = section->n_allocated_lines*2; - _DBUS_HANDLE_OOM (lines = dbus_realloc (section->lines, - sizeof (BusDesktopFileLine) * new_n_lines)); + BUS_HANDLE_OOM (lines = dbus_realloc (section->lines, + sizeof (BusDesktopFileLine) * new_n_lines)); section->lines = lines; section->n_allocated_lines = new_n_lines; @@ -161,8 +155,8 @@ grow_sections (BusDesktopFile *desktop_file) else new_n_sections = desktop_file->n_allocated_sections*2; - _DBUS_HANDLE_OOM (sections = dbus_realloc (desktop_file->sections, - sizeof (BusDesktopFileSection) * new_n_sections)); + BUS_HANDLE_OOM (sections = dbus_realloc (desktop_file->sections, + sizeof (BusDesktopFileSection) * new_n_sections)); desktop_file->sections = sections; desktop_file->n_allocated_sections = new_n_sections; @@ -175,7 +169,7 @@ unescape_string (const DBusString *str, int pos, int end_pos) /* len + 1 is enough, because unescaping never makes the * string longer */ - _DBUS_HANDLE_OOM (retval = dbus_malloc (end_pos - pos + 1)); + BUS_HANDLE_OOM (retval = dbus_malloc (end_pos - pos + 1)); q = retval; @@ -247,7 +241,7 @@ new_section (BusDesktopFile *desktop_file, n = desktop_file->n_sections++; - _DBUS_HANDLE_OOM (desktop_file->sections[n].section_name = _dbus_strdup (name)); + BUS_HANDLE_OOM (desktop_file->sections[n].section_name = _dbus_strdup (name)); desktop_file->sections[n].n_lines = 0; desktop_file->sections[n].lines = NULL; @@ -348,7 +342,7 @@ is_valid_section_name (const char *name) } static dbus_bool_t -parse_section_start (BusDesktopFileParser *parser, DBusResultCode *result) +parse_section_start (BusDesktopFileParser *parser, DBusError *error) { int line_end; char *section_name; @@ -359,7 +353,7 @@ parse_section_start (BusDesktopFileParser *parser, DBusResultCode *result) if (line_end - parser->pos <= 2 || _dbus_string_get_byte (&parser->data, line_end - 1) != ']') { - report_error (parser, "Invalid syntax for section header", BUS_DESKTOP_PARSE_ERROR_INVALID_SYNTAX, result); + report_error (parser, "Invalid syntax for section header", BUS_DESKTOP_PARSE_ERROR_INVALID_SYNTAX, error); parser_free (parser); return FALSE; } @@ -368,14 +362,14 @@ parse_section_start (BusDesktopFileParser *parser, DBusResultCode *result) if (section_name == NULL) { - report_error (parser, "Invalid escaping in section name", BUS_DESKTOP_PARSE_ERROR_INVALID_ESCAPES, result); + report_error (parser, "Invalid escaping in section name", BUS_DESKTOP_PARSE_ERROR_INVALID_ESCAPES, error); parser_free (parser); return FALSE; } if (!is_valid_section_name (section_name)) { - report_error (parser, "Invalid characters in section name", BUS_DESKTOP_PARSE_ERROR_INVALID_CHARS, result); + report_error (parser, "Invalid characters in section name", BUS_DESKTOP_PARSE_ERROR_INVALID_CHARS, error); parser_free (parser); dbus_free (section_name); return FALSE; @@ -400,7 +394,7 @@ parse_section_start (BusDesktopFileParser *parser, DBusResultCode *result) } static dbus_bool_t -parse_key_value (BusDesktopFileParser *parser, DBusResultCode *result) +parse_key_value (BusDesktopFileParser *parser, DBusError *error) { int line_end; int key_start, key_end; @@ -422,7 +416,7 @@ parse_key_value (BusDesktopFileParser *parser, DBusResultCode *result) if (key_start == key_end) { - report_error (parser, "Empty key name", BUS_DESKTOP_PARSE_ERROR_INVALID_SYNTAX, result); + report_error (parser, "Empty key name", BUS_DESKTOP_PARSE_ERROR_INVALID_SYNTAX, error); parser_free (parser); return FALSE; } @@ -435,14 +429,14 @@ parse_key_value (BusDesktopFileParser *parser, DBusResultCode *result) if (p < line_end && _dbus_string_get_byte (&parser->data, p) != '=') { - report_error (parser, "Invalid characters in key name", BUS_DESKTOP_PARSE_ERROR_INVALID_CHARS, result); + report_error (parser, "Invalid characters in key name", BUS_DESKTOP_PARSE_ERROR_INVALID_CHARS, error); parser_free (parser); return FALSE; } if (p == line_end) { - report_error (parser, "No '=' in key/value pair", BUS_DESKTOP_PARSE_ERROR_INVALID_SYNTAX, result); + report_error (parser, "No '=' in key/value pair", BUS_DESKTOP_PARSE_ERROR_INVALID_SYNTAX, error); parser_free (parser); return FALSE; } @@ -459,17 +453,17 @@ parse_key_value (BusDesktopFileParser *parser, DBusResultCode *result) value = unescape_string (&parser->data, value_start, line_end); if (value == NULL) { - report_error (parser, "Invalid escaping in value", BUS_DESKTOP_PARSE_ERROR_INVALID_ESCAPES, result); + report_error (parser, "Invalid escaping in value", BUS_DESKTOP_PARSE_ERROR_INVALID_ESCAPES, error); parser_free (parser); return FALSE; } line = new_line (parser); - _DBUS_HANDLE_OOM (_dbus_string_init (&key, key_end - key_start)); - _DBUS_HANDLE_OOM (_dbus_string_copy_len (&parser->data, key_start, key_end - key_start, - &key, 0)); - _DBUS_HANDLE_OOM (_dbus_string_steal_data (&key, &tmp)); + BUS_HANDLE_OOM (_dbus_string_init (&key, key_end - key_start)); + BUS_HANDLE_OOM (_dbus_string_copy_len (&parser->data, key_start, key_end - key_start, + &key, 0)); + BUS_HANDLE_OOM (_dbus_string_steal_data (&key, &tmp)); _dbus_string_free (&key); line->key = tmp; @@ -486,10 +480,10 @@ parse_key_value (BusDesktopFileParser *parser, DBusResultCode *result) } static void -report_error (BusDesktopFileParser *parser, - char *message, - BusDesktopParseError error_code, - DBusResultCode *result) +report_error (BusDesktopFileParser *parser, + char *message, + const char *error_name, + DBusError *error) { const char *section_name = NULL; @@ -497,11 +491,11 @@ report_error (BusDesktopFileParser *parser, section_name = parser->desktop_file->sections[parser->current_section].section_name; if (section_name) - _dbus_verbose ("Error in section %s at line %d: %s\n", section_name, parser->line_num, message); + BUS_HANDLE_OOM (dbus_set_error (error, error_name, + "Error in section %s at line %d: %s\n", section_name, parser->line_num, message)); else - _dbus_verbose ("Error at line %d: %s\n", parser->line_num, message); - - dbus_set_result (result, DBUS_RESULT_FAILED); + BUS_HANDLE_OOM (dbus_set_error (error, error_name, + "Error at line %d: %s\n", parser->line_num, message)); } #if 0 @@ -526,8 +520,8 @@ dump_desktop_file (BusDesktopFile *file) #endif BusDesktopFile * -bus_desktop_file_load (DBusString *filename, - DBusResultCode *result) +bus_desktop_file_load (DBusString *filename, + DBusError *error) { DBusString str; DBusResultCode result_code; @@ -535,15 +529,16 @@ bus_desktop_file_load (DBusString *filename, /* FIXME: Check file size so we don't try to load a ridicously large file. */ - _DBUS_HANDLE_OOM (_dbus_string_init (&str, _DBUS_INT_MAX)); + BUS_HANDLE_OOM (_dbus_string_init (&str, _DBUS_INT_MAX)); + + BUS_HANDLE_OOM ((result_code = _dbus_file_get_contents (&str, filename)) != + DBUS_RESULT_NO_MEMORY); - _DBUS_HANDLE_OOM ((result_code = _dbus_file_get_contents (&str, filename)) != - DBUS_RESULT_NO_MEMORY); - if (result_code != DBUS_RESULT_SUCCESS) { _dbus_string_free (&str); - dbus_set_result (result, result_code); + + /* FIXME: Set error */ return NULL; } @@ -551,12 +546,11 @@ bus_desktop_file_load (DBusString *filename, { _dbus_string_free (&str); - /* FIXME: Use a better error code */ - dbus_set_result (result, DBUS_RESULT_FAILED); + /* FIXME: Set error */ return NULL; } - _DBUS_HANDLE_OOM (parser.desktop_file = dbus_malloc0 (sizeof (BusDesktopFile))); + BUS_HANDLE_OOM (parser.desktop_file = dbus_malloc0 (sizeof (BusDesktopFile))); parser.data = str; parser.line_num = 1; @@ -568,7 +562,7 @@ bus_desktop_file_load (DBusString *filename, { if (_dbus_string_get_byte (&parser.data, parser.pos) == '[') { - if (!parse_section_start (&parser, result)) + if (!parse_section_start (&parser, error)) return NULL; } else if (is_blank_line (&parser) || @@ -576,15 +570,13 @@ bus_desktop_file_load (DBusString *filename, parse_comment_or_blank (&parser); else { - if (!parse_key_value (&parser, result)) + if (!parse_key_value (&parser, error)) return NULL; } } _dbus_string_free (&parser.data); - dbus_set_result (result, DBUS_RESULT_SUCCESS); - return parser.desktop_file; } @@ -669,7 +661,7 @@ bus_desktop_file_get_string (BusDesktopFile *desktop_file, if (!bus_desktop_file_get_raw (desktop_file, section, keyname, &raw)) return FALSE; - _DBUS_HANDLE_OOM (*val = _dbus_strdup (raw)); + BUS_HANDLE_OOM (*val = _dbus_strdup (raw)); return TRUE; } diff --git a/bus/desktop-file.h b/bus/desktop-file.h index 4934ea65..d498b1bf 100644 --- a/bus/desktop-file.h +++ b/bus/desktop-file.h @@ -26,10 +26,14 @@ #include #include +#define BUS_DESKTOP_PARSE_ERROR_INVALID_SYNTAX "org.freedesktop.DBus.DesktopParseError.InvalidSyntax" +#define BUS_DESKTOP_PARSE_ERROR_INVALID_ESCAPES "org.freedesktop.DBus.DesktopParseError.InvalidEscapes" +#define BUS_DESKTOP_PARSE_ERROR_INVALID_CHARS "org.freedesktop.DBus.DesktopParseError.InvalidChars" + typedef struct BusDesktopFile BusDesktopFile; BusDesktopFile *bus_desktop_file_load (DBusString *filename, - DBusResultCode *result); + DBusError *error); void bus_desktop_file_free (BusDesktopFile *file); dbus_bool_t bus_desktop_file_get_raw (BusDesktopFile *desktop_file, diff --git a/bus/dispatch.c b/bus/dispatch.c index a02916be..5b069593 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -24,6 +24,7 @@ #include "dispatch.h" #include "connection.h" #include "driver.h" +#include "utils.h" #include #include @@ -32,7 +33,7 @@ static int message_handler_slot; static void send_one_message (DBusConnection *connection, void *data) { - _DBUS_HANDLE_OOM (dbus_connection_send_message (connection, data, NULL, NULL)); + BUS_HANDLE_OOM (dbus_connection_send_message (connection, data, NULL, NULL)); } void @@ -54,7 +55,7 @@ bus_dispatch_message_handler (DBusMessageHandler *handler, /* Assign a sender to the message */ sender = bus_connection_get_name (connection); - _DBUS_HANDLE_OOM (dbus_message_set_sender (message, sender)); + BUS_HANDLE_OOM (dbus_message_set_sender (message, sender)); service_name = dbus_message_get_service (message); @@ -83,8 +84,8 @@ bus_dispatch_message_handler (DBusMessageHandler *handler, _dbus_assert (bus_service_get_primary_owner (service) != NULL); /* Dispatch the message */ - _DBUS_HANDLE_OOM (dbus_connection_send_message (bus_service_get_primary_owner (service), - message, NULL, NULL)); + BUS_HANDLE_OOM (dbus_connection_send_message (bus_service_get_primary_owner (service), + message, NULL, NULL)); } return DBUS_HANDLER_RESULT_ALLOW_MORE_HANDLERS; diff --git a/bus/driver.c b/bus/driver.c index 403cfc54..3b79ea56 100644 --- a/bus/driver.c +++ b/bus/driver.c @@ -25,6 +25,7 @@ #include "driver.h" #include "dispatch.h" #include "services.h" +#include "utils.h" #include #include #include @@ -39,14 +40,14 @@ bus_driver_send_service_deleted (const char *service_name) _dbus_verbose ("sending service deleted: %s\n", service_name); - _DBUS_HANDLE_OOM (message = dbus_message_new (DBUS_SERVICE_BROADCAST, - DBUS_MESSAGE_SERVICE_DELETED)); + BUS_HANDLE_OOM (message = dbus_message_new (DBUS_SERVICE_BROADCAST, + DBUS_MESSAGE_SERVICE_DELETED)); - _DBUS_HANDLE_OOM (dbus_message_set_sender (message, DBUS_SERVICE_DBUS)); + BUS_HANDLE_OOM (dbus_message_set_sender (message, DBUS_SERVICE_DBUS)); - _DBUS_HANDLE_OOM (dbus_message_append_fields (message, - DBUS_TYPE_STRING, service_name, - 0)); + BUS_HANDLE_OOM (dbus_message_append_fields (message, + DBUS_TYPE_STRING, service_name, + 0)); bus_dispatch_broadcast_message (message); dbus_message_unref (message); } @@ -56,14 +57,14 @@ bus_driver_send_service_created (const char *service_name) { DBusMessage *message; - _DBUS_HANDLE_OOM (message = dbus_message_new (DBUS_SERVICE_BROADCAST, - DBUS_MESSAGE_SERVICE_CREATED)); + BUS_HANDLE_OOM (message = dbus_message_new (DBUS_SERVICE_BROADCAST, + DBUS_MESSAGE_SERVICE_CREATED)); - _DBUS_HANDLE_OOM (dbus_message_set_sender (message, DBUS_SERVICE_DBUS)); - - _DBUS_HANDLE_OOM (dbus_message_append_fields (message, - DBUS_TYPE_STRING, service_name, - 0)); + BUS_HANDLE_OOM (dbus_message_set_sender (message, DBUS_SERVICE_DBUS)); + + BUS_HANDLE_OOM (dbus_message_append_fields (message, + DBUS_TYPE_STRING, service_name, + 0)); bus_dispatch_broadcast_message (message); dbus_message_unref (message); } @@ -74,14 +75,14 @@ bus_driver_send_service_lost (DBusConnection *connection, { DBusMessage *message; - _DBUS_HANDLE_OOM (message = dbus_message_new (DBUS_SERVICE_BROADCAST, - DBUS_MESSAGE_SERVICE_LOST)); + BUS_HANDLE_OOM (message = dbus_message_new (DBUS_SERVICE_BROADCAST, + DBUS_MESSAGE_SERVICE_LOST)); - _DBUS_HANDLE_OOM (dbus_message_set_sender (message, DBUS_SERVICE_DBUS)); - _DBUS_HANDLE_OOM (dbus_message_append_fields (message, - DBUS_TYPE_STRING, service_name, - 0)); - _DBUS_HANDLE_OOM (dbus_connection_send_message (connection, message, NULL, NULL)); + BUS_HANDLE_OOM (dbus_message_set_sender (message, DBUS_SERVICE_DBUS)); + BUS_HANDLE_OOM (dbus_message_append_fields (message, + DBUS_TYPE_STRING, service_name, + 0)); + BUS_HANDLE_OOM (dbus_connection_send_message (connection, message, NULL, NULL)); dbus_message_unref (message); } @@ -92,14 +93,14 @@ bus_driver_send_service_acquired (DBusConnection *connection, { DBusMessage *message; - _DBUS_HANDLE_OOM (message = dbus_message_new (DBUS_SERVICE_BROADCAST, - DBUS_MESSAGE_SERVICE_ACQUIRED)); + BUS_HANDLE_OOM (message = dbus_message_new (DBUS_SERVICE_BROADCAST, + DBUS_MESSAGE_SERVICE_ACQUIRED)); - _DBUS_HANDLE_OOM (dbus_message_set_sender (message, DBUS_SERVICE_DBUS)); - _DBUS_HANDLE_OOM (dbus_message_append_fields (message, - DBUS_TYPE_STRING, service_name, - 0)); - _DBUS_HANDLE_OOM (dbus_connection_send_message (connection, message, NULL, NULL)); + BUS_HANDLE_OOM (dbus_message_set_sender (message, DBUS_SERVICE_DBUS)); + BUS_HANDLE_OOM (dbus_message_append_fields (message, + DBUS_TYPE_STRING, service_name, + 0)); + BUS_HANDLE_OOM (dbus_connection_send_message (connection, message, NULL, NULL)); dbus_message_unref (message); } @@ -169,23 +170,23 @@ bus_driver_handle_hello (DBusConnection *connection, DBusString unique_name; BusService *service; - _DBUS_HANDLE_OOM (_dbus_string_init (&unique_name, _DBUS_INT_MAX)); - _DBUS_HANDLE_OOM (create_unique_client_name (&unique_name)); + BUS_HANDLE_OOM (_dbus_string_init (&unique_name, _DBUS_INT_MAX)); + BUS_HANDLE_OOM (create_unique_client_name (&unique_name)); /* Create the service */ - _DBUS_HANDLE_OOM (service = bus_service_lookup (&unique_name, TRUE)); + BUS_HANDLE_OOM (service = bus_service_lookup (&unique_name, TRUE)); bus_service_set_prohibit_replacement (service, TRUE); /* Add the connection as the owner */ - _DBUS_HANDLE_OOM (bus_service_add_owner (service, connection)); - _DBUS_HANDLE_OOM (bus_connection_set_name (connection, &unique_name)); + BUS_HANDLE_OOM (bus_service_add_owner (service, connection)); + BUS_HANDLE_OOM (bus_connection_set_name (connection, &unique_name)); - _DBUS_HANDLE_OOM (dbus_message_set_sender (message, + BUS_HANDLE_OOM (dbus_message_set_sender (message, bus_connection_get_name (connection))); _dbus_string_free (&unique_name); - _DBUS_HANDLE_OOM (bus_driver_send_welcome_message (connection, message)); + BUS_HANDLE_OOM (bus_driver_send_welcome_message (connection, message)); /* Broadcast a service created message */ bus_driver_send_service_created (bus_service_get_name (service)); @@ -201,15 +202,15 @@ bus_driver_send_welcome_message (DBusConnection *connection, name = bus_connection_get_name (connection); _dbus_assert (name != NULL); - _DBUS_HANDLE_OOM (welcome = dbus_message_new_reply (hello_message)); + BUS_HANDLE_OOM (welcome = dbus_message_new_reply (hello_message)); - _DBUS_HANDLE_OOM (dbus_message_set_sender (welcome, DBUS_SERVICE_DBUS)); + BUS_HANDLE_OOM (dbus_message_set_sender (welcome, DBUS_SERVICE_DBUS)); - _DBUS_HANDLE_OOM (dbus_message_append_fields (welcome, + BUS_HANDLE_OOM (dbus_message_append_fields (welcome, DBUS_TYPE_STRING, name, NULL)); - _DBUS_HANDLE_OOM (dbus_connection_send_message (connection, welcome, NULL, NULL)); + BUS_HANDLE_OOM (dbus_connection_send_message (connection, welcome, NULL, NULL)); dbus_message_unref (welcome); } @@ -222,15 +223,15 @@ bus_driver_handle_list_services (DBusConnection *connection, int len, i; char **services; - _DBUS_HANDLE_OOM (reply = dbus_message_new_reply (message)); + BUS_HANDLE_OOM (reply = dbus_message_new_reply (message)); - _DBUS_HANDLE_OOM (services = bus_services_list (&len)); + BUS_HANDLE_OOM (services = bus_services_list (&len)); - _DBUS_HANDLE_OOM (dbus_message_append_fields (reply, + BUS_HANDLE_OOM (dbus_message_append_fields (reply, DBUS_TYPE_STRING_ARRAY, services, len, 0)); - _DBUS_HANDLE_OOM (dbus_connection_send_message (connection, reply, NULL, NULL)); + BUS_HANDLE_OOM (dbus_connection_send_message (connection, reply, NULL, NULL)); dbus_message_unref (reply); @@ -254,7 +255,7 @@ bus_driver_handle_acquire_service (DBusConnection *connection, int service_reply; int flags; - _DBUS_HANDLE_OOM ((result = dbus_message_get_fields (message, + BUS_HANDLE_OOM ((result = dbus_message_get_fields (message, DBUS_TYPE_STRING, &name, DBUS_TYPE_UINT32, &flags, 0)) != DBUS_RESULT_NO_MEMORY); @@ -271,7 +272,7 @@ bus_driver_handle_acquire_service (DBusConnection *connection, _dbus_string_init_const (&service_name, name); service = bus_service_lookup (&service_name, TRUE); - _DBUS_HANDLE_OOM ((reply = dbus_message_new_reply (message))); + BUS_HANDLE_OOM ((reply = dbus_message_new_reply (message))); /* * Check if the service already has an owner @@ -288,7 +289,7 @@ bus_driver_handle_acquire_service (DBusConnection *connection, { /* Queue the connection */ - _DBUS_HANDLE_OOM (bus_service_add_owner (service, connection)); + BUS_HANDLE_OOM (bus_service_add_owner (service, connection)); service_reply = DBUS_SERVICE_REPLY_IN_QUEUE; } @@ -303,7 +304,7 @@ bus_driver_handle_acquire_service (DBusConnection *connection, * that will cause ServiceAcquired and ServiceLost messages to * be sent. */ - _DBUS_HANDLE_OOM (bus_service_add_owner (service, connection)); + BUS_HANDLE_OOM (bus_service_add_owner (service, connection)); bus_service_remove_owner (service, owner); _dbus_assert (connection == bus_service_get_primary_owner (service)); service_reply = DBUS_SERVICE_REPLY_PRIMARY_OWNER; @@ -318,15 +319,15 @@ bus_driver_handle_acquire_service (DBusConnection *connection, /* Broadcast service created message */ bus_driver_send_service_created (bus_service_get_name (service)); - _DBUS_HANDLE_OOM (bus_service_add_owner (service, connection)); + BUS_HANDLE_OOM (bus_service_add_owner (service, connection)); service_reply = DBUS_SERVICE_REPLY_PRIMARY_OWNER; } - _DBUS_HANDLE_OOM (dbus_message_append_fields (reply, DBUS_TYPE_UINT32, service_reply, 0)); + BUS_HANDLE_OOM (dbus_message_append_fields (reply, DBUS_TYPE_UINT32, service_reply, 0)); /* Send service reply */ - _DBUS_HANDLE_OOM (dbus_connection_send_message (connection, reply, NULL, NULL)); + BUS_HANDLE_OOM (dbus_connection_send_message (connection, reply, NULL, NULL)); dbus_free (name); dbus_message_unref (reply); } @@ -341,7 +342,7 @@ bus_driver_handle_service_exists (DBusConnection *connection, BusService *service; char *name; - _DBUS_HANDLE_OOM ((result = dbus_message_get_fields (message, + BUS_HANDLE_OOM ((result = dbus_message_get_fields (message, DBUS_TYPE_STRING, &name, 0)) != DBUS_RESULT_NO_MEMORY); if (result != DBUS_RESULT_SUCCESS) @@ -354,13 +355,13 @@ bus_driver_handle_service_exists (DBusConnection *connection, _dbus_string_init_const (&service_name, name); service = bus_service_lookup (&service_name, FALSE); - _DBUS_HANDLE_OOM ((reply = dbus_message_new_reply (message))); - _DBUS_HANDLE_OOM (dbus_message_set_sender (reply, DBUS_SERVICE_DBUS)); + BUS_HANDLE_OOM ((reply = dbus_message_new_reply (message))); + BUS_HANDLE_OOM (dbus_message_set_sender (reply, DBUS_SERVICE_DBUS)); - _DBUS_HANDLE_OOM (dbus_message_append_fields (reply, + BUS_HANDLE_OOM (dbus_message_append_fields (reply, DBUS_TYPE_UINT32, service != NULL, 0)); - _DBUS_HANDLE_OOM (dbus_connection_send_message (connection, reply, NULL, NULL)); + BUS_HANDLE_OOM (dbus_connection_send_message (connection, reply, NULL, NULL)); dbus_message_unref (reply); dbus_free (name); } 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); } diff --git a/bus/main.c b/bus/main.c index fb5e0397..17eb9fc6 100644 --- a/bus/main.c +++ b/bus/main.c @@ -21,6 +21,7 @@ * */ #include "loop.h" +#include "activation.h" #include "connection.h" #include "driver.h" #include diff --git a/bus/utils.c b/bus/utils.c new file mode 100644 index 00000000..8663b1e5 --- /dev/null +++ b/bus/utils.c @@ -0,0 +1,33 @@ +/* -*- mode: C; c-file-style: "gnu" -*- */ +/* utils.c General utility functions + * + * Copyright (C) 2003 CodeFactory AB + * Copyright (C) 2003 Red Hat, Inc. + * + * Licensed under the Academic Free License version 1.2 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "utils.h" +#include + +void +bus_wait_for_memory (void) +{ + _dbus_sleep_milliseconds (500); +} + diff --git a/bus/utils.h b/bus/utils.h new file mode 100644 index 00000000..5cbe2849 --- /dev/null +++ b/bus/utils.h @@ -0,0 +1,32 @@ +/* -*- mode: C; c-file-style: "gnu" -*- */ +/* utils.h General utility functions + * + * Copyright (C) 2003 CodeFactory AB + * Copyright (C) 2003 Red Hat, Inc. + * + * Licensed under the Academic Free License version 1.2 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef BUS_UTILS_H +#define BUS_UTILS_H + +#define BUS_HANDLE_OOM(stat) (stat) + +void bus_wait_for_memory (void); + +#endif /* BUS_ACTIVATION_H */ diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h index 97d3e61d..f0baf46b 100644 --- a/dbus/dbus-internals.h +++ b/dbus/dbus-internals.h @@ -93,8 +93,6 @@ do { #define _DBUS_STRUCT_OFFSET(struct_type, member) \ ((long) ((unsigned char*) &((struct_type*) 0)->member)) -#define _DBUS_HANDLE_OOM(stat) (stat) - /* This alignment thing is from ORBit2 */ /* Align a value upward to a boundary, expressed as a number of bytes. * E.g. align to an 8-byte boundary with argument of 8. -- cgit