From: Ján Tomko <jtomko@redhat.com>
Date: Fri, 23 Feb 2018 13:18:10 +0000 (+0100)
Subject: vboxDumpNetwork: Use a single utf16 variable
X-Git-Tag: v4.2.0-rc1~291
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56a3f5659af8f494861ad935b720e3e362efdfff;p=thirdparty%2Flibvirt.git

vboxDumpNetwork: Use a single utf16 variable

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án Tomko <jtomko@redhat.com>
---

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 3099e20c5a..dc12bc6625 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -3699,7 +3699,7 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter *adapter)
 {
     PRUint32 attachmentType = NetworkAttachmentType_Null;
     PRUint32 adapterType = NetworkAdapterType_Null;
-    PRUnichar *MACAddressUtf16 = NULL;
+    PRUnichar *utf16 = NULL;
     char *MACAddress = NULL;
     virDomainNetDefPtr net = NULL;
 
@@ -3712,46 +3712,43 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter *adapter)
         net->type = VIR_DOMAIN_NET_TYPE_USER;
 
     } else if (attachmentType == NetworkAttachmentType_Bridged) {
-        PRUnichar *hostIntUtf16 = NULL;
         char *hostInt = NULL;
 
         net->type = VIR_DOMAIN_NET_TYPE_BRIDGE;
 
-        gVBoxAPI.UINetworkAdapter.GetBridgedInterface(adapter, &hostIntUtf16);
+        gVBoxAPI.UINetworkAdapter.GetBridgedInterface(adapter, &utf16);
 
-        VBOX_UTF16_TO_UTF8(hostIntUtf16, &hostInt);
+        VBOX_UTF16_TO_UTF8(utf16, &hostInt);
         ignore_value(VIR_STRDUP(net->data.bridge.brname, hostInt));
 
         VBOX_UTF8_FREE(hostInt);
-        VBOX_UTF16_FREE(hostIntUtf16);
+        VBOX_UTF16_FREE(utf16);
 
     } else if (attachmentType == NetworkAttachmentType_Internal) {
-        PRUnichar *intNetUtf16 = NULL;
         char *intNet = NULL;
 
         net->type = VIR_DOMAIN_NET_TYPE_INTERNAL;
 
-        gVBoxAPI.UINetworkAdapter.GetInternalNetwork(adapter, &intNetUtf16);
+        gVBoxAPI.UINetworkAdapter.GetInternalNetwork(adapter, &utf16);
 
-        VBOX_UTF16_TO_UTF8(intNetUtf16, &intNet);
+        VBOX_UTF16_TO_UTF8(utf16, &intNet);
         ignore_value(VIR_STRDUP(net->data.internal.name, intNet));
 
         VBOX_UTF8_FREE(intNet);
-        VBOX_UTF16_FREE(intNetUtf16);
+        VBOX_UTF16_FREE(utf16);
 
     } else if (attachmentType == NetworkAttachmentType_HostOnly) {
-        PRUnichar *hostIntUtf16 = NULL;
         char *hostInt = NULL;
 
         net->type = VIR_DOMAIN_NET_TYPE_NETWORK;
 
-        gVBoxAPI.UINetworkAdapter.GetHostOnlyInterface(adapter, &hostIntUtf16);
+        gVBoxAPI.UINetworkAdapter.GetHostOnlyInterface(adapter, &utf16);
 
-        VBOX_UTF16_TO_UTF8(hostIntUtf16, &hostInt);
+        VBOX_UTF16_TO_UTF8(utf16, &hostInt);
         ignore_value(VIR_STRDUP(net->data.network.name, hostInt));
 
         VBOX_UTF8_FREE(hostInt);
-        VBOX_UTF16_FREE(hostIntUtf16);
+        VBOX_UTF16_FREE(utf16);
 
     } 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"));
     }
 
-    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);
 
     if (virMacAddrParseHex(MACAddress, &net->mac) < 0) {
         VBOX_UTF8_FREE(MACAddress);