diff options
| author | taesubkim <taesub.kim@samsung.com> | 2016-04-26 15:47:01 +0900 |
|---|---|---|
| committer | taesubkim <taesub.kim@samsung.com> | 2016-04-26 16:14:46 +0900 |
| commit | 22633ced6225d294ce8483efbf2b39ea0c0c1b65 (patch) | |
| tree | 8c5f2312feec413068a18e57a80321b31b4f7b74 /gdbus/object.c | |
| parent | bcae74da8fa2958b3fec9153fc33e41f0e0317bf (diff) | |
| download | connman-22633ced6225d294ce8483efbf2b39ea0c0c1b65.tar.gz connman-22633ced6225d294ce8483efbf2b39ea0c0c1b65.tar.bz2 connman-22633ced6225d294ce8483efbf2b39ea0c0c1b65.zip | |
Imported Upstream version 1.29upstream/1.29
Change-Id: I2958446c35966d9ed72df0120b80561be7d89f54
Signed-off-by: Taesub Kim <taesub.kim@samsung.com>
Diffstat (limited to 'gdbus/object.c')
| -rw-r--r-- | gdbus/object.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/gdbus/object.c b/gdbus/object.c index 4d5a64cb..96db5166 100644 --- 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; +} |