[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 for-2.5 07/12] qjson: Inline token_is_escape() an
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v3 for-2.5 07/12] qjson: Inline token_is_escape() and simplify |
Date: |
Wed, 25 Nov 2015 22:23:28 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
---
qobject/json-parser.c | 32 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/qobject/json-parser.c b/qobject/json-parser.c
index df76cc3..b57cac7 100644
--- a/qobject/json-parser.c
+++ b/qobject/json-parser.c
@@ -63,15 +63,6 @@ static JSONTokenType token_get_type(QObject *obj)
return qdict_get_int(qobject_to_qdict(obj), "type");
}
-static int token_is_escape(QObject *obj, const char *value)
-{
- if (token_get_type(obj) != JSON_ESCAPE) {
- return 0;
- }
-
- return (strcmp(token_get_value(obj), value) == 0);
-}
-
/**
* Error handler
*/
@@ -560,6 +551,7 @@ static QObject *parse_escape(JSONParserContext *ctxt,
va_list *ap)
{
QObject *token = NULL, *obj;
JSONParserContext saved_ctxt = parser_context_save(ctxt);
+ const char *val;
if (ap == NULL) {
goto out;
@@ -570,20 +562,26 @@ static QObject *parse_escape(JSONParserContext *ctxt,
va_list *ap)
goto out;
}
- if (token_is_escape(token, "%p")) {
+ if (token_get_type(token) != JSON_ESCAPE) {
+ goto out;
+ }
+
+ val = token_get_value(token);
+
+ if (!strcmp(val, "%p")) {
obj = va_arg(*ap, QObject *);
- } else if (token_is_escape(token, "%i")) {
+ } else if (!strcmp(val, "%i")) {
obj = QOBJECT(qbool_from_bool(va_arg(*ap, int)));
- } else if (token_is_escape(token, "%d")) {
+ } else if (!strcmp(val, "%d")) {
obj = QOBJECT(qint_from_int(va_arg(*ap, int)));
- } else if (token_is_escape(token, "%ld")) {
+ } else if (!strcmp(val, "%ld")) {
obj = QOBJECT(qint_from_int(va_arg(*ap, long)));
- } else if (token_is_escape(token, "%lld") ||
- token_is_escape(token, "%I64d")) {
+ } else if (!strcmp(val, "%lld") ||
+ !strcmp(val, "%I64d")) {
obj = QOBJECT(qint_from_int(va_arg(*ap, long long)));
- } else if (token_is_escape(token, "%s")) {
+ } else if (!strcmp(val, "%s")) {
obj = QOBJECT(qstring_from_str(va_arg(*ap, const char *)));
- } else if (token_is_escape(token, "%f")) {
+ } else if (!strcmp(val, "%f")) {
obj = QOBJECT(qfloat_from_double(va_arg(*ap, double)));
} else {
goto out;
--
2.4.3
- [Qemu-devel] [PATCH v3 for-2.5 00/12] qjson: Fix crash & save a lot of memory, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 01/12] qjson: Apply nesting limit more sanely, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 06/12] qjson: Inline token_is_keyword() and simplify, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 07/12] qjson: Inline token_is_escape() and simplify,
Markus Armbruster <=
- [Qemu-devel] [PATCH v3 for-2.5 03/12] check-qjson: Add test for JSON nesting depth limit, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 04/12] qjson: Spell out some silent assumptions, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 12/12] qjson: Limit number of tokens in addition to total size, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 08/12] qjson: replace QString in JSONLexer with GString, Markus Armbruster, 2015/11/25
- [Qemu-devel] [PATCH v3 for-2.5 09/12] qjson: Convert to parser to recursive descent, Markus Armbruster, 2015/11/25