[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 49/56] json: Streamline json_message_process_token()
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 49/56] json: Streamline json_message_process_token() |
Date: |
Wed, 8 Aug 2018 14:03:27 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
---
qobject/json-streamer.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/qobject/json-streamer.c b/qobject/json-streamer.c
index 810aae521f..954bf9d468 100644
--- a/qobject/json-streamer.c
+++ b/qobject/json-streamer.c
@@ -99,16 +99,13 @@ void json_message_process_token(JSONLexer *lexer, GString
*input,
g_queue_push_tail(parser->tokens, token);
- if (parser->brace_count < 0 ||
- parser->bracket_count < 0 ||
- (parser->brace_count == 0 &&
- parser->bracket_count == 0)) {
- json = json_parser_parse(parser->tokens, parser->ap, &err);
- parser->tokens = NULL;
- goto out_emit;
+ if ((parser->brace_count > 0 || parser->bracket_count > 0)
+ && parser->bracket_count >= 0 && parser->bracket_count >= 0) {
+ return;
}
- return;
+ json = json_parser_parse(parser->tokens, parser->ap, &err);
+ parser->tokens = NULL;
out_emit:
parser->brace_count = 0;
--
2.17.1
- [Qemu-devel] [PATCH 10/56] check-qjson: Drop redundant string tests, (continued)
- [Qemu-devel] [PATCH 10/56] check-qjson: Drop redundant string tests, Markus Armbruster, 2018/08/08
- [Qemu-devel] [PATCH 04/56] qmp-cmd-test: Split off qmp-test, Markus Armbruster, 2018/08/08
- [Qemu-devel] [PATCH 39/56] json: Leave rejecting invalid interpolation to parser, Markus Armbruster, 2018/08/08
- [Qemu-devel] [PATCH 46/56] json: Assert json_parser_parse() consumes all tokens on success, Markus Armbruster, 2018/08/08
- [Qemu-devel] [PATCH 49/56] json: Streamline json_message_process_token(),
Markus Armbruster <=
- [Qemu-devel] [PATCH 56/56] docs/interop/qmp-spec: How to force known good parser state, Markus Armbruster, 2018/08/08
[Qemu-devel] [PATCH 55/56] json: Clean up headers, Markus Armbruster, 2018/08/08