From ce4fd314c6be9bfee16a172d5ca34e5097d309fc Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Tue, 25 Mar 2003 04:37:08 +0000 Subject: 2003-03-24 Havoc Pennington * dbus/dbus-sysdeps.c (_dbus_set_fd_nonblocking): move to this file * dbus/dbus-errors.c (dbus_set_error, dbus_set_error_const): allow NULL argument for "message" if the error is a well-known one, fill in a generic message in this case. * dbus/dbus-errors.h (DBusResultCode): Kill DBusResultCode in favor of DBusError * bus/test.c (bus_test_flush_bus): add * bus/policy.c (bus_policy_test): test code stub --- dbus/dbus-sysdeps.h | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'dbus/dbus-sysdeps.h') diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h index 672d23a8..ac4e828a 100644 --- a/dbus/dbus-sysdeps.h +++ b/dbus/dbus-sysdeps.h @@ -76,22 +76,22 @@ typedef struct } DBusCredentials; int _dbus_connect_unix_socket (const char *path, - DBusResultCode *result); + DBusError *error); int _dbus_listen_unix_socket (const char *path, - DBusResultCode *result); + DBusError *error); int _dbus_connect_tcp_socket (const char *host, dbus_uint32_t port, - DBusResultCode *result); + DBusError *error); int _dbus_listen_tcp_socket (const char *host, dbus_uint32_t port, - DBusResultCode *result); + DBusError *error); int _dbus_accept (int listen_fd); dbus_bool_t _dbus_read_credentials_unix_socket (int client_fd, DBusCredentials *credentials, - DBusResultCode *result); + DBusError *error); dbus_bool_t _dbus_send_credentials_unix_socket (int server_fd, - DBusResultCode *result); + DBusError *error); dbus_bool_t _dbus_credentials_from_username (const DBusString *username, @@ -146,11 +146,13 @@ void _dbus_sleep_milliseconds (int milliseconds); void _dbus_get_current_time (long *tv_sec, long *tv_usec); + dbus_bool_t _dbus_file_get_contents (DBusString *str, const DBusString *filename, DBusError *error); -DBusResultCode _dbus_string_save_to_file (const DBusString *str, - const DBusString *filename); +dbus_bool_t _dbus_string_save_to_file (const DBusString *str, + const DBusString *filename, + DBusError *error); dbus_bool_t _dbus_create_file_exclusively (const DBusString *filename, DBusError *error); -- cgit