From 8d3265b3d00db1071d1d3bf8433b4818088fdeb5 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 23 Aug 2018 18:40:16 +0200 Subject: json: Streamline json_message_process_token() Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <20180823164025.12553-50-armbru@redhat.com> --- qobject/json-streamer.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'qobject') 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; -- cgit v1.2.3