Attachment 57088 Details for Bug 46095 – [PATCH 09/10] Move _dbus_check_fdleaks_enter to dbus-message-internal.h

[patch] [PATCH 09/10] Move _dbus_check_fdleaks_enter to dbus-message-internal.h

0009-Move-_dbus_check_fdleaks_enter-to-dbus-message-inter.patch (text/plain), 2.17 KB, created by Simon McVittie on 2012-02-15 04:28:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-02-15 04:28:34 UTC

Size: 2.17 KB

patch

obsolete

>From 20237b3dbb6f69c99709f6ac64807de94d3d0561 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 22 Jun 2011 11:06:30 +0100
>Subject: [PATCH 09/10] Move _dbus_check_fdleaks_enter to
> dbus-message-internal.h
>
>This means the bus test can use them without needing
>dbus-message-private.h, reducing its view of message internals.
>---
> bus/test-main.c              |    2 +-
> dbus/dbus-message-internal.h |    4 ++++
> dbus/dbus-message-private.h  |    4 ----
> 3 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/bus/test-main.c b/bus/test-main.c
>index 1b7c5be..0f736c7 100644
>--- a/bus/test-main.c
>+++ b/bus/test-main.c
>@@ -28,7 +28,7 @@
> #include <dbus/dbus-string.h>
> #include <dbus/dbus-sysdeps.h>
> #include <dbus/dbus-internals.h>
>-#include <dbus/dbus-message-private.h>
>+#include <dbus/dbus-message-internal.h>
> #include "selinux.h"
> 
> #ifdef DBUS_BUILD_TESTS
>diff --git a/dbus/dbus-message-internal.h b/dbus/dbus-message-internal.h
>index 091d315..c194873 100644
>--- a/dbus/dbus-message-internal.h
>+++ b/dbus/dbus-message-internal.h
>@@ -98,6 +98,10 @@ void               _dbus_message_loader_set_max_message_unix_fds(DBusMessageLoad
>                                                                  long                n);
> long               _dbus_message_loader_get_max_message_unix_fds(DBusMessageLoader  *loader);
> 
>+typedef struct DBusInitialFDs DBusInitialFDs;
>+DBusInitialFDs *_dbus_check_fdleaks_enter (void);
>+void            _dbus_check_fdleaks_leave (DBusInitialFDs *fds);
>+
> DBUS_END_DECLS
> 
> #endif /* DBUS_MESSAGE_INTERNAL_H */
>diff --git a/dbus/dbus-message-private.h b/dbus/dbus-message-private.h
>index e64258c..e1578ab 100644
>--- a/dbus/dbus-message-private.h
>+++ b/dbus/dbus-message-private.h
>@@ -136,10 +136,6 @@ dbus_bool_t _dbus_message_iter_get_args_valist (DBusMessageIter *iter,
>                                                 int              first_arg_type,
>                                                 va_list          var_args);
> 
>-typedef struct DBusInitialFDs DBusInitialFDs;
>-DBusInitialFDs *_dbus_check_fdleaks_enter (void);
>-void            _dbus_check_fdleaks_leave (DBusInitialFDs *fds);
>-
> /** @} */
> 
> DBUS_END_DECLS
>-- 
>1.7.9
>

Actions: View | Splinter Review

Attachments on bug 46095: 57080 | 57081 | 57082 | 57083 | 57084 | 57085 | 57086 | 57087 | 57088 | 57089

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.