Commit 40a6b6e8 authored by Ralf Habacker's avatar Ralf Habacker

Revert "Rename _dbus_full_duplex_pipe() to more descriptive name _dbus_socketpair()."

This reverts commit ee0e1536.
parent dfaf56e9
......@@ -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,
......
......@@ -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);
......
......@@ -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");
......
......@@ -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,
......
......@@ -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,
......
......@@ -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
}
......
......@@ -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;
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment