From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41435) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Za1xs-0006AD-PU for qemu-devel@nongnu.org; Thu, 10 Sep 2015 09:32:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Za1xn-0005Dp-78 for qemu-devel@nongnu.org; Thu, 10 Sep 2015 09:32:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60362) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Za1xn-0005DW-34 for qemu-devel@nongnu.org; Thu, 10 Sep 2015 09:32:31 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id CFDD82F02C4 for ; Thu, 10 Sep 2015 13:32:30 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-61.ams2.redhat.com [10.36.116.61]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t8ADWTON031313 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 10 Sep 2015 09:32:30 -0400 From: Markus Armbruster Date: Thu, 10 Sep 2015 15:32:23 +0200 Message-Id: <1441891948-28169-3-git-send-email-armbru@redhat.com> In-Reply-To: <1441891948-28169-1-git-send-email-armbru@redhat.com> References: <1441891948-28169-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PULL 2/7] error: Make error_setg() a function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Saves a tiny amount of code at every call site. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- include/qapi/error.h | 4 ++-- util/error.c | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/qapi/error.h b/include/qapi/error.h index f44c451..34af4e1 100644 --- a/include/qapi/error.h +++ b/include/qapi/error.h @@ -51,8 +51,8 @@ void error_set_win32(Error **errp, int win32_err, ErrorClass err_class, /** * Same as error_set(), but sets a generic error */ -#define error_setg(errp, fmt, ...) \ - error_set(errp, ERROR_CLASS_GENERIC_ERROR, fmt, ## __VA_ARGS__) +void error_setg(Error **errp, const char *fmt, ...) + GCC_FMT_ATTR(2, 3); #define error_setg_errno(errp, os_error, fmt, ...) \ error_set_errno(errp, os_error, ERROR_CLASS_GENERIC_ERROR, \ fmt, ## __VA_ARGS__) diff --git a/util/error.c b/util/error.c index 4518642..8f12f67 100644 --- a/util/error.c +++ b/util/error.c @@ -56,6 +56,15 @@ void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...) va_end(ap); } +void error_setg(Error **errp, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + error_setv(errp, ERROR_CLASS_GENERIC_ERROR, fmt, ap); + va_end(ap); +} + void error_set_errno(Error **errp, int os_errno, ErrorClass err_class, const char *fmt, ...) { -- 2.4.3