From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:49190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sus8O-0006Dg-1m for qemu-devel@nongnu.org; Fri, 27 Jul 2012 17:31:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sus8N-00087b-0F for qemu-devel@nongnu.org; Fri, 27 Jul 2012 17:31:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59005) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sus8M-00087T-Nr for qemu-devel@nongnu.org; Fri, 27 Jul 2012 17:31:42 -0400 From: Luiz Capitulino Date: Fri, 27 Jul 2012 18:31:47 -0300 Message-Id: <1343424728-22461-7-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> Subject: [Qemu-devel] [PATCH 06/27] qerror: QError: drop file, linenr, func List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, aliguori@us.ibm.com, eblake@redhat.com, armbru@redhat.com They have never been fully used and conflict with future error related improvements. 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 59025ea..f55a652 100644 --- a/qerror.c +++ b/qerror.c @@ -404,27 +404,14 @@ static const QErrorStringTable *get_desc_no_fail(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_obj_from_fmt_no_fail(fmt, va); qerr->entry = get_desc_no_fail(fmt); @@ -545,14 +532,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 fe8870c..3c0b14c 100644 --- a/qerror.h +++ b/qerror.h @@ -27,20 +27,14 @@ 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__) /* * QError class list -- 1.7.11.2.249.g31c7954.dirty