Attachment 114042 Details for Bug 89444 – Revert partially DBusSocket refactoring, it is not appliable (to be merged into the main patch)

[patch] Revert partially DBusSocket refactoring, it is not appliable (to be merged into the main patch)

0001-Revert-partially-DBusSocket-refactoring-it-is-not-ap.patch (text/plain), 1.26 KB, created by Ralf Habacker on 2015-03-05 20:32:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2015-03-05 20:32:43 UTC

Size: 1.26 KB

patch

obsolete

>From 2f01632cee950e72fffb07fa5d9e9604feafbbcb Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Thu, 5 Mar 2015 21:32:10 +0100
>Subject: [PATCH] Revert partially DBusSocket refactoring, it is not appliable
> (to be merged into the main patch)
>
>---
> dbus/dbus-transport-socket.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c
>index 518395a..da635fd 100644
>--- a/dbus/dbus-transport-socket.c
>+++ b/dbus/dbus-transport-socket.c
>@@ -604,7 +604,7 @@ do_writing (DBusTransport *transport)
>           if (socket_transport->message_bytes_written <= 0 && DBUS_TRANSPORT_CAN_SEND_UNIX_FD(transport))
>             {
>               /* Send the fds along with the first byte of the message */
>-              const DBusSocket *unix_fds;
>+              const int *unix_fds;
>               unsigned n;
> 
>               _dbus_message_get_unix_fds(message, &unix_fds, &n);
>@@ -821,7 +821,7 @@ do_reading (DBusTransport *transport)
> #ifdef HAVE_UNIX_FD_PASSING
>       if (DBUS_TRANSPORT_CAN_SEND_UNIX_FD(transport))
>         {
>-          DBusSocket *fds;
>+          int *fds;
>           int n_fds;
> 
>           if (!_dbus_message_loader_get_unix_fds(transport->loader, &fds, &n_fds))
>-- 
>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.