From: Mikel Astiz <mikel.astiz.oss@gmail.com>
To: linux-bluetooth@vger.kernel.org
Cc: Mikel Astiz <mikel.astiz@bmw-carit.de>
Subject: [RFC obexd v1 1/2] gdbus: Add helper function for error-handling
Date: Thu, 3 May 2012 14:41:47 +0200 [thread overview]
Message-ID: <1336048908-8685-2-git-send-email-mikel.astiz.oss@gmail.com> (raw)
In-Reply-To: <1336048908-8685-1-git-send-email-mikel.astiz.oss@gmail.com>
From: Mikel Astiz <mikel.astiz@bmw-carit.de>
The new function is a convenient way to create a D-Bus error message and
automatically free the GError object.
---
gdbus/gdbus.h | 4 ++++
gdbus/object.c | 14 ++++++++++++++
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/gdbus/gdbus.h b/gdbus/gdbus.h
index a0583e6..485ee01 100644
--- a/gdbus/gdbus.h
+++ b/gdbus/gdbus.h
@@ -138,6 +138,10 @@ DBusMessage *g_dbus_create_error(DBusMessage *message, const char *name,
__attribute__((format(printf, 3, 4)));
DBusMessage *g_dbus_create_error_valist(DBusMessage *message, const char *name,
const char *format, va_list args);
+
+DBusMessage *g_dbus_steal_from_gerror(DBusMessage *message, const char *name,
+ GError **err);
+
DBusMessage *g_dbus_create_reply(DBusMessage *message, int type, ...);
DBusMessage *g_dbus_create_reply_valist(DBusMessage *message,
int type, va_list args);
diff --git a/gdbus/object.c b/gdbus/object.c
index 8bc12f5..f4128b2 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -765,6 +765,20 @@ DBusMessage *g_dbus_create_error(DBusMessage *message, const char *name,
return reply;
}
+DBusMessage *g_dbus_steal_from_gerror(DBusMessage *message, const char *name,
+ GError **err)
+{
+ DBusMessage *reply;
+
+ if ((err == NULL) || (*err == NULL))
+ return NULL;
+
+ reply = g_dbus_create_error(message, name, "%s", (*err)->message);
+ g_clear_error(err);
+
+ return reply;
+}
+
DBusMessage *g_dbus_create_reply_valist(DBusMessage *message,
int type, va_list args)
{
--
1.7.7.6
next prev parent reply other threads:[~2012-05-03 12:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-03 12:41 [RFC obexd v1 0/2] D-Bus error from GError Mikel Astiz
2012-05-03 12:41 ` Mikel Astiz [this message]
2012-05-03 12:41 ` [RFC obexd v1 2/2] client: Use new D-Bus helper function Mikel Astiz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1336048908-8685-2-git-send-email-mikel.astiz.oss@gmail.com \
--to=mikel.astiz.oss@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
--cc=mikel.astiz@bmw-carit.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).