From nobody Tue Dec 16 08:41:00 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 15193960939526.0215713847154575; Fri, 23 Feb 2018 06:28:13 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 78E0AC0ADB47; Fri, 23 Feb 2018 14:28:12 +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 5302160486; Fri, 23 Feb 2018 14:28:12 +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 148A618033F5; Fri, 23 Feb 2018 14:28:12 +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 w1NERrHV000305 for ; Fri, 23 Feb 2018 09:27:53 -0500 Received: by smtp.corp.redhat.com (Postfix) id 27D219C049; Fri, 23 Feb 2018 14:27:53 +0000 (UTC) Received: from dnr.brq.redhat.com (unknown [10.43.2.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id C26E29C04F for ; Fri, 23 Feb 2018 14:27:52 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Fri, 23 Feb 2018 15:27:38 +0100 Message-Id: <3ac44909b89028439b7560ae2b4f89b4449f651b.1519395939.git.jtomko@redhat.com> In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 12/16] vboxDumpNetwork: Use a single utf16 variable 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 23 Feb 2018 14:28:13 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 There is a pattern of using two temporary utf16/utf8 variables for every value we get from VirtualBox and put in the domain definition right away. Reuse the same variable name to improve the chances of getting the function on one screen. Signed-off-by: J=C3=A1n Tomko --- src/vbox/vbox_common.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 3099e20c5..dc12bc662 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3699,7 +3699,7 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter *= adapter) { PRUint32 attachmentType =3D NetworkAttachmentType_Null; PRUint32 adapterType =3D NetworkAdapterType_Null; - PRUnichar *MACAddressUtf16 =3D NULL; + PRUnichar *utf16 =3D NULL; char *MACAddress =3D NULL; virDomainNetDefPtr net =3D NULL; =20 @@ -3712,46 +3712,43 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter= *adapter) net->type =3D VIR_DOMAIN_NET_TYPE_USER; =20 } else if (attachmentType =3D=3D NetworkAttachmentType_Bridged) { - PRUnichar *hostIntUtf16 =3D NULL; char *hostInt =3D NULL; =20 net->type =3D VIR_DOMAIN_NET_TYPE_BRIDGE; =20 - gVBoxAPI.UINetworkAdapter.GetBridgedInterface(adapter, &hostIntUtf= 16); + gVBoxAPI.UINetworkAdapter.GetBridgedInterface(adapter, &utf16); =20 - VBOX_UTF16_TO_UTF8(hostIntUtf16, &hostInt); + VBOX_UTF16_TO_UTF8(utf16, &hostInt); ignore_value(VIR_STRDUP(net->data.bridge.brname, hostInt)); =20 VBOX_UTF8_FREE(hostInt); - VBOX_UTF16_FREE(hostIntUtf16); + VBOX_UTF16_FREE(utf16); =20 } else if (attachmentType =3D=3D NetworkAttachmentType_Internal) { - PRUnichar *intNetUtf16 =3D NULL; char *intNet =3D NULL; =20 net->type =3D VIR_DOMAIN_NET_TYPE_INTERNAL; =20 - gVBoxAPI.UINetworkAdapter.GetInternalNetwork(adapter, &intNetUtf16= ); + gVBoxAPI.UINetworkAdapter.GetInternalNetwork(adapter, &utf16); =20 - VBOX_UTF16_TO_UTF8(intNetUtf16, &intNet); + VBOX_UTF16_TO_UTF8(utf16, &intNet); ignore_value(VIR_STRDUP(net->data.internal.name, intNet)); =20 VBOX_UTF8_FREE(intNet); - VBOX_UTF16_FREE(intNetUtf16); + VBOX_UTF16_FREE(utf16); =20 } else if (attachmentType =3D=3D NetworkAttachmentType_HostOnly) { - PRUnichar *hostIntUtf16 =3D NULL; char *hostInt =3D NULL; =20 net->type =3D VIR_DOMAIN_NET_TYPE_NETWORK; =20 - gVBoxAPI.UINetworkAdapter.GetHostOnlyInterface(adapter, &hostIntUt= f16); + gVBoxAPI.UINetworkAdapter.GetHostOnlyInterface(adapter, &utf16); =20 - VBOX_UTF16_TO_UTF8(hostIntUtf16, &hostInt); + VBOX_UTF16_TO_UTF8(utf16, &hostInt); ignore_value(VIR_STRDUP(net->data.network.name, hostInt)); =20 VBOX_UTF8_FREE(hostInt); - VBOX_UTF16_FREE(hostIntUtf16); + VBOX_UTF16_FREE(utf16); =20 } else { /* default to user type i.e. NAT in VirtualBox if this @@ -3777,9 +3774,9 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter *= adapter) ignore_value(VIR_STRDUP(net->model, "virtio")); } =20 - gVBoxAPI.UINetworkAdapter.GetMACAddress(adapter, &MACAddressUtf16); - VBOX_UTF16_TO_UTF8(MACAddressUtf16, &MACAddress); - VBOX_UTF16_FREE(MACAddressUtf16); + gVBoxAPI.UINetworkAdapter.GetMACAddress(adapter, &utf16); + VBOX_UTF16_TO_UTF8(utf16, &MACAddress); + VBOX_UTF16_FREE(utf16); =20 if (virMacAddrParseHex(MACAddress, &net->mac) < 0) { VBOX_UTF8_FREE(MACAddress); --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list