QEMU-Nyx-fork

History

Markus Armbruster ff281a272f json: Don't pass null @tokens to json_parser_parse()

json_parser_parse() normally returns the QObject on success.  Except
it returns null when its @tokens argument is null.

Its only caller json_message_process_token() passes null @tokens when
emitting a lexical error.  The call is a rather opaque way to say json
= NULL then.

Simplify matters by lifting the assignment to json out of the emit
path: initialize json to null, set it to the value of
json_parser_parse() when there's no lexical error.  Drop the special
case from json_parser_parse().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180823164025.12553-36-armbru@redhat.com>

2018-08-24 20:26:37 +02:00

block-qdict.c

qdict: Make qdict_extract_subqdict() accept dst = NULL

2018-08-15 12:50:39 +02:00

json-lexer.c

json: Have lexer call streamer directly

2018-08-24 20:26:37 +02:00

json-parser.c

json: Don't pass null @tokens to json_parser_parse()

2018-08-24 20:26:37 +02:00

json-streamer.c

json: Don't pass null @tokens to json_parser_parse()