From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FCE3C388F9 for ; Wed, 11 Nov 2020 16:39:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id F30B42072C for ; Wed, 11 Nov 2020 16:39:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Zic48G5z" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727593AbgKKQjU (ORCPT ); Wed, 11 Nov 2020 11:39:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54704 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726470AbgKKQjU (ORCPT ); Wed, 11 Nov 2020 11:39:20 -0500 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57F4BC0613D1 for ; Wed, 11 Nov 2020 08:39:20 -0800 (PST) Received: by mail-pf1-x430.google.com with SMTP id c20so1920577pfr.8 for ; Wed, 11 Nov 2020 08:39:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AiW7yyfB8tn48PKZrTFVJ6RG8FdQwIZDONvE2FQmT1E=; b=Zic48G5zBfxaWugoU58Zq1xEbuUgcvxdgy33hNj68lfe+8QTvD1RAYeU82OTx1IQv9 qpusI5qbyoAz70HoRAKXZEBlh/2L6yQJ5TFgqO8/cLP8Dkig+zWCbHaZtH4W1g+eyFR+ v6rKI3HKVQmUQJ3fushGpLbf+LiAkxsjI5zXt+rJCyv7pMQ84csfAWam9asH12Qke3km 82b30jp5RxA4tb+jd/JjFlLXCBq1OKFQdxPgSf84e2orYTHvtwRw2dGQ/H11KMbTd9zH IoMHqm5s8fSXJ+1/12C/O4V7UAkGvGov486pjSdv8CYRs7439gc/4CnWELvLDBOIG+ez N6NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=AiW7yyfB8tn48PKZrTFVJ6RG8FdQwIZDONvE2FQmT1E=; b=OU3X/iOYZ/P5izEJZA4g9cUKv5E8rqIzYkzNMzbG8zvmWtJC052pPOmBs57UrlIMFT rX3T8GVZfgbJq0cXhsI2hifjWBGM6B+MGnwnlwjze5QcAi5CrXsit3r+FfZ8mfoyAfY+ W0rMpnHHMDAQvh6Cq81uYXY8JhufrurVX1H0Td7XgfZqD+4ZgP5Zu07Ol/7GdFmv1168 lSlKBJm9BS5jgRAW9DSkCDFAIMDaqseqHGVkgeXyd5p61W6VCC40WD3EgSyNQ1BD0Xfv qLxZtmBLh6vCMNvmXt4tldOnAeRxFn2/7t5rH01Z91Qk7wCClUj6IjsABT+OFg0rmev+ Eh7A== X-Gm-Message-State: AOAM530UyS6l7EmKa6R9dCMkR7bmyeozJlCUgfLoNBALg53dHWlzSfIJ y7iyb5HOmx76rw6aZLOt0p7mEHvmjfsraQ== X-Google-Smtp-Source: ABdhPJzNb6jGsueiZEzjV49BICAWaC3kjfioeGoLD07je/BtZ8oNdmpez0T7aNMotXlE5OfXM2bYOg== X-Received: by 2002:a63:6305:: with SMTP id x5mr22900531pgb.269.1605112759941; Wed, 11 Nov 2020 08:39:19 -0800 (PST) Received: from localhost.localdomain ([175.195.128.78]) by smtp.googlemail.com with ESMTPSA id y8sm3013533pge.22.2020.11.11.08.39.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 08:39:19 -0800 (PST) From: Sidong Yang To: dsterba@suse.cz, linux-btrfs@vger.kernel.org Cc: Sidong Yang Subject: [PATCH v2 1/2] btrfs-progs: common: introduce fmt_print_start_object Date: Wed, 11 Nov 2020 16:39:08 +0000 Message-Id: <20201111163909.3968-1-realwakka@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org 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 --- 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