diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2005-02-18 18:18:32 +0000 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2005-02-18 18:18:32 +0000 |
| commit | b0e260cd15f5d95f501eba254a803f180d547174 (patch) | |
| tree | d384badec538ef759dad0a867b4b3dd72f9d4b9e /dbus/dbus-server-unix.c | |
| parent | 74ae666f06076e8ebd9bc8267e3b824ef042b0ab (diff) | |
This commit was manufactured by cvs2svn to create tag 'dbus-0.23.2'.dbus-0.23.2
Diffstat (limited to 'dbus/dbus-server-unix.c')
| -rw-r--r-- | dbus/dbus-server-unix.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c index 4a07f149..e6e1c9a3 100644 --- a/dbus/dbus-server-unix.c +++ b/dbus/dbus-server-unix.c @@ -308,7 +308,6 @@ _dbus_server_new_for_domain_socket (const char *path, int listen_fd; DBusString address; char *path_copy; - DBusString path_str; _DBUS_ASSERT_ERROR_IS_CLEAR (error); @@ -318,12 +317,11 @@ _dbus_server_new_for_domain_socket (const char *path, return NULL; } - _dbus_string_init_const (&path_str, path); if ((abstract && !_dbus_string_append (&address, "unix:abstract=")) || (!abstract && !_dbus_string_append (&address, "unix:path=")) || - !_dbus_address_append_escaped (&address, &path_str)) + !_dbus_string_append (&address, path)) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); goto failed_0; @@ -386,7 +384,6 @@ _dbus_server_new_for_tcp_socket (const char *host, DBusServer *server; int listen_fd; DBusString address; - DBusString host_str; _DBUS_ASSERT_ERROR_IS_CLEAR (error); @@ -399,9 +396,8 @@ _dbus_server_new_for_tcp_socket (const char *host, if (host == NULL) host = "localhost"; - _dbus_string_init_const (&host_str, host); if (!_dbus_string_append (&address, "tcp:host=") || - !_dbus_address_append_escaped (&address, &host_str) || + !_dbus_string_append (&address, host) || !_dbus_string_append (&address, ",port=") || !_dbus_string_append_int (&address, port)) { |