Commit 725cbb2a authored by Simon McVittie's avatar Simon McVittie

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=46095Signed-off-by: default avatarSimon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Guillaume Desmottes's avatarGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
parent c5b93567
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <dbus/dbus-string.h> #include <dbus/dbus-string.h>
#include <dbus/dbus-sysdeps.h> #include <dbus/dbus-sysdeps.h>
#include <dbus/dbus-internals.h> #include <dbus/dbus-internals.h>
#include <dbus/dbus-message-private.h> #include <dbus/dbus-message-internal.h>
#include "selinux.h" #include "selinux.h"
#ifdef DBUS_BUILD_TESTS #ifdef DBUS_BUILD_TESTS
......
...@@ -98,6 +98,10 @@ void _dbus_message_loader_set_max_message_unix_fds(DBusMessageLoad ...@@ -98,6 +98,10 @@ void _dbus_message_loader_set_max_message_unix_fds(DBusMessageLoad
long n); long n);
long _dbus_message_loader_get_max_message_unix_fds(DBusMessageLoader *loader); 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 DBUS_END_DECLS
#endif /* DBUS_MESSAGE_INTERNAL_H */ #endif /* DBUS_MESSAGE_INTERNAL_H */
...@@ -136,10 +136,6 @@ dbus_bool_t _dbus_message_iter_get_args_valist (DBusMessageIter *iter, ...@@ -136,10 +136,6 @@ dbus_bool_t _dbus_message_iter_get_args_valist (DBusMessageIter *iter,
int first_arg_type, int first_arg_type,
va_list var_args); va_list var_args);
typedef struct DBusInitialFDs DBusInitialFDs;
DBusInitialFDs *_dbus_check_fdleaks_enter (void);
void _dbus_check_fdleaks_leave (DBusInitialFDs *fds);
/** @} */ /** @} */
DBUS_END_DECLS DBUS_END_DECLS
......
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