ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qerror: avoid passing qerr pointer 

Helps dropping/modifying qerror functions.

Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Luiz Capitulino 2012-07-31 15:41:13 -03:00
parent fbe0a831f6
commit f2dd1d69ed
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
qerror.c
View File

@ -346,10 +346,10 @@ static QError *qerror_new(void)
return qerr; return qerr;
} }
static void GCC_FMT_ATTR(2, 0) qerror_set_data(QError *qerr, static QDict *error_obj_from_fmt_no_fail(const char *fmt, va_list *va)
const char *fmt, va_list *va)
{ {
QObject *obj; QObject *obj;
QDict *ret;
obj = qobject_from_jsonv(fmt, va); obj = qobject_from_jsonv(fmt, va);
if (!obj) { if (!obj) {
@ -361,9 +361,8 @@ static void GCC_FMT_ATTR(2, 0) qerror_set_data(QError *qerr,
abort(); abort();
} }
qerr->error = qobject_to_qdict(obj); ret = qobject_to_qdict(obj);
obj = qdict_get(ret, "class");
obj = qdict_get(qerr->error, "class");
if (!obj) { if (!obj) {
fprintf(stderr, "missing 'class' key in '%s'\n", fmt); fprintf(stderr, "missing 'class' key in '%s'\n", fmt);
abort(); abort();
@ -373,7 +372,7 @@ static void GCC_FMT_ATTR(2, 0) qerror_set_data(QError *qerr,
abort(); abort();
} }
obj = qdict_get(qerr->error, "data"); obj = qdict_get(ret, "data");
if (!obj) { if (!obj) {
fprintf(stderr, "missing 'data' key in '%s'\n", fmt); fprintf(stderr, "missing 'data' key in '%s'\n", fmt);
abort(); abort();
@ -382,9 +381,11 @@ static void GCC_FMT_ATTR(2, 0) qerror_set_data(QError *qerr,
fprintf(stderr, "'data' key value should be a dict in '%s'\n", fmt); fprintf(stderr, "'data' key value should be a dict in '%s'\n", fmt);
abort(); 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; int i;
@ -392,8 +393,7 @@ static void qerror_set_desc(QError *qerr, const char *fmt)
for (i = 0; qerror_table[i].error_fmt; i++) { for (i = 0; qerror_table[i].error_fmt; i++) {
if (strcmp(qerror_table[i].error_fmt, fmt) == 0) { if (strcmp(qerror_table[i].error_fmt, fmt) == 0) {
qerr->entry = &qerror_table[i]; return &qerror_table[i];
return;
} }
} }
@ -426,8 +426,8 @@ static QError *qerror_from_info(const char *file, int linenr, const char *func,
qerr->file = file; qerr->file = file;
qerr->func = func; qerr->func = func;
qerror_set_data(qerr, fmt, va); qerr->error = error_obj_from_fmt_no_fail(fmt, va);
qerror_set_desc(qerr, fmt); qerr->entry = get_desc_no_fail(fmt);
return qerr; return qerr;
} }