From nobody Mon Feb 9 07:56:37 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608376247; cv=none; d=zohomail.com; s=zohoarc; b=WnqIOlM9/Mzq4iWvHaUi/TKzQ8SBxy6vY0nXFaTknNRdqDywyFOerRz5hAoThkwqaEGh1kQCLJiQPsCcefnNj6uQRJ7nB8x0BrO2+1mK6wtU+4NF7Al7XKuT6bmgf/W739duwJOKZDG4rXl5sYvuFgcQYFqVK1PXaUsnErRxLm4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608376247; h=Content-Type:Content-Transfer-Encoding:Cc: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=0PDVUNmxz2T8ZWdNyK2rDNunPXdtOqOJQJybNSVkkzU=; b=MA0BB4Zyi9nI8sBvcrGyYV+D90yVUp5lUbuRPrFmGuFU7oKrk7NuVEZoytzb2ryrNh26LFgomAetWycliNFQKmM5RQdFbl9PfctddueAmCcZdLcLy+J5vbfrj0QdxP0qOa1j2e0UvDFCOVZQLj6+azynuGhI6dsca6tdL3tkfdU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1608376247941910.4392723962651; Sat, 19 Dec 2020 03:10:47 -0800 (PST) Received: from localhost ([::1]:59274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqa8M-0008Ps-RQ for importer@patchew.org; Sat, 19 Dec 2020 06:10:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50858) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqZty-00059u-HT for qemu-devel@nongnu.org; Sat, 19 Dec 2020 05:55:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37786) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kqZtn-0007IH-0k for qemu-devel@nongnu.org; Sat, 19 Dec 2020 05:55:54 -0500 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-119-PkQDDYQpPF-f0u16GZRtYg-1; Sat, 19 Dec 2020 05:55:39 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 51DBE180A089; Sat, 19 Dec 2020 10:55:38 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 237383AA2; Sat, 19 Dec 2020 10:55:38 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DC571112564C; Sat, 19 Dec 2020 11:55:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608375342; 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=0PDVUNmxz2T8ZWdNyK2rDNunPXdtOqOJQJybNSVkkzU=; b=UMRK8BUn5bfgw6gEo0aQSZoW/BKC4axFb9tE1/KvHRFkSsm80ByNC4UAPwgwJiV7ISB+6h vECTp5559WMeNt/Bq2VgqWUJUtB2rUGkshjzmNmxiV94B/0OHeiYK5MrIGxIDaroV5UmNG iLInnlPX0lAOs8UYhAADrirr2DdVJk8= X-MC-Unique: PkQDDYQpPF-f0u16GZRtYg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 31/33] keyval: Use GString to accumulate value strings Date: Sat, 19 Dec 2020 11:55:30 +0100 Message-Id: <20201219105532.1734134-32-armbru@redhat.com> In-Reply-To: <20201219105532.1734134-1-armbru@redhat.com> References: <20201219105532.1734134-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" QString supports modifying its string, but it's quite limited: you can only append. The remaining callers use it for building an initial string, never for modifying it later. Change keyval_parse_one() to do build the initial string with GString. This is another step towards making QString immutable. Signed-off-by: Markus Armbruster Message-Id: <20201211171152.146877-19-armbru@redhat.com> --- util/keyval.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/util/keyval.c b/util/keyval.c index 7f625ad33c..be34928813 100644 --- a/util/keyval.c +++ b/util/keyval.c @@ -189,7 +189,7 @@ static const char *keyval_parse_one(QDict *qdict, const= char *params, QDict *cur; int ret; QObject *next; - QString *val; + GString *val; =20 key =3D params; val_end =3D NULL; @@ -263,7 +263,7 @@ static const char *keyval_parse_one(QDict *qdict, const= char *params, =20 if (key =3D=3D implied_key) { assert(!*s); - val =3D qstring_from_substr(params, 0, val_end - params); + val =3D g_string_new_len(params, val_end - params); s =3D val_end; if (*s =3D=3D ',') { s++; @@ -276,7 +276,7 @@ static const char *keyval_parse_one(QDict *qdict, const= char *params, } s++; =20 - val =3D qstring_new(); + val =3D g_string_new(NULL); for (;;) { if (!*s) { break; @@ -286,11 +286,12 @@ static const char *keyval_parse_one(QDict *qdict, con= st char *params, break; } } - qstring_append_chr(val, *s++); + g_string_append_c(val, *s++); } } =20 - if (!keyval_parse_put(cur, key_in_cur, val, key, key_end, errp)) { + if (!keyval_parse_put(cur, key_in_cur, qstring_from_gstring(val), + key, key_end, errp)) { return NULL; } return s; --=20 2.26.2