From 87729e3a6c56383642a8d3a86b2856487f2ee064 Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Tue, 15 Apr 2014 15:29:44 +0200 Subject: SBUS: Add a convenience function sbus_error_new MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adds a convenience function that constructs a DBusError on top of a talloc context and as such can be used to mark an sbus request as failed without having to create a DBusError instance by the caller. Reviewed-by: Pavel Březina Reviewed-by: Stef Walter --- src/sbus/sssd_dbus_request.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'src/sbus/sssd_dbus_request.c') diff --git a/src/sbus/sssd_dbus_request.c b/src/sbus/sssd_dbus_request.c index d8b189095..0021ce0e9 100644 --- a/src/sbus/sssd_dbus_request.c +++ b/src/sbus/sssd_dbus_request.c @@ -143,6 +143,33 @@ int sbus_request_fail_and_finish(struct sbus_request *dbus_req, return ret; } +DBusError *sbus_error_new(TALLOC_CTX *mem_ctx, + const char *dbus_err_name, + const char *fmt, + ...) +{ + DBusError *dberr; + const char *err_msg_dup = NULL; + va_list ap; + + dberr = talloc(mem_ctx, DBusError); + if (dberr == NULL) return NULL; + + if (fmt) { + va_start(ap, fmt); + err_msg_dup = talloc_vasprintf(dberr, fmt, ap); + va_end(ap); + if (err_msg_dup == NULL) { + talloc_free(dberr); + return NULL; + } + } + + dbus_error_init(dberr); + dbus_set_error_const(dberr, dbus_err_name, err_msg_dup); + return dberr; +} + struct array_arg { char **dbus_array; }; -- cgit