From 32fd49801263965e46b0432a70608576dfeef53d Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Thu, 5 Mar 2015 19:15:56 +0100
Subject: [PATCH 1/3] DBusSocket refactoring - unix part

---
 dbus/dbus-server-unix.c  |  2 +-
 dbus/dbus-sysdeps-unix.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c
index fcfe27f..e94bc2e 100644
--- a/dbus/dbus-server-unix.c
+++ b/dbus/dbus-server-unix.c
@@ -289,7 +289,7 @@ _dbus_server_new_for_domain_socket (const char     *path,
                                     DBusError      *error)
 {
   DBusServer *server;
-  int listen_fd;
+  DBusSocket listen_fd;
   DBusString address;
   char *path_copy;
   DBusString path_str;
diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
index 3f60671..dae3b25 100644
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -274,10 +274,10 @@ _dbus_write_socket (int               fd,
  * @returns number of bytes appended to string
  */
 int
-_dbus_read_socket_with_unix_fds (int               fd,
+_dbus_read_socket_with_unix_fds (DBusSocket        fd,
                                  DBusString       *buffer,
                                  int               count,
-                                 int              *fds,
+                                 DBusSocket       *fds,
                                  int              *n_fds) {
 #ifndef HAVE_UNIX_FD_PASSING
   int r;
@@ -1807,7 +1807,7 @@ out:
  * @returns #TRUE on success
  */
 dbus_bool_t
-_dbus_read_credentials_socket  (int              client_fd,
+_dbus_read_credentials_socket  (DBusSocket       client_fd,
                                 DBusCredentials *credentials,
                                 DBusError       *error)
 {
@@ -3287,13 +3287,13 @@ _dbus_print_backtrace (void)
  * @returns #FALSE on failure (if error is set)
  */
 dbus_bool_t
-_dbus_full_duplex_pipe (int        *fd1,
-                        int        *fd2,
+_dbus_full_duplex_pipe (DBusSocket *fd1,
+                        DBusSocket *fd2,
                         dbus_bool_t blocking,
                         DBusError  *error)
 {
 #ifdef HAVE_SOCKETPAIR
-  int fds[2];
+  DBusSocket fds[2];
   int retval;
 
 #ifdef SOCK_CLOEXEC
-- 
1.8.4.5