[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/27] qerror: drop qerror_abort()
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PATCH 05/27] qerror: drop qerror_abort() |
Date: |
Fri, 27 Jul 2012 18:31:46 -0300 |
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 <address@hidden>
---
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;
}
--
1.7.11.2.249.g31c7954.dirty
- [Qemu-devel] [RFC 00/27]: add new error format, Luiz Capitulino, 2012/07/27
- [Qemu-devel] [PATCH 01/27] monitor: drop unused monitor debug code, Luiz Capitulino, 2012/07/27
- [Qemu-devel] [PATCH 02/27] qerror: QERR_AMBIGUOUS_PATH: drop %(object) from human msg, Luiz Capitulino, 2012/07/27
- [Qemu-devel] [PATCH 03/27] qerror: QERR_DEVICE_ENCRYPTED: add filename info to human msg, Luiz Capitulino, 2012/07/27
- [Qemu-devel] [PATCH 04/27] qerror: reduce public exposure, Luiz Capitulino, 2012/07/27
- [Qemu-devel] [PATCH 05/27] qerror: drop qerror_abort(),
Luiz Capitulino <=
- [Qemu-devel] [PATCH 06/27] qerror: QError: drop file, linenr, func, Luiz Capitulino, 2012/07/27
- [Qemu-devel] [PATCH 07/27] qerror: qerror_format(): return an allocated string, Luiz Capitulino, 2012/07/27
- [Qemu-devel] [PATCH 08/27] qerror: don't delay error message construction, Luiz Capitulino, 2012/07/27
- [Qemu-devel] [PATCH 09/27] error: don't delay error message construction, Luiz Capitulino, 2012/07/27
- [Qemu-devel] [PATCH 10/27] qmp: query-block: add 'valid_encryption_key' field, Luiz Capitulino, 2012/07/27
- [Qemu-devel] [PATCH 11/27] hmp: hmp_cont(): don't rely on QERR_DEVICE_ENCRYPTED, Luiz Capitulino, 2012/07/27
- [Qemu-devel] [PATCH 12/27] hmp: hmp_change(): don't use error_get_field(), Luiz Capitulino, 2012/07/27
- [Qemu-devel] [PATCH 13/27] error: error_is_type(): don't use error_get_field(), Luiz Capitulino, 2012/07/27
- [Qemu-devel] [PATCH 15/27] block: block_int: include qerror.h, Luiz Capitulino, 2012/07/27
- [Qemu-devel] [PATCH 16/27] hmp: hmp.h: include qdict.h, Luiz Capitulino, 2012/07/27