From 40a6b6e815d9762221ac0c6e6bd11a53fde4b11b Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Wed, 11 Mar 2015 15:56:58 +0100 Subject: [PATCH] Revert "Rename _dbus_full_duplex_pipe() to more descriptive name _dbus_socketpair()." This reverts commit ee0e15366c8b1ea196ad63a8376c8b5299279386. --- bus/dispatch.c | 4 ++-- bus/main.c | 4 ++-- dbus/dbus-server-debug-pipe.c | 3 ++- dbus/dbus-spawn-win.c | 6 +++--- dbus/dbus-spawn.c | 2 +- dbus/dbus-sysdeps-unix.c | 18 +++++++++--------- dbus/dbus-sysdeps-win.c | 18 ++++++++---------- dbus/dbus-sysdeps.h | 8 ++++---- 8 files changed, 31 insertions(+), 32 deletions(-) diff --git a/bus/dispatch.c b/bus/dispatch.c index 62c4eb5..5cb9d6f 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -5058,10 +5058,10 @@ bus_unix_fds_passing_test(const DBusString *test_data_dir) if (!(m = dbus_message_new_signal("/", "a.b.c", "d"))) _dbus_assert_not_reached ("could not alloc message"); - if (!(_dbus_socketpair (one, one+1, TRUE, &error))) + if (!(_dbus_full_duplex_pipe(one, one+1, TRUE, &error))) _dbus_assert_not_reached("Failed to allocate pipe #1"); - if (!(_dbus_socketpair (two, two+1, TRUE, &error))) + if (!(_dbus_full_duplex_pipe(two, two+1, TRUE, &error))) _dbus_assert_not_reached("Failed to allocate pipe #2"); if (!dbus_message_append_args(m, diff --git a/bus/main.c b/bus/main.c index 267a508..ad02b97 100644 --- a/bus/main.c +++ b/bus/main.c @@ -313,8 +313,8 @@ setup_reload_pipe (DBusLoop *loop) dbus_error_init (&error); - if (!_dbus_socketpair (&reload_pipe[0], &reload_pipe[1], - TRUE, &error)) + if (!_dbus_full_duplex_pipe (&reload_pipe[0], &reload_pipe[1], + TRUE, &error)) { _dbus_warn ("Unable to create reload pipe: %s\n", error.message); diff --git a/dbus/dbus-server-debug-pipe.c b/dbus/dbus-server-debug-pipe.c index 32d62dd..8f5ff5f 100644 --- a/dbus/dbus-server-debug-pipe.c +++ b/dbus/dbus-server-debug-pipe.c @@ -246,7 +246,8 @@ _dbus_transport_debug_pipe_new (const char *server_name, return NULL; } - if (!_dbus_socketpair (&client_fd, &server_fd, FALSE, NULL)) + if (!_dbus_full_duplex_pipe (&client_fd, &server_fd, FALSE, + NULL)) { _dbus_verbose ("failed to create full duplex pipe\n"); dbus_set_error (error, DBUS_ERROR_FAILED, "Could not create full-duplex pipe"); diff --git a/dbus/dbus-spawn-win.c b/dbus/dbus-spawn-win.c index f7b56d1..7da7a43 100644 --- a/dbus/dbus-spawn-win.c +++ b/dbus/dbus-spawn-win.c @@ -686,9 +686,9 @@ _dbus_spawn_async_with_babysitter (DBusBabysitter **sitter_p, } PING(); - if (!_dbus_socketpair (&sitter->socket_to_babysitter, - &sitter->socket_to_main, - FALSE, error)) + if (!_dbus_full_duplex_pipe (&sitter->socket_to_babysitter, + &sitter->socket_to_main, + FALSE, error)) goto out0; sitter->sitter_watch = _dbus_watch_new (sitter->socket_to_babysitter, diff --git a/dbus/dbus-spawn.c b/dbus/dbus-spawn.c index 86161e9..959c184 100644 --- a/dbus/dbus-spawn.c +++ b/dbus/dbus-spawn.c @@ -1258,7 +1258,7 @@ _dbus_spawn_async_with_babysitter (DBusBabysitter **sitter_p, if (!make_pipe (child_err_report_pipe, error)) goto cleanup_and_fail; - if (!_dbus_socketpair (&babysitter_pipe[0], &babysitter_pipe[1], TRUE, error)) + if (!_dbus_full_duplex_pipe (&babysitter_pipe[0], &babysitter_pipe[1], TRUE, error)) goto cleanup_and_fail; /* Setting up the babysitter is only useful in the parent, diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c index ab7efc2..3f60671 100644 --- a/dbus/dbus-sysdeps-unix.c +++ b/dbus/dbus-sysdeps-unix.c @@ -3275,22 +3275,22 @@ _dbus_print_backtrace (void) } /** - * Creates pair of connect sockets (as in socketpair()). - * Sets both ends of the pair nonblocking. + * Creates a full-duplex pipe (as in socketpair()). + * Sets both ends of the pipe nonblocking. * * Marks both file descriptors as close-on-exec * * @param fd1 return location for one end * @param fd2 return location for the other end - * @param blocking #TRUE if pair should be blocking + * @param blocking #TRUE if pipe should be blocking * @param error error return * @returns #FALSE on failure (if error is set) */ dbus_bool_t -_dbus_socketpair (int *fd1, - int *fd2, - dbus_bool_t blocking, - DBusError *error) +_dbus_full_duplex_pipe (int *fd1, + int *fd2, + dbus_bool_t blocking, + DBusError *error) { #ifdef HAVE_SOCKETPAIR int fds[2]; @@ -3346,9 +3346,9 @@ _dbus_socketpair (int *fd1, return TRUE; #else - _dbus_warn ("_dbus_socketpair() not implemented on this OS\n"); + _dbus_warn ("_dbus_full_duplex_pipe() not implemented on this OS\n"); dbus_set_error (error, DBUS_ERROR_FAILED, - "_dbus_socketpair() not implemented on this OS"); + "_dbus_full_duplex_pipe() not implemented on this OS"); return FALSE; #endif } diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c index 6e59c5e..5025815 100644 --- a/dbus/dbus-sysdeps-win.c +++ b/dbus/dbus-sysdeps-win.c @@ -1045,22 +1045,20 @@ failed: ************************************************************************/ /** - * Creates pair of connect sockets (as in socketpair()). - * Sets both ends of the pair nonblocking. - * - * Marks both file descriptors as close-on-exec + * Creates a full-duplex pipe (as in socketpair()). + * Sets both ends of the pipe nonblocking. * * @param fd1 return location for one end * @param fd2 return location for the other end - * @param blocking #TRUE if pair should be blocking + * @param blocking #TRUE if pipe should be blocking * @param error error return * @returns #FALSE on failure (if error is set) -*/ + */ dbus_bool_t -_dbus_socketpair (int *fd1, - int *fd2, - dbus_bool_t blocking, - DBusError *error) +_dbus_full_duplex_pipe (int *fd1, + int *fd2, + dbus_bool_t blocking, + DBusError *error) { SOCKET temp, socket1 = -1, socket2 = -1; struct sockaddr_in saddr; diff --git a/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h index bbbf708..2dbc420 100644 --- a/dbus/dbus-sysdeps.h +++ b/dbus/dbus-sysdeps.h @@ -438,10 +438,10 @@ dbus_bool_t _dbus_stat (const DBusString *filename, DBusStat *statbuf, DBusError *error); DBUS_PRIVATE_EXPORT -dbus_bool_t _dbus_socketpair (int *fd1, - int *fd2, - dbus_bool_t blocking, - DBusError *error); +dbus_bool_t _dbus_full_duplex_pipe (int *fd1, + int *fd2, + dbus_bool_t blocking, + DBusError *error); void _dbus_print_backtrace (void); -- 2.7.4