diff options
| author | Havoc Pennington <hp@redhat.com> | 2003-03-13 00:56:43 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2003-03-13 00:56:43 +0000 |
| commit | 29560adcc79a259a0be3511c056ee7453aa26c04 (patch) | |
| tree | 57e72dd26b5876da48379e5ff910c63e66cb7001 /dbus/dbus-keyring.c | |
| parent | 799a3ff443f5357ae7857ebe989a7f92f7bd84df (diff) | |
2003-03-12 Havoc Pennington <hp@redhat.com>
Mega-patch that gets the message bus daemon initially handling
out-of-memory. Work still needed. Also lots of random
moving stuff to DBusError instead of ResultCode.
* dbus/dbus-list.c (_dbus_list_length_is_one): new function
* dbus/dbus-connection.c
(dbus_connection_send_with_reply_and_block): use DBusError
* dbus/dbus-bus.c: adapt to API changes, make it use DBusError not
DBusResultCode
* dbus/dbus-connection.c (dbus_connection_send): drop the result
code here, as the only failure possible is OOM.
* bus/connection.c (bus_connection_disconnect):
rename bus_connection_disconnected as it's a notification only
* bus/driver.c (bus_driver_handle_acquire_service): don't free
"name" on get_args failure, should be done by get_args;
don't disconnect client for bad args, just return an error.
(bus_driver_handle_service_exists): ditto
* bus/services.c (bus_services_list): NULL-terminate returned array
* bus/driver.c (bus_driver_send_service_lost)
(bus_driver_send_service_acquired): send messages from driver to a
specific client to the client's unique name, not to the broadcast
service.
* dbus/dbus-message.c (decode_header_data): reject messages that
contain no name field
(_dbus_message_get_client_serial): rename to
dbus_message_get_serial and make public
(_dbus_message_set_serial): rename from set_client_serial
(_dbus_message_set_reply_serial): make public
(_dbus_message_get_reply_serial): make public
* bus/connection.c (bus_connection_foreach): allow stopping
iteration by returning FALSE from foreach function.
* dbus/dbus-connection.c (dbus_connection_send_preallocated)
(dbus_connection_free_preallocated_send)
(dbus_connection_preallocate_send): new API for sending a message
without possibility of malloc failure.
(dbus_connection_send_message): rename to just
dbus_connection_send (and same for whole function family)
* dbus/dbus-errors.c (dbus_error_free): make this reinit the error
* dbus/dbus-sysdeps.c (_dbus_exit): new function
* bus/activation.c: handle/return errors
* dbus/dbus-errors.h: add more DBUS_ERROR #define
* dbus/dbus-sysdeps.c (_dbus_directory_open) (_dbus_file_get_contents)
(_dbus_directory_get_next_file): use DBusError instead of DBusResultCode
(_dbus_result_from_errno): move to this file
Diffstat (limited to 'dbus/dbus-keyring.c')
| -rw-r--r-- | dbus/dbus-keyring.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/dbus/dbus-keyring.c b/dbus/dbus-keyring.c index c5c6a0b5..db432be8 100644 --- a/dbus/dbus-keyring.c +++ b/dbus/dbus-keyring.c @@ -399,6 +399,7 @@ _dbus_keyring_reload (DBusKeyring *keyring, int n_keys; int i; long now; + DBusError tmp_error; if (!_dbus_string_init (&contents, _DBUS_INT_MAX)) { @@ -434,14 +435,15 @@ _dbus_keyring_reload (DBusKeyring *keyring, have_lock = TRUE; } - result = _dbus_file_get_contents (&contents, - &keyring->filename); - - if (result != DBUS_RESULT_SUCCESS) + dbus_error_init (&tmp_error); + if (!_dbus_file_get_contents (&contents, + &keyring->filename, + &tmp_error)) { _dbus_verbose ("Failed to load keyring file: %s\n", - dbus_result_to_string (result)); + tmp_error.message); /* continue with empty keyring file, so we recreate it */ + dbus_error_free (&tmp_error); } if (!_dbus_string_validate_ascii (&contents, 0, |