From: Sidong Yang <realwakka@gmail.com>
To: dsterba@suse.cz, linux-btrfs@vger.kernel.org
Cc: Sidong Yang <realwakka@gmail.com>
Subject: [PATCH v2 1/2] btrfs-progs: common: introduce fmt_print_start_object
Date: Wed, 11 Nov 2020 16:39:08 +0000 [thread overview]
Message-ID: <20201111163909.3968-1-realwakka@gmail.com> (raw)
Introduce a new function that can be used when you need to print an json
object in command like "device stats".
Signed-off-by: Sidong Yang <realwakka@gmail.com>
---
common/format-output.c | 20 ++++++++++++++++++++
common/format-output.h | 3 +++
2 files changed, 23 insertions(+)
diff --git a/common/format-output.c b/common/format-output.c
index 8df93ecb..f31e7259 100644
--- a/common/format-output.c
+++ b/common/format-output.c
@@ -213,6 +213,26 @@ void fmt_print_end_group(struct format_ctx *fctx, const char *name)
}
}
+void fmt_print_start_object(struct format_ctx *fctx)
+{
+ if (bconf.output_format == CMD_FORMAT_JSON) {
+ fmt_separator(fctx);
+ fmt_inc_depth(fctx);
+ fctx->memb[fctx->depth] = 0;
+ putchar('{');
+ }
+}
+
+void fmt_print_end_object(struct format_ctx *fctx)
+{
+ if (bconf.output_format == CMD_FORMAT_JSON) {
+ fmt_dec_depth(fctx);
+ putchar('\n');
+ fmt_indent2(fctx->depth);
+ putchar('}');
+ }
+}
+
/* Use rowspec to print according to currently set output format */
void fmt_print(struct format_ctx *fctx, const char* key, ...)
{
diff --git a/common/format-output.h b/common/format-output.h
index bcc2d74d..9d606482 100644
--- a/common/format-output.h
+++ b/common/format-output.h
@@ -87,4 +87,7 @@ void fmt_print_start_group(struct format_ctx *fctx, const char *name,
enum json_type jtype);
void fmt_print_end_group(struct format_ctx *fctx, const char *name);
+void fmt_print_start_object(struct format_ctx *fctx);
+void fmt_print_end_object(struct format_ctx *fctx);
+
#endif
--
2.25.1
next reply other threads:[~2020-11-11 16:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-11 16:39 Sidong Yang [this message]
2020-11-11 16:39 ` [PATCH v2 2/2] btrfs-progs: device stats: add json output format Sidong Yang
2020-12-10 20:53 ` David Sterba
2021-02-16 10:21 ` Filipe Manana
2020-12-10 20:28 ` [PATCH v2 1/2] btrfs-progs: common: introduce fmt_print_start_object David Sterba
2020-12-11 16:11 ` Sidong Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201111163909.3968-1-realwakka@gmail.com \
--to=realwakka@gmail.com \
--cc=dsterba@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).