From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Za1xr-00069e-5X for qemu-devel@nongnu.org; Thu, 10 Sep 2015 09:32:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Za1xp-0005Et-2M for qemu-devel@nongnu.org; Thu, 10 Sep 2015 09:32:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40384) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Za1xo-0005Eg-UV for qemu-devel@nongnu.org; Thu, 10 Sep 2015 09:32:33 -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 AC6E18E6E9 for ; Thu, 10 Sep 2015 13:32:32 +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 t8ADWV4u031336 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Thu, 10 Sep 2015 09:32:32 -0400 From: Markus Armbruster Date: Thu, 10 Sep 2015 15:32:26 +0200 Message-Id: <1441891948-28169-6-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 5/7] error: error_set_errno() is unused, drop List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- include/qapi/error.h | 7 ++----- util/error.c | 5 ++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/include/qapi/error.h b/include/qapi/error.h index 692e013..8c3a7dd 100644 --- a/include/qapi/error.h +++ b/include/qapi/error.h @@ -35,8 +35,8 @@ void error_set(Error **errp, ErrorClass err_class, const char *fmt, ...) * printf-style human message, followed by a strerror() string if * @os_error is not zero. */ -void error_set_errno(Error **errp, int os_error, ErrorClass err_class, - const char *fmt, ...) GCC_FMT_ATTR(4, 5); +void error_setg_errno(Error **errp, int os_error, const char *fmt, ...) + GCC_FMT_ATTR(3, 4); #ifdef _WIN32 /** @@ -53,9 +53,6 @@ void error_setg_win32(Error **errp, int win32_err, const char *fmt, ...) */ 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__) /** * Helper for open() errors diff --git a/util/error.c b/util/error.c index 9620f2a..b842f20 100644 --- a/util/error.c +++ b/util/error.c @@ -65,8 +65,7 @@ void error_setg(Error **errp, const char *fmt, ...) va_end(ap); } -void error_set_errno(Error **errp, int os_errno, ErrorClass err_class, - const char *fmt, ...) +void error_setg_errno(Error **errp, int os_errno, const char *fmt, ...) { va_list ap; char *msg; @@ -77,7 +76,7 @@ void error_set_errno(Error **errp, int os_errno, ErrorClass err_class, } va_start(ap, fmt); - error_setv(errp, err_class, fmt, ap); + error_setv(errp, ERROR_CLASS_GENERIC_ERROR, fmt, ap); va_end(ap); if (os_errno != 0) { -- 2.4.3