From patchwork Fri Aug 10 17:43:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 176576 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 067BC2C0097 for ; Sat, 11 Aug 2012 04:19:00 +1000 (EST) Received: from localhost ([::1]:49250 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SztGW-0001uk-RI for incoming@patchwork.ozlabs.org; Fri, 10 Aug 2012 13:44:52 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SztFi-00007u-IW for qemu-devel@nongnu.org; Fri, 10 Aug 2012 13:44:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SztFg-0001Pq-8K for qemu-devel@nongnu.org; Fri, 10 Aug 2012 13:44:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49992) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SztFf-0001Pi-Uw for qemu-devel@nongnu.org; Fri, 10 Aug 2012 13:44:00 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7AHhvFu004748 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 10 Aug 2012 13:43:57 -0400 Received: from localhost (ovpn-113-102.phx2.redhat.com [10.3.113.102]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q7AHhunT006623; Fri, 10 Aug 2012 13:43:57 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 10 Aug 2012 14:43:44 -0300 Message-Id: <1344620653-29067-7-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1344620653-29067-1-git-send-email-lcapitulino@redhat.com> References: <1344620653-29067-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, aliguori@us.ibm.com, armbru@redhat.com, mdroth@linux.vnet.ibm.com, pbonzini@redhat.com, eblake@redhat.com Subject: [Qemu-devel] [PATCH 06/35] qerror: avoid passing qerr pointer X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Helps dropping/modifying qerror functions. Signed-off-by: Luiz Capitulino --- qerror.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/qerror.c b/qerror.c index 7cb7c12..e717496 100644 --- a/qerror.c +++ b/qerror.c @@ -346,10 +346,10 @@ static QError *qerror_new(void) return qerr; } -static void GCC_FMT_ATTR(2, 0) qerror_set_data(QError *qerr, - const char *fmt, va_list *va) +static QDict *error_obj_from_fmt_no_fail(const char *fmt, va_list *va) { QObject *obj; + QDict *ret; obj = qobject_from_jsonv(fmt, va); if (!obj) { @@ -361,9 +361,8 @@ static void GCC_FMT_ATTR(2, 0) qerror_set_data(QError *qerr, abort(); } - qerr->error = qobject_to_qdict(obj); - - obj = qdict_get(qerr->error, "class"); + ret = qobject_to_qdict(obj); + obj = qdict_get(ret, "class"); if (!obj) { fprintf(stderr, "missing 'class' key in '%s'\n", fmt); abort(); @@ -372,8 +371,8 @@ static void GCC_FMT_ATTR(2, 0) qerror_set_data(QError *qerr, fprintf(stderr, "'class' key value should be a string in '%s'\n", fmt); abort(); } - - obj = qdict_get(qerr->error, "data"); + + obj = qdict_get(ret, "data"); if (!obj) { fprintf(stderr, "missing 'data' key in '%s'\n", fmt); abort(); @@ -382,9 +381,11 @@ static void GCC_FMT_ATTR(2, 0) qerror_set_data(QError *qerr, fprintf(stderr, "'data' key value should be a dict in '%s'\n", fmt); abort(); } + + return ret; } -static void qerror_set_desc(QError *qerr, const char *fmt) +static const QErrorStringTable *get_desc_no_fail(const char *fmt) { int i; @@ -392,8 +393,7 @@ static void qerror_set_desc(QError *qerr, const char *fmt) for (i = 0; qerror_table[i].error_fmt; i++) { if (strcmp(qerror_table[i].error_fmt, fmt) == 0) { - qerr->entry = &qerror_table[i]; - return; + return &qerror_table[i]; } } @@ -426,8 +426,8 @@ static QError *qerror_from_info(const char *file, int linenr, const char *func, qerr->file = file; qerr->func = func; - qerror_set_data(qerr, fmt, va); - qerror_set_desc(qerr, fmt); + qerr->error = error_obj_from_fmt_no_fail(fmt, va); + qerr->entry = get_desc_no_fail(fmt); return qerr; }