macro: increase VA_FORMAT_ADVANCE type array and hit assert when it is reached

[elogind.git] / src / shared / dbus-common.c

diff --git a/src/shared/dbus-common.c b/src/shared/dbus-common.c
index b8229bd66331d93f0c6d15de1b71d0c3718bf7a4..c53bf59eb396575d3d40c16abcad745bffa38ad1 100644 (file)
--- a/src/shared/dbus-common.c
+++ b/src/shared/dbus-common.c
@@ -32,6 +32,7 @@
 #include "log.h"
 #include "dbus-common.h"
 #include "util.h"
+#include "missing.h"
 #include "def.h"
 #include "strv.h"
 
@@ -121,7 +122,7 @@ int bus_connect(DBusBusType t, DBusConnection **_bus, bool *_private, DBusError
                          * try via XDG_RUNTIME_DIR first, then
                          * fallback to normal bus access */
 
-                        e = __secure_getenv("XDG_RUNTIME_DIR");
+                        e = secure_getenv("XDG_RUNTIME_DIR");
                         if (e) {
                                 char *p;
 
@@ -1317,3 +1318,9 @@ finish:
 
         return r;
 }
+
+
+void dbus_message_unref_p(DBusMessage **reply) {
+        if (*reply)
+                dbus_message_unref(*reply);
+}