From patchwork Wed Jul 25 20:50:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 173289 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 6277E2C008A for ; Thu, 26 Jul 2012 07:47:21 +1000 (EST) Received: from localhost ([::1]:48017 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su8Y7-00046b-Lg for incoming@patchwork.ozlabs.org; Wed, 25 Jul 2012 16:51:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50356) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su8XA-0001mj-Cm for qemu-devel@nongnu.org; Wed, 25 Jul 2012 16:50:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Su8X9-0004MQ-3r for qemu-devel@nongnu.org; Wed, 25 Jul 2012 16:50:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57885) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su8X8-0004MF-PS for qemu-devel@nongnu.org; Wed, 25 Jul 2012 16:50:15 -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 q6PKoDCG023515 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 25 Jul 2012 16:50:13 -0400 Received: from localhost (ovpn-113-89.phx2.redhat.com [10.3.113.89]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q6PKoCsH028768; Wed, 25 Jul 2012 16:50:13 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 25 Jul 2012 17:50:21 -0300 Message-Id: <1343249431-9245-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1343249431-9245-1-git-send-email-lcapitulino@redhat.com> References: <1343249431-9245-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: pbonzini@redhat.com, aliguori@us.ibm.com, armbru@redhat.com, afaerber@suse.de, peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH 04/14] qerror: drop qerror_report_internal() 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 It's not needed anymore and conflicts with future error improvements. Also drops related error information, that is, the file where the error ocurred, the line number and function. This has never been fully used. Signed-off-by: Luiz Capitulino --- qerror.c | 20 +++----------------- qerror.h | 8 +------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/qerror.c b/qerror.c index 74b3659..8138186 100644 --- a/qerror.c +++ b/qerror.c @@ -105,27 +105,14 @@ static QDict *build_error_no_arg(const char *fmt) /** * qerror_from_info(): Create a new QError from error information * - * The information consists of: - * - * - file the file name of where the error occurred - * - linenr the line number of where the error occurred - * - func the function name of where the error occurred - * - fmt JSON printf-like dictionary, there must exist keys 'class' and - * 'data' - * - va va_list of all arguments specified by fmt - * * Return strong reference. */ -static QError *qerror_from_info(const char *file, int linenr, const char *func, - const char *fmt, va_list *va) +static QError *qerror_from_info(const char *fmt, va_list *va) { QError *qerr; qerr = qerror_new(); loc_save(&qerr->loc); - qerr->linenr = linenr; - qerr->file = file; - qerr->func = func; qerr->error = error_object_from_fmt(fmt, va); if (!qerr->error) { @@ -259,14 +246,13 @@ static void qerror_print(QError *qerror) QDECREF(qstring); } -void qerror_report_internal(const char *file, int linenr, const char *func, - const char *fmt, ...) +void qerror_report(const char *fmt, ...) { va_list va; QError *qerror; va_start(va, fmt); - qerror = qerror_from_info(file, linenr, func, fmt, &va); + qerror = qerror_from_info(fmt, &va); va_end(va); if (monitor_cur_is_qmp()) { diff --git a/qerror.h b/qerror.h index 4955310..929017c 100644 --- a/qerror.h +++ b/qerror.h @@ -28,19 +28,13 @@ typedef struct QError { QObject_HEAD; QDict *error; Location loc; - int linenr; - const char *file; - const char *func; const QErrorStringTable *entry; } QError; QString *qerror_human(const QError *qerror); -void qerror_report_internal(const char *file, int linenr, const char *func, - const char *fmt, ...) GCC_FMT_ATTR(4, 5); +void qerror_report(const char *fmt, ...) GCC_FMT_ATTR(1, 2); void qerror_report_err(Error *err); void assert_no_error(Error *err); QString *qerror_format(const char *fmt, QDict *error); -#define qerror_report(fmt, ...) \ - qerror_report_internal(__FILE__, __LINE__, __func__, fmt, ## __VA_ARGS__) #endif /* QERROR_H */