From nobody Tue Dec 16 08:53:01 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 1519396101087699.0184397712878; Fri, 23 Feb 2018 06:28:21 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AA974C0AE671; Fri, 23 Feb 2018 14:28:19 +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 6DF1360CA1; Fri, 23 Feb 2018 14:28:19 +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 2FB4118033FC; Fri, 23 Feb 2018 14:28:19 +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 w1NERrnd000316 for ; Fri, 23 Feb 2018 09:27:53 -0500 Received: by smtp.corp.redhat.com (Postfix) id B96689C04F; 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 609399C04C for ; Fri, 23 Feb 2018 14:27:53 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Fri, 23 Feb 2018 15:27:39 +0100 Message-Id: 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 13/16] vboxDumpNetwork: Use a single utf8 temp 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.12 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:20 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: J=C3=A1n Tomko --- src/vbox/vbox_common.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index dc12bc662..2943c534d 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -3700,7 +3700,7 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter *= adapter) PRUint32 attachmentType =3D NetworkAttachmentType_Null; PRUint32 adapterType =3D NetworkAdapterType_Null; PRUnichar *utf16 =3D NULL; - char *MACAddress =3D NULL; + char *utf8 =3D NULL; virDomainNetDefPtr net =3D NULL; =20 if (VIR_ALLOC(net) < 0) @@ -3712,42 +3712,36 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter= *adapter) net->type =3D VIR_DOMAIN_NET_TYPE_USER; =20 } else if (attachmentType =3D=3D NetworkAttachmentType_Bridged) { - char *hostInt =3D NULL; - net->type =3D VIR_DOMAIN_NET_TYPE_BRIDGE; =20 gVBoxAPI.UINetworkAdapter.GetBridgedInterface(adapter, &utf16); =20 - VBOX_UTF16_TO_UTF8(utf16, &hostInt); - ignore_value(VIR_STRDUP(net->data.bridge.brname, hostInt)); + VBOX_UTF16_TO_UTF8(utf16, &utf8); + ignore_value(VIR_STRDUP(net->data.bridge.brname, utf8)); =20 - VBOX_UTF8_FREE(hostInt); + VBOX_UTF8_FREE(utf8); VBOX_UTF16_FREE(utf16); =20 } else if (attachmentType =3D=3D NetworkAttachmentType_Internal) { - char *intNet =3D NULL; - net->type =3D VIR_DOMAIN_NET_TYPE_INTERNAL; =20 gVBoxAPI.UINetworkAdapter.GetInternalNetwork(adapter, &utf16); =20 - VBOX_UTF16_TO_UTF8(utf16, &intNet); - ignore_value(VIR_STRDUP(net->data.internal.name, intNet)); + VBOX_UTF16_TO_UTF8(utf16, &utf8); + ignore_value(VIR_STRDUP(net->data.internal.name, utf8)); =20 - VBOX_UTF8_FREE(intNet); + VBOX_UTF8_FREE(utf8); VBOX_UTF16_FREE(utf16); =20 } else if (attachmentType =3D=3D NetworkAttachmentType_HostOnly) { - char *hostInt =3D NULL; - net->type =3D VIR_DOMAIN_NET_TYPE_NETWORK; =20 gVBoxAPI.UINetworkAdapter.GetHostOnlyInterface(adapter, &utf16); =20 - VBOX_UTF16_TO_UTF8(utf16, &hostInt); - ignore_value(VIR_STRDUP(net->data.network.name, hostInt)); + VBOX_UTF16_TO_UTF8(utf16, &utf8); + ignore_value(VIR_STRDUP(net->data.network.name, utf8)); =20 - VBOX_UTF8_FREE(hostInt); + VBOX_UTF8_FREE(utf8); VBOX_UTF16_FREE(utf16); =20 } else { @@ -3775,15 +3769,15 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter= *adapter) } =20 gVBoxAPI.UINetworkAdapter.GetMACAddress(adapter, &utf16); - VBOX_UTF16_TO_UTF8(utf16, &MACAddress); + VBOX_UTF16_TO_UTF8(utf16, &utf8); VBOX_UTF16_FREE(utf16); =20 - if (virMacAddrParseHex(MACAddress, &net->mac) < 0) { - VBOX_UTF8_FREE(MACAddress); + if (virMacAddrParseHex(utf8, &net->mac) < 0) { + VBOX_UTF8_FREE(utf8); goto error; } =20 - VBOX_UTF8_FREE(MACAddress); + VBOX_UTF8_FREE(utf8); return net; =20 error: --=20 2.13.6 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list