fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-08 21:58:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dbus: simplify socket close() & invalidate() calls

Browse source 
Now that _dbus_close_socket() invalidates the socket on its own already.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2022-02-08 17:28:16 +04:00 • committed by Simon McVittie
parent 581344c17d
commit 81b49af8a2
6 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bus/main.c
View file

@ -388,10 +388,7 @@ close_reload_pipe (DBusWatch **watch)
*watch = NULL;
_dbus_close_socket (&reload_pipe[RELOAD_READ_END], NULL);
_dbus_socket_invalidate (&reload_pipe[RELOAD_READ_END]);
_dbus_close_socket (&reload_pipe[RELOAD_WRITE_END], NULL);
_dbus_socket_invalidate (&reload_pipe[RELOAD_WRITE_END]);
}
#endif /* DBUS_UNIX */

1
dbus/dbus-nonce.c
View file

@ -195,7 +195,6 @@ _dbus_accept_with_noncefile (DBusSocket listen_fd, const DBusNonceFile *noncefil
if (do_check_nonce(fd, &nonce, NULL) != TRUE) {
_dbus_verbose ("nonce check failed. Closing socket.\n");
_dbus_close_socket (&fd, NULL);
_dbus_socket_invalidate (&fd);
goto out;
}

5
dbus/dbus-server-socket.c
View file

@ -242,10 +242,7 @@ socket_disconnect (DBusServer *server)
}
if (_dbus_socket_is_valid (socket_server->fds[i]))
{
_dbus_close_socket (&socket_server->fds[i], NULL);
_dbus_socket_invalidate (&socket_server->fds[i]);
}
_dbus_close_socket (&socket_server->fds[i], NULL);
}
if (socket_server->socket_name != NULL)

10
dbus/dbus-sysdeps-unix.c
View file

@ -1503,7 +1503,6 @@ _dbus_connect_tcp_socket_with_nonce (const char *host,
_dbus_error_from_gai (res, errno),
"Failed to lookup host/port: \"%s:%s\": %s (%d)",
host, port, gai_strerror(res), res);
_dbus_socket_invalidate (&fd);
goto out;
}
@ -1521,8 +1520,7 @@ _dbus_connect_tcp_socket_with_nonce (const char *host,
if (connect (fd.fd, (struct sockaddr*) tmp->ai_addr, tmp->ai_addrlen) < 0)
{
saved_errno = errno;
_dbus_close (fd.fd, NULL);
_dbus_socket_invalidate (&fd);
_dbus_close_socket (&fd, NULL);
connect_error = dbus_new0 (DBusError, 1);
@ -1569,16 +1567,14 @@ _dbus_connect_tcp_socket_with_nonce (const char *host,
if (!ret)
{
_dbus_close (fd.fd, NULL);
_dbus_socket_invalidate (&fd);
_dbus_close_socket (&fd, NULL);
goto out;
}
}
if (!_dbus_set_fd_nonblocking (fd.fd, error))
{
_dbus_close (fd.fd, NULL);
_dbus_socket_invalidate (&fd);
_dbus_close_socket (&fd, NULL);
goto out;
}

12
dbus/dbus-sysdeps-win.c
View file

@ -1645,7 +1645,7 @@ _dbus_connect_tcp_socket_with_nonce (const char *host,
_dbus_error_from_errno (saved_errno),
"Failed to open socket: %s",
_dbus_strerror (saved_errno));
_dbus_socket_invalidate (&fd);
_dbus_assert (!_dbus_socket_is_valid (fd));
goto out;
}
_DBUS_ASSERT_ERROR_IS_CLEAR(error);
@ -1653,8 +1653,7 @@ _dbus_connect_tcp_socket_with_nonce (const char *host,
if (connect (fd.sock, (struct sockaddr*) tmp->ai_addr, tmp->ai_addrlen) == SOCKET_ERROR)
{
saved_errno = _dbus_get_low_level_socket_errno ();
closesocket(fd.sock);
_dbus_socket_invalidate (&fd);
_dbus_close_socket (&fd, NULL);
connect_error = dbus_new0 (DBusError, 1);
@ -1701,8 +1700,7 @@ _dbus_connect_tcp_socket_with_nonce (const char *host,
if (!ret)
{
closesocket (fd.sock);
_dbus_socket_invalidate (&fd);
_dbus_close_socket (&fd, NULL);
goto out;
}
}
@ -1712,8 +1710,7 @@ _dbus_connect_tcp_socket_with_nonce (const char *host,
if (!_dbus_set_socket_nonblocking (fd, error))
{
closesocket (fd.sock);
_dbus_socket_invalidate (&fd);
_dbus_close_socket (&fd, NULL);
goto out;
}
@ -1831,6 +1828,7 @@ _dbus_listen_tcp_socket (const char *host,
_dbus_error_from_errno (saved_errno),
"Failed to open socket: %s",
_dbus_strerror (saved_errno));
_dbus_assert (!_dbus_socket_is_valid (fd));
goto failed;
}
_DBUS_ASSERT_ERROR_IS_CLEAR(error);

2
dbus/dbus-transport-socket.c
View file

@ -1043,7 +1043,6 @@ socket_disconnect (DBusTransport *transport)
free_watches (transport);
_dbus_close_socket (&socket_transport->fd, NULL);
_dbus_socket_invalidate (&socket_transport->fd);
}
static dbus_bool_t
@ -1431,7 +1430,6 @@ _dbus_transport_new_for_tcp_socket (const char *host,
{
dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
_dbus_close_socket (&fd, NULL);
_dbus_socket_invalidate (&fd);
}
return transport;