From: Laurent Bigonville <bigon@bigon.be>
Date: Mon, 5 Mar 2018 21:30:44 +0000 (+0100)
Subject: Add _dbus_clear_loop and _dbus_clear_watch
X-Git-Tag: dbus-1.13.4~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a4e07925c54eac83878c39313f44fe87d6c3538;p=thirdparty%2Fdbus.git

Add _dbus_clear_loop and _dbus_clear_watch

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92831
[smcv: Fix variable names]
Reviewed-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/dbus/dbus-mainloop.h b/dbus/dbus-mainloop.h
index a76cb6f0a..19a7c0d52 100644
--- a/dbus/dbus-mainloop.h
+++ b/dbus/dbus-mainloop.h
@@ -60,6 +60,13 @@ dbus_bool_t _dbus_loop_dispatch       (DBusLoop            *loop);
 int  _dbus_get_oom_wait    (void);
 void _dbus_wait_for_memory (void);
 
+static inline void
+_dbus_clear_loop (DBusLoop **pointer_to_loop)
+{
+  _dbus_clear_pointer_impl (DBusLoop, pointer_to_loop,
+                            _dbus_loop_unref);
+}
+
 #endif /* !DOXYGEN_SHOULD_SKIP_THIS */
 
 #endif /* DBUS_MAINLOOP_H */
diff --git a/dbus/dbus-watch.h b/dbus/dbus-watch.h
index 8d8bbf2b7..05d9b20ea 100644
--- a/dbus/dbus-watch.h
+++ b/dbus/dbus-watch.h
@@ -99,6 +99,13 @@ DBusSocket     _dbus_watch_get_socket         (DBusWatch               *watch);
 DBUS_PRIVATE_EXPORT
 DBusPollable   _dbus_watch_get_pollable       (DBusWatch               *watch);
 
+static inline void
+_dbus_clear_watch (DBusWatch **pointer_to_watch)
+{
+  _dbus_clear_pointer_impl (DBusWatch, pointer_to_watch,
+                            _dbus_watch_unref);
+}
+
 /** @} */
 
 DBUS_END_DECLS