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 --- dbus/dbus-transport-unix.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'dbus/dbus-transport-unix.c') diff --git a/dbus/dbus-transport-unix.c b/dbus/dbus-transport-unix.c index 81672de5..5e37a007 100644 --- a/dbus/dbus-transport-unix.c +++ b/dbus/dbus-transport-unix.c @@ -977,12 +977,10 @@ _dbus_transport_new_for_fd (int fd, if (unix_transport == NULL) return NULL; - if (!_dbus_string_init (&unix_transport->encoded_outgoing, - _DBUS_INT_MAX)) + if (!_dbus_string_init (&unix_transport->encoded_outgoing)) goto failed_0; - if (!_dbus_string_init (&unix_transport->encoded_incoming, - _DBUS_INT_MAX)) + if (!_dbus_string_init (&unix_transport->encoded_incoming)) goto failed_1; unix_transport->write_watch = _dbus_watch_new (fd, @@ -1042,7 +1040,7 @@ _dbus_transport_new_for_domain_socket (const char *path, _DBUS_ASSERT_ERROR_IS_CLEAR (error); - if (!_dbus_string_init (&address, _DBUS_INT_MAX)) + if (!_dbus_string_init (&address)) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); return NULL; @@ -1102,7 +1100,7 @@ _dbus_transport_new_for_tcp_socket (const char *host, _DBUS_ASSERT_ERROR_IS_CLEAR (error); - if (!_dbus_string_init (&address, _DBUS_INT_MAX)) + if (!_dbus_string_init (&address)) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); return NULL; -- cgit