diff options
| author | Havoc Pennington <hp@redhat.com> | 2006-09-16 15:34:34 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2006-09-16 15:34:34 +0000 |
| commit | 08079a5bdedd6ec91cda413983e4bd3b6ee0252d (patch) | |
| tree | cbb7fe4a86f449c2595825c720557c955076a874 /dbus/dbus-server-unix.c | |
| parent | e24dec0a89a5853cb448fb3037f2658f2b682650 (diff) | |
2006-09-16 Havoc Pennington <hp@redhat.com>
* dbus/dbus-sysdeps-unix.h: small change to Peter's patch to make
dbus-sysdeps-unix-util.c build, add unix-specific sysdeps header.
* dbus/dbus-sysdeps.h, dbus-sysdeps-unix.c: patch from Peter
Kümmel bug #8249 to make the sysdeps.h read/write/open/close
functions specifically for sockets only, and move generic
read/write/open/close into unix-specific code.
Diffstat (limited to 'dbus/dbus-server-unix.c')
| -rw-r--r-- | dbus/dbus-server-unix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c index 64b4598a..377dfb03 100644 --- a/dbus/dbus-server-unix.c +++ b/dbus/dbus-server-unix.c @@ -102,7 +102,7 @@ handle_new_client_fd_and_unlock (DBusServer *server, transport = _dbus_transport_new_for_fd (client_fd, &server->guid_hex, NULL); if (transport == NULL) { - _dbus_close (client_fd, NULL); + _dbus_close_socket (client_fd, NULL); SERVER_UNLOCK (server); return FALSE; } @@ -219,7 +219,7 @@ unix_disconnect (DBusServer *server) unix_server->watch = NULL; } - _dbus_close (unix_server->fd, NULL); + _dbus_close_socket (unix_server->fd, NULL); unix_server->fd = -1; if (unix_server->socket_name != NULL) @@ -373,7 +373,7 @@ _dbus_server_new_for_domain_socket (const char *path, return server; failed_2: - _dbus_close (listen_fd, NULL); + _dbus_close_socket (listen_fd, NULL); failed_1: dbus_free (path_copy); failed_0: @@ -436,7 +436,7 @@ _dbus_server_new_for_tcp_socket (const char *host, if (server == NULL) { dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL); - _dbus_close (listen_fd, NULL); + _dbus_close_socket (listen_fd, NULL); _dbus_string_free (&address); return NULL; } |