From nobody Fri Nov 14 15:20:20 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1588224877; cv=none; d=zohomail.com; s=zohoarc; b=jM2AD58qz7QCCkk3pc//HpCd4OKMMfHs2NqQvO3eixkIBYaqurOlAR11GFwohJCaEfESulHyfErJQzEam6k9JTApGMFfLmSpbzht0icOZtKTjxsgWtG0N3hHSuM1MLR0Xd0inyBsTv8OcwRnrukdPJjEzuh+rFi7dM2r83nvcMs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588224877; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eqVC7McqSV3taBivD91fNpB9KyU5g0fRffUnVu9+yNU=; b=dCak3TzTnGgu52RrYwfgRGjBuuRyDVjrTRWR8Pbq9izXTcOrqy7pMEgcOW9bbSo+Fcr1ZwkQK8CWdEOz/JhCz688KHurWQGAogktWJJp2qLFgT738gICvz+yoW9uSV3G59q+kpnySnd2ER0LRoHdgfzk1rDTizs51CswpTVrAd8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1588224877316330.21889181654353; Wed, 29 Apr 2020 22:34:37 -0700 (PDT) Received: from localhost ([::1]:52504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU1qF-0002P8-UM for importer@patchew.org; Thu, 30 Apr 2020 01:34:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53350) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jU1n3-0004zg-8R for qemu-devel@nongnu.org; Thu, 30 Apr 2020 01:31:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jU1mx-0002cr-LD for qemu-devel@nongnu.org; Thu, 30 Apr 2020 01:31:17 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21198 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jU1mw-0002bu-NK for qemu-devel@nongnu.org; Thu, 30 Apr 2020 01:31:11 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-166-RrNMx6wiOh6AnwWfgdeO3g-1; Thu, 30 Apr 2020 01:31:07 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 84A58107ACCA for ; Thu, 30 Apr 2020 05:31:06 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-113-6.ams2.redhat.com [10.36.113.6]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 53E2560638; Thu, 30 Apr 2020 05:31:06 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D5E9B11358BE; Thu, 30 Apr 2020 07:31:04 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1588224669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eqVC7McqSV3taBivD91fNpB9KyU5g0fRffUnVu9+yNU=; b=fFBWrKEpplEEHXsBTpSG5NfMVIqISIDFOA/m1HeaE/NEbtHi3ceC0YlwD4ZjP8Wb59fOb8 HqpE8RVn7EpfA9i32FLW/j3rUL48vCvK0YBQBAECL3fI/2PfNb6Rf01DOV4ZbKDXNYnCcN drqhWI+c4YGsr+xuENDhx6cjr89NVaY= X-MC-Unique: RrNMx6wiOh6AnwWfgdeO3g-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 02/20] qobject: Factor out helper json_pretty_newline() Date: Thu, 30 Apr 2020 07:30:46 +0200 Message-Id: <20200430053104.32204-3-armbru@redhat.com> In-Reply-To: <20200430053104.32204-1-armbru@redhat.com> References: <20200430053104.32204-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=armbru@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/30 01:24:05 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Message-Id: <20200415083048.14339-3-armbru@redhat.com> Reviewed-by: Eric Blake [Coding style in moved code tidied up] --- qobject/qjson.c | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/qobject/qjson.c b/qobject/qjson.c index db36101f3b..87422f600d 100644 --- a/qobject/qjson.c +++ b/qobject/qjson.c @@ -159,21 +159,28 @@ typedef struct ToJsonIterState =20 static void to_json(const QObject *obj, QString *str, int pretty, int inde= nt); =20 +static void json_pretty_newline(QString *str, bool pretty, int indent) +{ + int i; + + if (pretty) { + qstring_append(str, "\n"); + for (i =3D 0; i < indent; i++) { + qstring_append(str, " "); + } + } +} + static void to_json_dict_iter(const char *key, QObject *obj, void *opaque) { ToJsonIterState *s =3D opaque; QString *qkey; - int j; =20 if (s->count) { qstring_append(s->str, s->pretty ? "," : ", "); } =20 - if (s->pretty) { - qstring_append(s->str, "\n"); - for (j =3D 0 ; j < s->indent ; j++) - qstring_append(s->str, " "); - } + json_pretty_newline(s->str, s->pretty, s->indent); =20 qkey =3D qstring_from_str(key); to_json(QOBJECT(qkey), s->str, s->pretty, s->indent); @@ -187,17 +194,12 @@ static void to_json_dict_iter(const char *key, QObjec= t *obj, void *opaque) static void to_json_list_iter(QObject *obj, void *opaque) { ToJsonIterState *s =3D opaque; - int j; =20 if (s->count) { qstring_append(s->str, s->pretty ? "," : ", "); } =20 - if (s->pretty) { - qstring_append(s->str, "\n"); - for (j =3D 0 ; j < s->indent ; j++) - qstring_append(s->str, " "); - } + json_pretty_newline(s->str, s->pretty, s->indent); =20 to_json(obj, s->str, s->pretty, s->indent); s->count++; @@ -282,12 +284,7 @@ static void to_json(const QObject *obj, QString *str, = int pretty, int indent) s.pretty =3D pretty; qstring_append(str, "{"); qdict_iter(val, to_json_dict_iter, &s); - if (pretty) { - int j; - qstring_append(str, "\n"); - for (j =3D 0 ; j < indent ; j++) - qstring_append(str, " "); - } + json_pretty_newline(str, pretty, indent); qstring_append(str, "}"); break; } @@ -301,12 +298,7 @@ static void to_json(const QObject *obj, QString *str, = int pretty, int indent) s.pretty =3D pretty; qstring_append(str, "["); qlist_iter(val, (void *)to_json_list_iter, &s); - if (pretty) { - int j; - qstring_append(str, "\n"); - for (j =3D 0 ; j < indent ; j++) - qstring_append(str, " "); - } + json_pretty_newline(str, pretty, indent); qstring_append(str, "]"); break; } --=20 2.21.1