From nobody Sun Feb 8 12:37:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) client-ip=205.139.110.61; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1578594852; cv=none; d=zohomail.com; s=zohoarc; b=GaI43IiR3QfkooycNWF1dPLFDNL02yQcuL81ErwauLnRfcl1D4uuo7WTIECYzjF35MLhx4b1yulwI1sqnriwARvGZXqhoWEASrIxadc3/rW650+sq/f+sT3rrxb7KkREFnzVbkKcke0jxzGKOnB+mi96omH2AcHwIXNcUxwNzFw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578594852; 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=8N0/SWAnCtmUOLRnXrYMVFpC/uMEnp1GHRD/ox8HBNM=; b=e8RIqLQ920BnKWVsIdZGLk9GwBasT43e9iUEdR47dV/tzrLwMfMiyTaPQPL6gpLnuAEOrDk/CWc+nss4kJgPWFhUHDwqnmIE04EMu4vvXVwVX9+1DUcDgdpZe5wNaTa+velmvxaWfu2Go0SUrALkzqN5zKIn/0cmIFD62GetBwc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by mx.zohomail.com with SMTPS id 15785948527881.2659673793384627; Thu, 9 Jan 2020 10:34:12 -0800 (PST) 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-218-0_JTjsDbNGCvkmfnmVe0JQ-1; Thu, 09 Jan 2020 13:34:09 -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 A9CA618A6ECA; Thu, 9 Jan 2020 18:34:04 +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 81BF41A8E9; Thu, 9 Jan 2020 18:34:04 +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 32B8A503C8; Thu, 9 Jan 2020 18:34:04 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 009IY2OX019801 for ; Thu, 9 Jan 2020 13:34:02 -0500 Received: by smtp.corp.redhat.com (Postfix) id 5A2F113BBA8; Thu, 9 Jan 2020 18:34:02 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 54C6813BBB0 for ; Thu, 9 Jan 2020 18:33:59 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2EB0C10192A5 for ; Thu, 9 Jan 2020 18:33:59 +0000 (UTC) Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-139-aqgi0CxqPFGqyHsLs7IREw-1; Thu, 09 Jan 2020 13:33:57 -0500 Received: by mail-qt1-f195.google.com with SMTP id j5so6678209qtq.9 for ; Thu, 09 Jan 2020 10:33:57 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c7:541e:7a5e:37ad:989b:4530]) by smtp.gmail.com with ESMTPSA id g52sm3902267qta.58.2020.01.09.10.33.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 10:33:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578594851; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=8N0/SWAnCtmUOLRnXrYMVFpC/uMEnp1GHRD/ox8HBNM=; b=gZZvtCNR9Wge6Zb8ozWPy8OtebIb31/d8RA73zNI465K2S109H1XZ9qbhhQ0g4T4fSldKg 6lYHo6uR+R362bxddNyLziaWCRx+34Ql2ts1lRTx6chr504u45l8qdd+yodXVxBhw7ojsw 6wTyp320j16ZeQthzxPED1Xp6IlCRh0= 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=jf046apT131AUS69Jpi9NBgf7evLbpXafW5POWhnQII=; b=UJ7RFsgzj2i2j9d5l9sLsh9p7WXKmsowWpAuxKSlktoWzvWE4zHcmCtsWjQ4+Ym/kn yxYrM7phF7n0wE9LLX58kYuFOuaIjVXqYDYN5XEqd+VTbTDmqMMNcEEoKanxpvuwHZRi zCYy4uMKhtEQCt/uLDWfHajDjg0kdLdNxTDS0vRAi5LyGhODItEZ+29SsXUkkfLQG76T 7Ej/w6AARk8djgS0A+9JU16UL59x9hzOXAukY8/kwfFBPHu5AOxBkyKGFantduu0ocqm YBxGYbxWWL2M0NJAVQyXvaoEZQh0WNrSa2tVGJK0atlAFtRMe1EkpXCrmXWKV+7jdRYu o/XQ== X-Gm-Message-State: APjAAAWi49J5pIlnUedl6L7OZzAWPWlqD7BunfsqFHYUuFzRFZlP14BR FUg2hXE+pqxN4QlJ6GRt7Sl3AJ43 X-Google-Smtp-Source: APXvYqxQRuZl35iz7DiqUp4tFsnr3BtU1N3k3jWQHHoxS+2F8BIBDP2C2D04Yc+M9ByDycQ6Ig+N2g== X-Received: by 2002:ac8:787:: with SMTP id l7mr8380640qth.99.1578594836785; Thu, 09 Jan 2020 10:33:56 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Thu, 9 Jan 2020 15:33:41 -0300 Message-Id: <20200109183348.1362138-2-danielhb413@gmail.com> In-Reply-To: <20200109183348.1362138-1-danielhb413@gmail.com> References: <20200109183348.1362138-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: aqgi0CxqPFGqyHsLs7IREw-1 X-MC-Unique: 0_JTjsDbNGCvkmfnmVe0JQ-1 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 009IY2OX019801 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza Subject: [libvirt] [PATCH v1 1/8] conf/domain_addr.c: use g_autofree in strings 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.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Use g_autofree in strings when possible to spare a VIR_FREE() call. Unneeded 'cleanup' labels will be taken care of in the next patch. The 'str' string in virDomainVirtioSerialAddrReserve() was never used by the logic, only being used in cleanup by VIR_FREE(). Let's remove it. Signed-off-by: Daniel Henrique Barboza --- src/conf/domain_addr.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index ef7ee80e6a..ee4dcf1d3b 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -830,7 +830,7 @@ virDomainPCIAddressReserveAddrInternal(virDomainPCIAddr= essSetPtr addrs, bool fromConfig) { int ret =3D -1; - char *addrStr =3D NULL; + g_autofree char *addrStr =3D NULL; virDomainPCIAddressBusPtr bus; virErrorNumber errType =3D (fromConfig ? VIR_ERR_XML_ERROR : VIR_ERR_INTERNAL_ERROR= ); @@ -891,7 +891,6 @@ virDomainPCIAddressReserveAddrInternal(virDomainPCIAddr= essSetPtr addrs, =20 ret =3D 0; cleanup: - VIR_FREE(addrStr); return ret; } =20 @@ -912,7 +911,7 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr= addrs, virDomainPCIConnectFlags flags) { int ret =3D -1; - char *addrStr =3D NULL; + g_autofree char *addrStr =3D NULL; =20 /* if flags is 0, the particular model of this device on this * machinetype doesn't need a PCI address, so we're done. @@ -955,7 +954,6 @@ virDomainPCIAddressEnsureAddr(virDomainPCIAddressSetPtr= addrs, ret =3D 0; =20 cleanup: - VIR_FREE(addrStr); return ret; } =20 @@ -1105,7 +1103,7 @@ virDomainPCIAddressFindUnusedFunctionOnBus(virDomainP= CIAddressBusPtr bus, bool *found) { int ret =3D -1; - char *addrStr =3D NULL; + g_autofree char *addrStr =3D NULL; =20 *found =3D false; =20 @@ -1159,7 +1157,6 @@ virDomainPCIAddressFindUnusedFunctionOnBus(virDomainP= CIAddressBusPtr bus, ret =3D 0; =20 cleanup: - VIR_FREE(addrStr); return ret; } =20 @@ -1414,7 +1411,7 @@ virDomainCCWAddressAssign(virDomainDeviceInfoPtr dev, bool autoassign) { int ret =3D -1; - char *addr =3D NULL; + g_autofree char *addr =3D NULL; =20 if (dev->type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) return 0; @@ -1457,7 +1454,6 @@ virDomainCCWAddressAssign(virDomainDeviceInfoPtr dev, ret =3D 0; =20 cleanup: - VIR_FREE(addr); return ret; } =20 @@ -1687,7 +1683,6 @@ virDomainVirtioSerialAddrReserve(virDomainDefPtr def = G_GNUC_UNUSED, void *data) { virDomainVirtioSerialAddrSetPtr addrs =3D data; - char *str =3D NULL; int ret =3D -1; virBitmapPtr map =3D NULL; bool b; @@ -1729,7 +1724,6 @@ virDomainVirtioSerialAddrReserve(virDomainDefPtr def = G_GNUC_UNUSED, ret =3D 0; =20 cleanup: - VIR_FREE(str); return ret; } =20 @@ -2208,7 +2202,7 @@ virDomainUSBAddressSetAddHub(virDomainUSBAddressSetPt= r addrs, virDomainUSBAddressHubPtr targetHub =3D NULL, newHub =3D NULL; int ret =3D -1; int targetPort; - char *portStr =3D NULL; + g_autofree char *portStr =3D NULL; =20 if (hub->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB) { virReportError(VIR_ERR_XML_ERROR, "%s", @@ -2242,7 +2236,6 @@ virDomainUSBAddressSetAddHub(virDomainUSBAddressSetPt= r addrs, ret =3D 0; cleanup: virDomainUSBAddressHubFree(newHub); - VIR_FREE(portStr); return ret; } =20 @@ -2349,7 +2342,7 @@ virDomainUSBAddressAssignFromBus(virDomainUSBAddressS= etPtr addrs, { unsigned int portpath[VIR_DOMAIN_DEVICE_USB_MAX_PORT_DEPTH] =3D { 0 }; virDomainUSBAddressHubPtr hub =3D addrs->buses[bus]; - char *portStr =3D NULL; + g_autofree char *portStr =3D NULL; int ret =3D -1; =20 if (!hub) @@ -2372,7 +2365,6 @@ virDomainUSBAddressAssignFromBus(virDomainUSBAddressS= etPtr addrs, =20 ret =3D 0; cleanup: - VIR_FREE(portStr); return ret; } =20 @@ -2428,7 +2420,7 @@ virDomainUSBAddressReserve(virDomainDeviceInfoPtr inf= o, { virDomainUSBAddressSetPtr addrs =3D data; virDomainUSBAddressHubPtr targetHub =3D NULL; - char *portStr =3D NULL; + g_autofree char *portStr =3D NULL; int ret =3D -1; int targetPort; =20 @@ -2459,7 +2451,6 @@ virDomainUSBAddressReserve(virDomainDeviceInfoPtr inf= o, ret =3D 0; =20 cleanup: - VIR_FREE(portStr); return ret; } =20 @@ -2490,7 +2481,7 @@ virDomainUSBAddressRelease(virDomainUSBAddressSetPtr = addrs, virDomainDeviceInfoPtr info) { virDomainUSBAddressHubPtr targetHub =3D NULL; - char *portStr =3D NULL; + g_autofree char *portStr =3D NULL; int targetPort; int ret =3D -1; =20 @@ -2510,6 +2501,5 @@ virDomainUSBAddressRelease(virDomainUSBAddressSetPtr = addrs, ret =3D 0; =20 cleanup: - VIR_FREE(portStr); return ret; } --=20 2.24.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list