[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/11] qerror: expose a function to format an error
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [PATCH 02/11] qerror: expose a function to format an error |
Date: |
Fri, 11 Mar 2011 15:00:40 -0600 |
This will let Error share the QError human formatting. This is only used for
HMP.
Signed-off-by: Anthony Liguori <address@hidden>
diff --git a/qerror.c b/qerror.c
index 4855604..13d53c9 100644
--- a/qerror.c
+++ b/qerror.c
@@ -326,12 +326,18 @@ QError *qerror_from_info(const char *file, int linenr,
const char *func,
return qerr;
}
-static void parse_error(const QError *qerror, int c)
+static void parse_error(const QErrorStringTable *entry, int c)
{
- qerror_abort(qerror, "expected '%c' in '%s'", c, qerror->entry->desc);
+#if 0
+ qerror_abort(qerror, "expected '%c' in '%s'", c, entry->desc);
+#else
+ fprintf(stderr, "expected '%c' in '%s'", c, entry->desc);
+ abort();
+#endif
}
-static const char *append_field(QString *outstr, const QError *qerror,
+static const char *append_field(QDict *error, QString *outstr,
+ const QErrorStringTable *entry,
const char *start)
{
QObject *obj;
@@ -339,24 +345,31 @@ static const char *append_field(QString *outstr, const
QError *qerror,
QString *key_qs;
const char *end, *key;
- if (*start != '%')
- parse_error(qerror, '%');
+ if (*start != '%') {
+ parse_error(entry, '%');
+ }
start++;
- if (*start != '(')
- parse_error(qerror, '(');
+ if (*start != '(') {
+ parse_error(entry, '(');
+ }
start++;
end = strchr(start, ')');
- if (!end)
- parse_error(qerror, ')');
+ if (!end) {
+ parse_error(entry, ')');
+ }
key_qs = qstring_from_substr(start, 0, end - start - 1);
key = qstring_get_str(key_qs);
- qdict = qobject_to_qdict(qdict_get(qerror->error, "data"));
+ qdict = qobject_to_qdict(qdict_get(error, "data"));
obj = qdict_get(qdict, key);
if (!obj) {
+#if 0
qerror_abort(qerror, "key '%s' not found in QDict", key);
+#else
+ abort();
+#endif
}
switch (qobject_type(obj)) {
@@ -367,41 +380,66 @@ static const char *append_field(QString *outstr, const
QError *qerror,
qstring_append_int(outstr, qdict_get_int(qdict, key));
break;
default:
+#if 0
qerror_abort(qerror, "invalid type '%c'", qobject_type(obj));
+#else
+ abort();
+#endif
}
QDECREF(key_qs);
return ++end;
}
-/**
- * qerror_human(): Format QError data into human-readable string.
- *
- * Formats according to member 'desc' of the specified QError object.
- */
-QString *qerror_human(const QError *qerror)
+static QString *qerror_format_desc(QDict *error,
+ const QErrorStringTable *entry)
{
- const char *p;
QString *qstring;
+ const char *p;
- assert(qerror->entry != NULL);
+ assert(entry != NULL);
qstring = qstring_new();
- for (p = qerror->entry->desc; *p != '\0';) {
+ for (p = entry->desc; *p != '\0';) {
if (*p != '%') {
qstring_append_chr(qstring, *p++);
} else if (*(p + 1) == '%') {
qstring_append_chr(qstring, '%');
p += 2;
} else {
- p = append_field(qstring, qerror, p);
+ p = append_field(error, qstring, entry, p);
}
}
return qstring;
}
+QString *qerror_format(const char *fmt, QDict *error)
+{
+ const QErrorStringTable *entry = NULL;
+ int i;
+
+ for (i = 0; qerror_table[i].error_fmt; i++) {
+ if (strcmp(qerror_table[i].error_fmt, fmt) == 0) {
+ entry = &qerror_table[i];
+ break;
+ }
+ }
+
+ return qerror_format_desc(error, entry);
+}
+
+/**
+ * qerror_human(): Format QError data into human-readable string.
+ *
+ * Formats according to member 'desc' of the specified QError object.
+ */
+QString *qerror_human(const QError *qerror)
+{
+ return qerror_format_desc(qerror->error, qerror->entry);
+}
+
/**
* qerror_print(): Print QError data
*
diff --git a/qerror.h b/qerror.h
index f732d45..fd63ee9 100644
--- a/qerror.h
+++ b/qerror.h
@@ -42,6 +42,7 @@ void qerror_report_internal(const char *file, int linenr,
const char *func,
#define qerror_report(fmt, ...) \
qerror_report_internal(__FILE__, __LINE__, __func__, fmt, ## __VA_ARGS__)
QError *qobject_to_qerror(const QObject *obj);
+QString *qerror_format(const char *fmt, QDict *error);
/*
* QError class list
--
1.7.0.4
- [Qemu-devel] [00/11] QAPI Round 0 (JSON improvements), Anthony Liguori, 2011/03/11
- [Qemu-devel] [PATCH 07/11] json: propagate error from parser, Anthony Liguori, 2011/03/11
- [Qemu-devel] [PATCH 11/11] json-parser: detect premature EOI, Anthony Liguori, 2011/03/11
- [Qemu-devel] [PATCH 05/11] qerror: add new error message for invalid enum values, Anthony Liguori, 2011/03/11
- [Qemu-devel] [PATCH 02/11] qerror: expose a function to format an error,
Anthony Liguori <=
- [Qemu-devel] Re: [PATCH 02/11] qerror: expose a function to format an error, Anthony Liguori, 2011/03/11
- [Qemu-devel] Re: [PATCH 02/11] qerror: expose a function to format an error, Luiz Capitulino, 2011/03/14
- Re: [Qemu-devel] Re: [PATCH 02/11] qerror: expose a function to format an error, Anthony Liguori, 2011/03/14
- Re: [Qemu-devel] Re: [PATCH 02/11] qerror: expose a function to format an error, Luiz Capitulino, 2011/03/14
- Re: [Qemu-devel] Re: [PATCH 02/11] qerror: expose a function to format an error, Anthony Liguori, 2011/03/14
- Re: [Qemu-devel] Re: [PATCH 02/11] qerror: expose a function to format an error, Luiz Capitulino, 2011/03/14
- Re: [Qemu-devel] Re: [PATCH 02/11] qerror: expose a function to format an error, Anthony Liguori, 2011/03/14
- Re: [Qemu-devel] Re: [PATCH 02/11] qerror: expose a function to format an error, Luiz Capitulino, 2011/03/14
- Re: [Qemu-devel] Re: [PATCH 02/11] qerror: expose a function to format an error, Anthony Liguori, 2011/03/14
- [Qemu-devel] [PATCH 01/11] Add hard build dependency on glib, Anthony Liguori, 2011/03/11