Imported Upstream version 1.29

[platform/upstream/connman.git] / gdbus / object.c

diff --git a/gdbus/object.c b/gdbus/object.c
index 4d5a64c..96db516 100644 (file)
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -1412,7 +1412,10 @@ DBusMessage *g_dbus_create_error_valist(DBusMessage *message, const char *name,
 {
        char str[1024];
 
-       vsnprintf(str, sizeof(str), format, args);
+       if (format)
+               vsnprintf(str, sizeof(str), format, args);
+       else
+               str[0] = '\0';
 
        return dbus_message_new_error(message, name, str);
 }
@@ -1530,11 +1533,8 @@ gboolean g_dbus_send_error_valist(DBusConnection *connection,
                                        const char *format, va_list args)
 {
        DBusMessage *error;
-       char str[1024];
-
-       vsnprintf(str, sizeof(str), format, args);
 
-       error = dbus_message_new_error(message, name, str);
+       error = g_dbus_create_error_valist(message, name, format, args);
        if (error == NULL)
                return FALSE;
 
@@ -1816,3 +1816,8 @@ void g_dbus_set_flags(int flags)
 {
        global_flags = flags;
 }
+
+int g_dbus_get_flags(void)
+{
+       return global_flags;
+}