[libvirt] [PATCH 13/16] vboxDumpNetwork: Use a single utf8 temp variable
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
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 = NetworkAttachmentType_Null;
PRUint32 adapterType = NetworkAdapterType_Null;
PRUnichar *utf16 = NULL;
- char *MACAddress = NULL;
+ char *utf8 = NULL;
virDomainNetDefPtr net = NULL;
if (VIR_ALLOC(net) < 0)
@@ -3712,42 +3712,36 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter *adapter)
net->type = VIR_DOMAIN_NET_TYPE_USER;
} else if (attachmentType == NetworkAttachmentType_Bridged) {
- char *hostInt = NULL;
-
net->type = VIR_DOMAIN_NET_TYPE_BRIDGE;
gVBoxAPI.UINetworkAdapter.GetBridgedInterface(adapter, &utf16);
- 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));
- VBOX_UTF8_FREE(hostInt);
+ VBOX_UTF8_FREE(utf8);
VBOX_UTF16_FREE(utf16);
} else if (attachmentType == NetworkAttachmentType_Internal) {
- char *intNet = NULL;
-
net->type = VIR_DOMAIN_NET_TYPE_INTERNAL;
gVBoxAPI.UINetworkAdapter.GetInternalNetwork(adapter, &utf16);
- 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));
- VBOX_UTF8_FREE(intNet);
+ VBOX_UTF8_FREE(utf8);
VBOX_UTF16_FREE(utf16);
} else if (attachmentType == NetworkAttachmentType_HostOnly) {
- char *hostInt = NULL;
-
net->type = VIR_DOMAIN_NET_TYPE_NETWORK;
gVBoxAPI.UINetworkAdapter.GetHostOnlyInterface(adapter, &utf16);
- 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));
- VBOX_UTF8_FREE(hostInt);
+ VBOX_UTF8_FREE(utf8);
VBOX_UTF16_FREE(utf16);
} else {
@@ -3775,15 +3769,15 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter *adapter)
}
gVBoxAPI.UINetworkAdapter.GetMACAddress(adapter, &utf16);
- VBOX_UTF16_TO_UTF8(utf16, &MACAddress);
+ VBOX_UTF16_TO_UTF8(utf16, &utf8);
VBOX_UTF16_FREE(utf16);
- if (virMacAddrParseHex(MACAddress, &net->mac) < 0) {
- VBOX_UTF8_FREE(MACAddress);
+ if (virMacAddrParseHex(utf8, &net->mac) < 0) {
+ VBOX_UTF8_FREE(utf8);
goto error;
}
- VBOX_UTF8_FREE(MACAddress);
+ VBOX_UTF8_FREE(utf8);
return net;
error:
--
2.13.6