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

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

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

6 files changed, 9 insertions, 24 deletions

diff --git a/bus/main.c b/bus/main.c
index 5614f244..ddd9d952 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -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 */
 
diff --git a/dbus/dbus-nonce.c b/dbus/dbus-nonce.c
index fe86fb12..c6e0a086 100644
--- a/dbus/dbus-nonce.c
+++ b/dbus/dbus-nonce.c
@@ -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;
   }
 
diff --git a/dbus/dbus-server-socket.c b/dbus/dbus-server-socket.c
index 3bab5960..1099b5e1 100644
--- a/dbus/dbus-server-socket.c
+++ b/dbus/dbus-server-socket.c
@@ -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)
diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index c77adc09..09d5744a 100644
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -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;
     }
 
diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index d15b6991..b74981c3 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -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);
diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c
index 37560b11..8f2d37a3 100644
--- a/dbus/dbus-transport-socket.c
+++ b/dbus/dbus-transport-socket.c
@@ -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;