aboutsummaryrefslogtreecommitdiff
path: root/qobject/qjson.c
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2018-08-06 08:53:28 +0200
committerMarkus Armbruster <armbru@redhat.com>2018-08-16 08:42:06 +0200
commit4ff184689bf3d22b01c0d00c2bf6bf9595ff9b48 (patch)
tree07ff270fd1b065f36d5a9e835d7095740b3c129a /qobject/qjson.c
parent6ce80fd80355d29b3ed8c2fa14251a9b8276a86a (diff)
downloadqemu-4ff184689bf3d22b01c0d00c2bf6bf9595ff9b48.zip
qemu-4ff184689bf3d22b01c0d00c2bf6bf9595ff9b48.tar.gz
qemu-4ff184689bf3d22b01c0d00c2bf6bf9595ff9b48.tar.bz2
qobject: New qobject_from_vjsonf_nofail(), qdict_from_vjsonf_nofail()
Every printf()-like function sooner or later needs its vprintf()-like buddy. The next commit will need qobject_from_jsonf_nofail()'s buddy, and qdict_from_jsonf_nofail()'s buddy will be used later in this series. Add both. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20180806065344.7103-8-armbru@redhat.com>
Diffstat (limited to 'qobject/qjson.c')
-rw-r--r--qobject/qjson.c44
1 files changed, 37 insertions, 7 deletions
diff --git a/qobject/qjson.c b/qobject/qjson.c
index 4a9dcff..2e45023 100644
--- a/qobject/qjson.c
+++ b/qobject/qjson.c
@@ -64,16 +64,34 @@ QObject *qobject_from_json(const char *string, Error **errp)
* Abort on error. Do not use with untrusted @string.
* Return the resulting QObject. It is never null.
*/
+QObject *qobject_from_vjsonf_nofail(const char *string, va_list ap)
+{
+ va_list ap_copy;
+ QObject *obj;
+
+ /* va_copy() is needed when va_list is an array type */
+ va_copy(ap_copy, ap);
+ obj = qobject_from_jsonv(string, &ap_copy, &error_abort);
+ va_end(ap_copy);
+
+ assert(obj);
+ return obj;
+}
+
+/*
+ * Parse @string as JSON value with %-escapes interpolated.
+ * Abort on error. Do not use with untrusted @string.
+ * Return the resulting QObject. It is never null.
+ */
QObject *qobject_from_jsonf_nofail(const char *string, ...)
{
QObject *obj;
va_list ap;
va_start(ap, string);
- obj = qobject_from_jsonv(string, &ap, &error_abort);
+ obj = qobject_from_vjsonf_nofail(string, ap);
va_end(ap);
- assert(obj);
return obj;
}
@@ -82,17 +100,29 @@ QObject *qobject_from_jsonf_nofail(const char *string, ...)
* Abort on error. Do not use with untrusted @string.
* Return the resulting QDict. It is never null.
*/
+QDict *qdict_from_vjsonf_nofail(const char *string, va_list ap)
+{
+ QDict *qdict;
+
+ qdict = qobject_to(QDict, qobject_from_vjsonf_nofail(string, ap));
+ assert(qdict);
+ return qdict;
+}
+
+/*
+ * Parse @string as JSON object with %-escapes interpolated.
+ * Abort on error. Do not use with untrusted @string.
+ * Return the resulting QDict. It is never null.
+ */
QDict *qdict_from_jsonf_nofail(const char *string, ...)
{
- QDict *obj;
+ QDict *qdict;
va_list ap;
va_start(ap, string);
- obj = qobject_to(QDict, qobject_from_jsonv(string, &ap, &error_abort));
+ qdict = qdict_from_vjsonf_nofail(string, ap);
va_end(ap);
-
- assert(obj);
- return obj;
+ return qdict;
}
typedef struct ToJsonIterState