From fbe0a831f68348d228acd9a4ec8a25582396282a Mon Sep 17 00:00:00 2001 From: Luiz Capitulino Date: Fri, 20 Jul 2012 10:35:18 -0300 Subject: [PATCH] qerror: drop qerror_abort() 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 a call to abort(). Signed-off-by: Luiz Capitulino Reviewed-by: Markus Armbruster --- qerror.c | 41 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/qerror.c b/qerror.c index bfb875a..7cb7c12 100644 --- a/qerror.c +++ b/qerror.c @@ -346,22 +346,6 @@ 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) { @@ -369,28 +353,34 @@ static void GCC_FMT_ATTR(2, 0) qerror_set_data(QError *qerr, 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"); 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"); 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(); } } @@ -407,7 +397,8 @@ static void qerror_set_desc(QError *qerr, const char *fmt) } } - qerror_abort(qerr, "error format '%s' not found", fmt); + fprintf(stderr, "error format '%s' not found\n", fmt); + abort(); } /** @@ -435,10 +426,6 @@ 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); -- 2.7.4