Attachment 114092 Details for Bug 89444 – Rename _dbus_full_duplex_pipe() to more descriptive name _dbus_socketpair().

[patch] Rename _dbus_full_duplex_pipe() to more descriptive name _dbus_socketpair().

0001-Rename-_dbus_full_duplex_pipe-to-more-descriptive-na.patch (text/plain), 7.28 KB, created by Ralf Habacker on 2015-03-06 18:27:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2015-03-06 18:27:41 UTC

Size: 7.28 KB

patch

obsolete

>From f7575028df1bd85a95d434d35c64b213d68f5573 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Fri, 6 Mar 2015 08:09:57 +0100
>Subject: [PATCH] Rename _dbus_full_duplex_pipe() to more descriptive name
> _dbus_socketpair().
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89444
>---
> 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, 32 insertions(+), 31 deletions(-)
>
>diff --git a/bus/dispatch.c b/bus/dispatch.c
>index 5cb9d6f..62c4eb5 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_full_duplex_pipe(one, one+1, TRUE, &error)))
>+  if (!(_dbus_socketpair (one, one+1, TRUE, &error)))
>     _dbus_assert_not_reached("Failed to allocate pipe #1");
> 
>-  if (!(_dbus_full_duplex_pipe(two, two+1, TRUE, &error)))
>+  if (!(_dbus_socketpair (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 ad02b97..267a508 100644
>--- a/bus/main.c
>+++ b/bus/main.c
>@@ -313,8 +313,8 @@ setup_reload_pipe (DBusLoop *loop)
> 
>   dbus_error_init (&error);
> 
>-  if (!_dbus_full_duplex_pipe (&reload_pipe[0], &reload_pipe[1],
>-			       TRUE, &error))
>+  if (!_dbus_socketpair (&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 8f5ff5f..32d62dd 100644
>--- a/dbus/dbus-server-debug-pipe.c
>+++ b/dbus/dbus-server-debug-pipe.c
>@@ -246,8 +246,7 @@ _dbus_transport_debug_pipe_new (const char     *server_name,
>       return NULL;
>     }
>   
>-  if (!_dbus_full_duplex_pipe (&client_fd, &server_fd, FALSE,
>-                               NULL))
>+  if (!_dbus_socketpair (&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 7da7a43..f7b56d1 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_full_duplex_pipe (&sitter->socket_to_babysitter,
>-                               &sitter->socket_to_main,
>-                               FALSE, error))
>+  if (!_dbus_socketpair (&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 959c184..86161e9 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_full_duplex_pipe (&babysitter_pipe[0], &babysitter_pipe[1], TRUE, error))
>+  if (!_dbus_socketpair (&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 3f60671..ab7efc2 100644
>--- a/dbus/dbus-sysdeps-unix.c
>+++ b/dbus/dbus-sysdeps-unix.c
>@@ -3275,22 +3275,22 @@ _dbus_print_backtrace (void)
> }
> 
> /**
>- * Creates a full-duplex pipe (as in socketpair()).
>- * Sets both ends of the pipe nonblocking.
>+ * Creates pair of connect sockets (as in socketpair()).
>+ * Sets both ends of the pair 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 pipe should be blocking
>+ * @param blocking #TRUE if pair should be blocking
>  * @param error error return
>  * @returns #FALSE on failure (if error is set)
>  */
> dbus_bool_t
>-_dbus_full_duplex_pipe (int        *fd1,
>-                        int        *fd2,
>-                        dbus_bool_t blocking,
>-                        DBusError  *error)
>+_dbus_socketpair (int        *fd1,
>+                  int        *fd2,
>+                  dbus_bool_t blocking,
>+                  DBusError  *error)
> {
> #ifdef HAVE_SOCKETPAIR
>   int fds[2];
>@@ -3346,9 +3346,9 @@ _dbus_full_duplex_pipe (int        *fd1,
> 
>   return TRUE;
> #else
>-  _dbus_warn ("_dbus_full_duplex_pipe() not implemented on this OS\n");
>+  _dbus_warn ("_dbus_socketpair() not implemented on this OS\n");
>   dbus_set_error (error, DBUS_ERROR_FAILED,
>-                  "_dbus_full_duplex_pipe() not implemented on this OS");
>+                  "_dbus_socketpair() not implemented on this OS");
>   return FALSE;
> #endif
> }
>diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
>index 5025815..6e59c5e 100644
>--- a/dbus/dbus-sysdeps-win.c
>+++ b/dbus/dbus-sysdeps-win.c
>@@ -1045,20 +1045,22 @@ failed:
>  ************************************************************************/
> 
> /**
>- * Creates a full-duplex pipe (as in socketpair()).
>- * Sets both ends of the pipe nonblocking.
>+ * Creates pair of connect sockets (as in socketpair()).
>+ * Sets both ends of the pair 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 pipe should be blocking
>+ * @param blocking #TRUE if pair should be blocking
>  * @param error error return
>  * @returns #FALSE on failure (if error is set)
>- */
>+*/
> dbus_bool_t
>-_dbus_full_duplex_pipe (int        *fd1,
>-                        int        *fd2,
>-                        dbus_bool_t blocking,
>-                        DBusError  *error)
>+_dbus_socketpair (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 2dbc420..bbbf708 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_full_duplex_pipe (int              *fd1,
>-                                    int              *fd2,
>-                                    dbus_bool_t       blocking,
>-                                    DBusError        *error);
>+dbus_bool_t _dbus_socketpair (int              *fd1,
>+                              int              *fd2,
>+                              dbus_bool_t       blocking,
>+                              DBusError        *error);
> 
> void        _dbus_print_backtrace  (void);
> 
>-- 
>1.8.4.5
>

Actions: View | Splinter Review

Attachments on bug 89444: 114033 | 114034 | 114035 | 114036 | 114037 | 114041 | 114042 | 114069 | 114070 | 114092 | 114093 | 114132 | 114755 | 114756 | 114757 | 114758 | 114759 | 114760 | 114761 | 114762 | 114763 | 114764 | 114765 | 114788 | 115135 | 115157 | 115158 | 115159

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.