[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [RFC PATCH 08/12] qjson: allow caller to ask for arbitrary
From: |
John Snow |
Subject: |
[Qemu-block] [RFC PATCH 08/12] qjson: allow caller to ask for arbitrary indent |
Date: |
Fri, 11 May 2018 21:25:33 -0400 |
The function already exists, just expose it.
Signed-off-by: John Snow <address@hidden>
---
include/qapi/qmp/qjson.h | 1 +
qobject/qjson.c | 21 +++++++++++----------
2 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/include/qapi/qmp/qjson.h b/include/qapi/qmp/qjson.h
index b274ac3a86..0e8624c1fa 100644
--- a/include/qapi/qmp/qjson.h
+++ b/include/qapi/qmp/qjson.h
@@ -19,6 +19,7 @@ QObject *qobject_from_jsonf(const char *string, ...)
GCC_FMT_ATTR(1, 2);
QObject *qobject_from_jsonv(const char *string, va_list *ap, Error **errp)
GCC_FMT_ATTR(1, 0);
+QString *qobject_to_json_opt(const QObject *obj, int pretty, int indent);
QString *qobject_to_json(const QObject *obj);
QString *qobject_to_json_pretty(const QObject *obj);
diff --git a/qobject/qjson.c b/qobject/qjson.c
index 9816a65c7d..d603e1cce1 100644
--- a/qobject/qjson.c
+++ b/qobject/qjson.c
@@ -252,20 +252,21 @@ static void to_json(const QObject *obj, QString *str, int
pretty, int indent)
}
}
+QString *qobject_to_json_opt(const QObject *obj, int pretty, int indent)
+{
+ QString *str = qstring_new();
+
+ to_json(obj, str, pretty, indent);
+
+ return str;
+}
+
QString *qobject_to_json(const QObject *obj)
{
- QString *str = qstring_new();
-
- to_json(obj, str, 0, 0);
-
- return str;
+ return qobject_to_json_opt(obj, 0, 0);
}
QString *qobject_to_json_pretty(const QObject *obj)
{
- QString *str = qstring_new();
-
- to_json(obj, str, 1, 0);
-
- return str;
+ return qobject_to_json_opt(obj, 1, 0);
}
--
2.14.3
- Re: [Qemu-block] [Qemu-devel] [RFC PATCH 06/12] qapi: add bitmap info, (continued)
[Qemu-block] [RFC PATCH 04/12] qcow2/dirty-bitmaps: load IN_USE bitmaps if disk is RO, John Snow, 2018/05/11
[Qemu-block] [RFC PATCH 03/12] block/qcow2-bitmap: avoid adjusting bm->flags for RO bitmaps, John Snow, 2018/05/11
[Qemu-block] [RFC PATCH 05/12] qcow2-bitmap: track bitmap type, John Snow, 2018/05/11
[Qemu-block] [RFC PATCH 08/12] qjson: allow caller to ask for arbitrary indent,
John Snow <=
[Qemu-block] [RFC PATCH 07/12] qcow2-bitmap: add basic bitmaps info, John Snow, 2018/05/11
[Qemu-block] [RFC PATCH 09/12] qapi/block-core: add BitmapMapping and BitmapEntry structs, John Snow, 2018/05/11