mirror of
https://github.com/jorisvink/kore
synced 2025-03-29 06:00:04 -04:00
Merge branch 'master' into 4.x-releng
This commit is contained in:
commit
dc266fbadd
@ -537,7 +537,7 @@ json_parse_object(struct kore_json *json, struct kore_json_item *object)
|
|||||||
|
|
||||||
if (!item->parse(json, item))
|
if (!item->parse(json, item))
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
key = NULL;
|
key = NULL;
|
||||||
|
|
||||||
if (!json_consume_whitespace(json))
|
if (!json_consume_whitespace(json))
|
||||||
@ -608,7 +608,7 @@ json_parse_array(struct kore_json *json, struct kore_json_item *array)
|
|||||||
|
|
||||||
if (!item->parse(json, item))
|
if (!item->parse(json, item))
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
key = NULL;
|
key = NULL;
|
||||||
|
|
||||||
if (!json_consume_whitespace(json))
|
if (!json_consume_whitespace(json))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user