mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-08-22 15:15:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

qobject: Make qobject_to_json_pretty() take a pretty argument

Browse Source 
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20201211171152.146877-4-armbru@redhat.com>
This commit is contained in:
Markus Armbruster
2020-12-11 18:11:35 +01:00
parent 20076f4a8c
commit 6589f45991
6 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
qobject/qjson.c
View File

@ -149,8 +149,6 @@ QDict *qdict_from_jsonf_nofail(const char *string, ...)
return qdict;
}
static void to_json(const QObject *obj, QString *str, int pretty, int indent);
static void json_pretty_newline(QString *str, bool pretty, int indent)
{
int i;
@ -163,7 +161,7 @@ static void json_pretty_newline(QString *str, bool pretty, int indent)
}
}
static void to_json(const QObject *obj, QString *str, int pretty, int indent)
static void to_json(const QObject *obj, QString *str, bool pretty, int indent)
{
switch (qobject_type(obj)) {
case QTYPE_QNULL:
@ -294,20 +292,16 @@ static void to_json(const QObject *obj, QString *str, int pretty, int indent)
}
}
QString *qobject_to_json_pretty(const QObject *obj, bool pretty)
{
QString *str = qstring_new();
to_json(obj, str, pretty, 0);
return str;
}
QString *qobject_to_json(const QObject *obj)
{
QString *str = qstring_new();
to_json(obj, str, 0, 0);
return str;
}
QString *qobject_to_json_pretty(const QObject *obj)
{
QString *str = qstring_new();
to_json(obj, str, 1, 0);
return str;
return qobject_to_json_pretty(obj, false);
}