aboutsummaryrefslogtreecommitdiff
path: root/qobject/qjson.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2017-02-28 22:26:58 +0100
committerMarkus Armbruster <armbru@redhat.com>2017-03-07 16:07:47 +0100
commit57348c2f18d2f9f77f4d0ecdc5a83029a933c5d8 (patch)
tree5f84ec467c5f1475f280bd6945e7a61a5de21bd3 /qobject/qjson.c
parentbff17e84a985033a880302394f1a8d74d013f9ef (diff)
downloadqemu-57348c2f18d2f9f77f4d0ecdc5a83029a933c5d8.zip
qemu-57348c2f18d2f9f77f4d0ecdc5a83029a933c5d8.tar.gz
qemu-57348c2f18d2f9f77f4d0ecdc5a83029a933c5d8.tar.bz2
qobject: Propagate parse errors through qobject_from_json()
The next few commits will put the errors to use where appropriate. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <1488317230-26248-13-git-send-email-armbru@redhat.com>
Diffstat (limited to 'qobject/qjson.c')
-rw-r--r--qobject/qjson.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/qobject/qjson.c b/qobject/qjson.c
index c98d6a7..b2f3bfe 100644
--- a/qobject/qjson.c
+++ b/qobject/qjson.c
@@ -50,9 +50,9 @@ QObject *qobject_from_jsonv(const char *string, va_list *ap, Error **errp)
return state.result;
}
-QObject *qobject_from_json(const char *string)
+QObject *qobject_from_json(const char *string, Error **errp)
{
- return qobject_from_jsonv(string, NULL, NULL);
+ return qobject_from_jsonv(string, NULL, errp);
}
/*