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 a76cb6f0abd89fb8ea2ff6318ac88b575de6df31..19a7c0d526ef30476af7cca7aed815d449a0451f 100644 (file)
--- 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 8d8bbf2b727078c45b6626b02105e3f62c4a6d46..05d9b20ea16780cad3d4d91c61d98f8d0928015f 100644 (file)
--- 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