[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 27/33] qobject: Factor quoted_str() out of to_json()
From: |
Markus Armbruster |
Subject: |
[PULL 27/33] qobject: Factor quoted_str() out of to_json() |
Date: |
Sat, 19 Dec 2020 11:55:26 +0100 |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201211171152.146877-15-armbru@redhat.com>
---
qobject/qjson.c | 110 ++++++++++++++++++++++++------------------------
1 file changed, 54 insertions(+), 56 deletions(-)
diff --git a/qobject/qjson.c b/qobject/qjson.c
index 2f690c1816..962214f5a7 100644
--- a/qobject/qjson.c
+++ b/qobject/qjson.c
@@ -156,6 +156,58 @@ static void json_pretty_newline(GString *accu, bool
pretty, int indent)
}
}
+static void quoted_str(const char *str, GString *accu)
+{
+ const char *ptr;
+ int cp;
+ char *end;
+
+ g_string_append_c(accu, '"');
+
+ for (ptr = str; *ptr; ptr = end) {
+ cp = mod_utf8_codepoint(ptr, 6, &end);
+ switch (cp) {
+ case '\"':
+ g_string_append(accu, "\\\"");
+ break;
+ case '\\':
+ g_string_append(accu, "\\\\");
+ break;
+ case '\b':
+ g_string_append(accu, "\\b");
+ break;
+ case '\f':
+ g_string_append(accu, "\\f");
+ break;
+ case '\n':
+ g_string_append(accu, "\\n");
+ break;
+ case '\r':
+ g_string_append(accu, "\\r");
+ break;
+ case '\t':
+ g_string_append(accu, "\\t");
+ break;
+ default:
+ if (cp < 0) {
+ cp = 0xFFFD; /* replacement character */
+ }
+ if (cp > 0xFFFF) {
+ /* beyond BMP; need a surrogate pair */
+ g_string_append_printf(accu, "\\u%04X\\u%04X",
+ 0xD800 + ((cp - 0x10000) >> 10),
+ 0xDC00 + ((cp - 0x10000) & 0x3FF));
+ } else if (cp < 0x20 || cp >= 0x7F) {
+ g_string_append_printf(accu, "\\u%04X", cp);
+ } else {
+ g_string_append_c(accu, cp);
+ }
+ }
+ };
+
+ g_string_append_c(accu, '"');
+}
+
static void to_json(const QObject *obj, GString *accu, bool pretty, int indent)
{
switch (qobject_type(obj)) {
@@ -170,56 +222,7 @@ static void to_json(const QObject *obj, GString *accu,
bool pretty, int indent)
break;
}
case QTYPE_QSTRING: {
- QString *val = qobject_to(QString, obj);
- const char *ptr;
- int cp;
- char *end;
-
- ptr = qstring_get_str(val);
- g_string_append_c(accu, '"');
-
- for (; *ptr; ptr = end) {
- cp = mod_utf8_codepoint(ptr, 6, &end);
- switch (cp) {
- case '\"':
- g_string_append(accu, "\\\"");
- break;
- case '\\':
- g_string_append(accu, "\\\\");
- break;
- case '\b':
- g_string_append(accu, "\\b");
- break;
- case '\f':
- g_string_append(accu, "\\f");
- break;
- case '\n':
- g_string_append(accu, "\\n");
- break;
- case '\r':
- g_string_append(accu, "\\r");
- break;
- case '\t':
- g_string_append(accu, "\\t");
- break;
- default:
- if (cp < 0) {
- cp = 0xFFFD; /* replacement character */
- }
- if (cp > 0xFFFF) {
- /* beyond BMP; need a surrogate pair */
- g_string_append_printf(accu, "\\u%04X\\u%04X",
- 0xD800 + ((cp - 0x10000) >> 10),
- 0xDC00 + ((cp - 0x10000) & 0x3FF));
- } else if (cp < 0x20 || cp >= 0x7F) {
- g_string_append_printf(accu, "\\u%04X", cp);
- } else {
- g_string_append_c(accu, cp);
- }
- }
- };
-
- g_string_append_c(accu, '"');
+ quoted_str(qstring_get_str(qobject_to(QString, obj)), accu);
break;
}
case QTYPE_QDICT: {
@@ -227,7 +230,6 @@ static void to_json(const QObject *obj, GString *accu, bool
pretty, int indent)
const char *comma = pretty ? "," : ", ";
const char *sep = "";
const QDictEntry *entry;
- QString *qkey;
g_string_append_c(accu, '{');
@@ -236,11 +238,7 @@ static void to_json(const QObject *obj, GString *accu,
bool pretty, int indent)
entry = qdict_next(val, entry)) {
g_string_append(accu, sep);
json_pretty_newline(accu, pretty, indent + 1);
-
- qkey = qstring_from_str(qdict_entry_key(entry));
- to_json(QOBJECT(qkey), accu, pretty, indent + 1);
- qobject_unref(qkey);
-
+ quoted_str(qdict_entry_key(entry), accu);
g_string_append(accu, ": ");
to_json(qdict_entry_value(entry), accu, pretty, indent + 1);
sep = comma;
--
2.26.2
- [PULL 15/33] monitor: Use GString instead of QString for output buffer, (continued)
- [PULL 15/33] monitor: Use GString instead of QString for output buffer, Markus Armbruster, 2020/12/19
- [PULL 22/33] qmp: Fix tracing of non-string command IDs, Markus Armbruster, 2020/12/19
- [PULL 20/33] hw/rdma: Replace QList by GQueue, Markus Armbruster, 2020/12/19
- [PULL 23/33] block: Avoid qobject_get_try_str(), Markus Armbruster, 2020/12/19
- [PULL 28/33] qobject: Factor JSON writer out of qobject_to_json(), Markus Armbruster, 2020/12/19
- [PULL 25/33] qobject: Drop qobject_get_try_str(), Markus Armbruster, 2020/12/19
- [PULL 30/33] json: Use GString instead of QString to accumulate strings, Markus Armbruster, 2020/12/19
- [PULL 31/33] keyval: Use GString to accumulate value strings, Markus Armbruster, 2020/12/19
- [PULL 18/33] qobject: Change qobject_to_json()'s value to GString, Markus Armbruster, 2020/12/19
- [PULL 33/33] qobject: Make QString immutable, Markus Armbruster, 2020/12/19
- [PULL 27/33] qobject: Factor quoted_str() out of to_json(),
Markus Armbruster <=
- [PULL 29/33] migration: Replace migration's JSON writer by the general one, Markus Armbruster, 2020/12/19
- [PULL 32/33] block: Use GString instead of QString to build filenames, Markus Armbruster, 2020/12/19
- [PULL 21/33] qobject: Move internals to qobject-internal.h, Markus Armbruster, 2020/12/19
- [PULL 14/33] hmp: Simplify how qmp_human_monitor_command() gets output, Markus Armbruster, 2020/12/19
- [PULL 17/33] qobject: Use GString instead of QString to accumulate JSON, Markus Armbruster, 2020/12/19
- [PULL 03/33] qapi: Use QAPI_LIST_PREPEND() where possible, Markus Armbruster, 2020/12/19
- [PULL 24/33] Revert "qobject: let object_property_get_str() use new API", Markus Armbruster, 2020/12/19
- Re: [PULL 00/33] QAPI patches patches for 2020-12-19, no-reply, 2020/12/19