From fa05de9230d62e7c427b5313796fc6ccd4d0ff60 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Mon, 31 Mar 2003 20:56:29 +0000 Subject: 2003-03-31 Havoc Pennington Fix some annoying DBusString API and fix all affected code. * dbus/dbus-string.c (_dbus_string_init): get rid of annoying max_length argument (_dbus_string_get_data): change to return string instead of using an out param (_dbus_string_get_const_data): ditto (_dbus_string_get_data_len): ditto (_dbus_string_get_const_data_len): ditto --- bus/dispatch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'bus/dispatch.c') diff --git a/bus/dispatch.c b/bus/dispatch.c index e75d8e6d..52214dbf 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -110,7 +110,7 @@ send_service_nonexistent_error (BusTransaction *transaction, * bounce back an error message. */ - if (!_dbus_string_init (&error_message, _DBUS_INT_MAX)) + if (!_dbus_string_init (&error_message)) { BUS_SET_OOM (error); return FALSE; @@ -125,7 +125,7 @@ send_service_nonexistent_error (BusTransaction *transaction, return FALSE; } - _dbus_string_get_const_data (&error_message, &error_str); + error_str = _dbus_string_get_const_data (&error_message); error_reply = dbus_message_new_error_reply (in_reply_to, DBUS_ERROR_SERVICE_DOES_NOT_EXIST, error_str); -- cgit