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-spawn.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-spawn.c')
| -rw-r--r-- | dbus/dbus-spawn.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c index f01ada27..b0a4fa2b 100644 --- a/dbus/dbus-spawn.c +++ b/dbus/dbus-spawn.c @@ -276,13 +276,13 @@ _dbus_babysitter_unref (DBusBabysitter *sitter) * a hangup and then the babysitter will * quit itself. */ - _dbus_close (sitter->socket_to_babysitter, NULL); + _dbus_close_socket (sitter->socket_to_babysitter, NULL); sitter->socket_to_babysitter = -1; } if (sitter->error_pipe_from_child >= 0) { - _dbus_close (sitter->error_pipe_from_child, NULL); + _dbus_close_socket (sitter->error_pipe_from_child, NULL); sitter->error_pipe_from_child = -1; } @@ -470,7 +470,7 @@ static void close_socket_to_babysitter (DBusBabysitter *sitter) { _dbus_verbose ("Closing babysitter\n"); - _dbus_close (sitter->socket_to_babysitter, NULL); + _dbus_close_socket (sitter->socket_to_babysitter, NULL); sitter->socket_to_babysitter = -1; } @@ -478,7 +478,7 @@ static void close_error_pipe_from_child (DBusBabysitter *sitter) { _dbus_verbose ("Closing child error\n"); - _dbus_close (sitter->error_pipe_from_child, NULL); + _dbus_close_socket (sitter->error_pipe_from_child, NULL); sitter->error_pipe_from_child = -1; } @@ -753,7 +753,7 @@ close_and_invalidate (int *fd) return -1; else { - ret = _dbus_close (*fd, NULL); + ret = _dbus_close_socket (*fd, NULL); *fd = -1; } |