From nobody Mon Feb 9 09:22:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1628773806; cv=none; d=zohomail.com; s=zohoarc; b=AtkWR6i40+XVQKMt8I/ggkzvgZ5s4Bm7AhmpaatEpTLitJtteWynN6kjXX6lv0RLzK266poinrOJ5Y9oveY+CpshGIgJCldSioO1UxeObnpPFM83y1RLVQ0mMAQA4LZsVmrrXz8kxoY+sPuwxJsLMKMiMViyAIigAaaZPmdCUM4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628773806; 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=QoDzu9gEaJeqksrN3Z4DdRcTAsBRxBQzvjdRJ6WJIiU=; b=I0fE8UCQfcQic2ygsnZ3CdTaJn8C7L+xX831gI6a3U74VM25y15CqWSghe/FdDpW+NFA59ZSjWggmitaUrYd3tCu4v1PQaMQg40oSkEvI0MpqlztxzGvDcg+4rxmK/jY2w9n4QIaWD5TIWs7rwh+XDlZ8dJeVSY1lW/JQBzlDK0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1628773806183629.671064655617; Thu, 12 Aug 2021 06:10:06 -0700 (PDT) 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-553-8EnC9C7SNI-1T4irP1qZ9w-1; Thu, 12 Aug 2021 09:10:03 -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 2158F107B78F; Thu, 12 Aug 2021 13:09:58 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 06AB18464A; Thu, 12 Aug 2021 13:09:58 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 39D92181A0F2; Thu, 12 Aug 2021 13:09:57 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17CD1k4b029740 for ; Thu, 12 Aug 2021 09:01:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5BA1C5DA61; Thu, 12 Aug 2021 13:01:46 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id B26F25D9C6 for ; Thu, 12 Aug 2021 13:01:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628773805; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=QoDzu9gEaJeqksrN3Z4DdRcTAsBRxBQzvjdRJ6WJIiU=; b=jSeRm/AcBhNV/LFNzBpzrxtPp5u5oMo0LF/eNtzcpJfe3r4sYLTORdJb+NlMTgarC08ody wNGsJYszLPLrbQF9drQbmOPwPvWANHqprL+Sb1cvxp6g5WBAC4Y7ebyAXjQssunFkaUel+ 9I6vtODNjHFjoob3/Z6K7BlStIOz2Rg= X-MC-Unique: 8EnC9C7SNI-1T4irP1qZ9w-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 4/6] virsh: cmdEcho: Rewrite with new buffer helpers Date: Thu, 12 Aug 2021 15:01:34 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1628773806675100001 Content-Type: text/plain; charset="utf-8" Remove the need for temporary strings by fillin the output buffer directly. Signed-off-by: Peter Krempa --- tools/vsh.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/tools/vsh.c b/tools/vsh.c index 009c93254c..2456267426 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -3156,7 +3156,6 @@ cmdEcho(vshControl *ctl, const vshCmd *cmd) bool shell =3D vshCommandOptBool(cmd, "shell"); bool xml =3D vshCommandOptBool(cmd, "xml"); bool err =3D vshCommandOptBool(cmd, "err"); - int count =3D 0; const vshCmdOpt *opt =3D NULL; g_autofree char *arg =3D NULL; g_auto(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; @@ -3164,27 +3163,21 @@ cmdEcho(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS_VAR(shell, xml); while ((opt =3D vshCommandOptArgv(ctl, cmd, opt))) { - g_autofree char *str =3D NULL; - g_auto(virBuffer) xmlbuf =3D VIR_BUFFER_INITIALIZER; const char *curr =3D opt->data; - if (count) - virBufferAddChar(&buf, ' '); - if (xml) { - virBufferEscapeString(&xmlbuf, "%s", curr); - str =3D virBufferContentAndReset(&xmlbuf); + virBufferEscapeString(&buf, "%s", curr); + } else if (shell) { + virBufferEscapeShell(&buf, curr); } else { - str =3D g_strdup(curr); + virBufferAdd(&buf, curr, -1); } - if (shell) - virBufferEscapeShell(&buf, str); - else - virBufferAdd(&buf, str, -1); - count++; + virBufferAddChar(&buf, ' '); } + virBufferTrim(&buf, " "); + arg =3D virBufferContentAndReset(&buf); if (arg) { if (err) --=20 2.31.1