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.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=46095
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

diff --git a/bus/test-main.c b/bus/test-main.c
index 1b7c5bea77e403719c31a705ca7f41e829420e85..0f736c7c727c717092be7f1dd4d27c853382ffc0 100644 (file)
--- 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 091d315a56a4cf4fe1ff7e7241b80463f9577694..c19487321530bb9e0c98bc89aef874f68b167c2c 100644 (file)
--- 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 e64258ca8f008fe75bbbe5923df04237653346f4..e1578abd6c3f472fd6ebf0a6fc852c1cf6d94836 100644 (file)
--- 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