From nobody Sun Feb 8 17:13:49 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=1628757606; cv=none; d=zohomail.com; s=zohoarc; b=IuBWay4RflIuLWB4T8v76LDoX2Wb6mU44kyf+7IEFY6kmnIeXgEggLu/gh1NhCURBYLz3LAw/Sg2wckZo+c2GbImFIGSKCv7sFL6eTZ0oXbNoi6TM0FNzwVUtyYB51cBic5gE7qeqTqbnRtZ5A4xpB8PgYMDzETjP4VfEWfEvC8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628757606; 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=RTwD5pe+NoqF63Ci/mupFQyTIz/tmLH5ZICHeKLFtOI=; b=mGzfoeeEfZt0blGE+DHvjp8JGLaWIPKgao67H9WdSiBjCPeVUt2PRjXiqnXMrqB5EakrqhArVXb7CNAxoiFNc1kqOUMGbJzIEuQTDzfi/BPI3olU35CdX73VUaRpVo3/NtBwty86drrpnSioK+O3brKjIVX3OB2E0Cj0hUUXgI8= 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 1628757606293559.5145020726393; Thu, 12 Aug 2021 01:40: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-603-nNT3ScwDNGqd4Rb7kxRcMg-1; Thu, 12 Aug 2021 04:39:30 -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 4F0D81082923; Thu, 12 Aug 2021 08:39:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0B9A877708; Thu, 12 Aug 2021 08:39:25 +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 B20EA4A7CA; Thu, 12 Aug 2021 08:39:24 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17C8X3Wm003633 for ; Thu, 12 Aug 2021 04:33:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6A33B10013C1; Thu, 12 Aug 2021 08:33:03 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id E5CEA10429FC for ; Thu, 12 Aug 2021 08:32:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628757605; 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=RTwD5pe+NoqF63Ci/mupFQyTIz/tmLH5ZICHeKLFtOI=; b=Xunt+1bUslOeYgTL4giVgSJjRwjjQ06+wDcq6UDm5zNLrQpRZ1E7WFgG5EVMowHYYVYRdq HTSJEmbrmqdxUn3MevgwAcBGG6dAVeutQgAYrPSPMs8lC+rCHoggGVdLPlQcUZwn+y874c 9JBbTu+SojIfhLaLvkATCGuOkYn5iWk= X-MC-Unique: nNT3ScwDNGqd4Rb7kxRcMg-1 From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 03/12] tools: virsh: cmdDominfo: rename 'ostype' variable Date: Thu, 12 Aug 2021 10:32:41 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1628757607822100001 Use 'ostype' instead of generic 'str', to discourage reuse. Also mark it as autofree. Signed-off-by: J=C3=A1n Tomko --- tools/virsh-domain-monitor.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index a2bf5c05fc..cf0803dcd3 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -1288,7 +1288,8 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) bool ret =3D true; int autostart; unsigned int id; - char *str, uuid[VIR_UUID_STRING_BUFLEN]; + char uuid[VIR_UUID_STRING_BUFLEN]; + g_autofree char *ostype =3D NULL; int has_managed_save =3D 0; virshControl *priv =3D ctl->privData; g_auto(GStrv) messages =3D NULL; @@ -1306,10 +1307,8 @@ cmdDominfo(vshControl *ctl, const vshCmd *cmd) if (virDomainGetUUIDString(dom, &uuid[0]) =3D=3D 0) vshPrint(ctl, "%-15s %s\n", _("UUID:"), uuid); =20 - if ((str =3D virDomainGetOSType(dom))) { - vshPrint(ctl, "%-15s %s\n", _("OS Type:"), str); - VIR_FREE(str); - } + if ((ostype =3D virDomainGetOSType(dom))) + vshPrint(ctl, "%-15s %s\n", _("OS Type:"), ostype); =20 if (virDomainGetInfo(dom, &info) =3D=3D 0) { vshPrint(ctl, "%-15s %s\n", _("State:"), --=20 2.31.1