From patchwork Fri Jul 27 21:31:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 173807 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 5DE932C0099 for ; Sat, 28 Jul 2012 08:31:08 +1000 (EST) Received: from localhost ([::1]:35901 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sus92-0007zx-Pk for incoming@patchwork.ozlabs.org; Fri, 27 Jul 2012 17:32:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49179) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sus8M-00068q-MG for qemu-devel@nongnu.org; Fri, 27 Jul 2012 17:31:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sus8L-00087L-Bz for qemu-devel@nongnu.org; Fri, 27 Jul 2012 17:31:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16916) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sus8L-00087G-3q for qemu-devel@nongnu.org; Fri, 27 Jul 2012 17:31:41 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6RLVeZB031409 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 27 Jul 2012 17:31:40 -0400 Received: from localhost (ovpn-113-90.phx2.redhat.com [10.3.113.90]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q6RLVds8014253; Fri, 27 Jul 2012 17:31:39 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Fri, 27 Jul 2012 18:31:46 -0300 Message-Id: <1343424728-22461-6-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1343424728-22461-1-git-send-email-lcapitulino@redhat.com> References: <1343424728-22461-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 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, pbonzini@redhat.com, aliguori@us.ibm.com, eblake@redhat.com, armbru@redhat.com Subject: [Qemu-devel] [PATCH 05/27] qerror: drop qerror_abort() 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 qerror_abort() depends on the 'file', 'func' and 'linenr' members of QError. However, these members are going to be dropped by the next commit, so let's drop qerror_abort() in favor of printing an error message to stderr plus an abort() call. Signed-off-by: Luiz Capitulino --- qerror.c | 65 ++++++++++++++++++++++++++-------------------------------------- 1 file changed, 26 insertions(+), 39 deletions(-) diff --git a/qerror.c b/qerror.c index ce0499b..59025ea 100644 --- a/qerror.c +++ b/qerror.c @@ -346,55 +346,46 @@ static QError *qerror_new(void) return qerr; } -static void GCC_FMT_ATTR(2, 3) qerror_abort(const QError *qerr, - const char *fmt, ...) -{ - va_list ap; - - fprintf(stderr, "qerror: bad call in function '%s':\n", qerr->func); - fprintf(stderr, "qerror: -> "); - - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - va_end(ap); - - fprintf(stderr, "\nqerror: call at %s:%d\n", qerr->file, qerr->linenr); - abort(); -} - -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) { - qerror_abort(qerr, "invalid format '%s'", fmt); + fprintf(stderr, "invalid json in error dict '%s'\n", fmt); + abort(); } if (qobject_type(obj) != QTYPE_QDICT) { - qerror_abort(qerr, "error format is not a QDict '%s'", fmt); + fprintf(stderr, "error is not a dict '%s'\n", fmt); + 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) { - qerror_abort(qerr, "missing 'class' key in '%s'", fmt); + fprintf(stderr, "missing 'class' key in '%s'\n", fmt); + abort(); } if (qobject_type(obj) != QTYPE_QSTRING) { - qerror_abort(qerr, "'class' key value should be a QString"); + 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) { - qerror_abort(qerr, "missing 'data' key in '%s'", fmt); + fprintf(stderr, "missing 'data' key in '%s'\n", fmt); + abort(); } if (qobject_type(obj) != QTYPE_QDICT) { - qerror_abort(qerr, "'data' key value should be a QDICT"); + 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; @@ -402,12 +393,12 @@ 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]; } } - qerror_abort(qerr, "error format '%s' not found", fmt); + fprintf(stderr, "error format '%s' not found\n", fmt); + abort(); } /** @@ -435,12 +426,8 @@ static QError *qerror_from_info(const char *file, int linenr, const char *func, qerr->file = file; qerr->func = func; - if (!fmt) { - qerror_abort(qerr, "QDict not specified"); - } - - 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; }