dbus: make _dbus_close_socket() take DBusSocket*

This will allow to invalidate the socket in the following commit.

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

2 files changed, 6 insertions, 6 deletions

diff --git a/bus/dispatch.c b/bus/dispatch.c
index c3019b1e..3f985261 100644
--- a/bus/dispatch.c
+++ b/bus/dispatch.c
@@ -5181,9 +5181,9 @@ bus_unix_fds_passing_test (const char *test_data_dir_cstr)
                                 DBUS_TYPE_INVALID))
     _dbus_test_fatal ("Failed to attach fds.");
 
-  if (!_dbus_close_socket (one[0], &error))
+  if (!_dbus_close_socket (&one[0], &error))
     _dbus_test_fatal ("Failed to close pipe #1 ");
-  if (!_dbus_close_socket (two[0], &error))
+  if (!_dbus_close_socket (&two[0], &error))
     _dbus_test_fatal ("Failed to close pipe #2 ");
 
   if (!(dbus_connection_can_send_type(foo, DBUS_TYPE_UNIX_FD)))
@@ -5250,9 +5250,9 @@ bus_unix_fds_passing_test (const char *test_data_dir_cstr)
   if (read(two[1].fd, &r, 1) != 1 || r != 'Z')
     _dbus_test_fatal ("Failed to read value from pipe.");
 
-  if (!_dbus_close_socket (one[1], &error))
+  if (!_dbus_close_socket (&one[1], &error))
     _dbus_test_fatal ("Failed to close pipe #1 ");
-  if (!_dbus_close_socket (two[1], &error))
+  if (!_dbus_close_socket (&two[1], &error))
     _dbus_test_fatal ("Failed to close pipe #2 ");
 
   _dbus_verbose ("Disconnecting foo\n");
diff --git a/bus/main.c b/bus/main.c
index 5f756d5c..5614f244 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -387,10 +387,10 @@ close_reload_pipe (DBusWatch **watch)
     _dbus_watch_unref (*watch);
     *watch = NULL;
 
-    _dbus_close_socket (reload_pipe[RELOAD_READ_END], 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_close_socket (&reload_pipe[RELOAD_WRITE_END], NULL);
     _dbus_socket_invalidate (&reload_pipe[RELOAD_WRITE_END]);
 }
 #endif /* DBUS_UNIX */