diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-22 11:59:32 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-22 11:59:32 +0100 |
| commit | f08508e9344a0c0df5f0065f1edc45ff60d2a6c7 (patch) | |
| tree | 662d58ba3d1b7094bd4c9e7eb858ba8ccb57080e | |
| parent | 8cf4e6efa8910221407a77d9fbc0b5938f63e37b (diff) | |
_dbus_connect_tcp_socket_with_nonce: don't create an extra fd (which is then leaked)wip-scatter-gather
This block should have been deleted in 2007, when IPv6 support was added:
previously, the fd allocated at the beginning of the function was used
for connect(), but for IPv6 support, the socket() call has to be inside
the loop over getaddrinfo() results so its address family can be changed.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37258
| -rw-r--r-- | dbus/dbus-sysdeps-unix.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c index 8e367e43..80bcd525 100644 --- a/dbus/dbus-sysdeps-unix.c +++ b/dbus/dbus-sysdeps-unix.c @@ -1034,14 +1034,6 @@ _dbus_connect_tcp_socket_with_nonce (const char *host, struct addrinfo hints; struct addrinfo *ai, *tmp; - _DBUS_ASSERT_ERROR_IS_CLEAR (error); - - if (!_dbus_open_tcp_socket (&fd, error)) - { - _DBUS_ASSERT_ERROR_IS_SET(error); - return -1; - } - _DBUS_ASSERT_ERROR_IS_CLEAR(error); _DBUS_ZERO (hints); |