NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

vboxDumpNetwork: Use a single utf8 temp variable

Browse Source 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Ján Tomko 2018-02-23 14:34:09 +01:00
parent 56a3f5659a
commit 0310d97ac5
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/vbox/vbox_common.c
View File

@ -3700,7 +3700,7 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter *adapter)
PRUint32 attachmentType = NetworkAttachmentType_Null; PRUint32 attachmentType = NetworkAttachmentType_Null;
PRUint32 adapterType = NetworkAdapterType_Null; PRUint32 adapterType = NetworkAdapterType_Null;
PRUnichar *utf16 = NULL; PRUnichar *utf16 = NULL;
char *MACAddress = NULL; char *utf8 = NULL;
virDomainNetDefPtr net = NULL; virDomainNetDefPtr net = NULL;
if (VIR_ALLOC(net) < 0) if (VIR_ALLOC(net) < 0)
@ -3712,42 +3712,36 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter *adapter)
net->type = VIR_DOMAIN_NET_TYPE_USER; net->type = VIR_DOMAIN_NET_TYPE_USER;
} else if (attachmentType == NetworkAttachmentType_Bridged) { } else if (attachmentType == NetworkAttachmentType_Bridged) {
char *hostInt = NULL;
net->type = VIR_DOMAIN_NET_TYPE_BRIDGE; net->type = VIR_DOMAIN_NET_TYPE_BRIDGE;
gVBoxAPI.UINetworkAdapter.GetBridgedInterface(adapter, &utf16); gVBoxAPI.UINetworkAdapter.GetBridgedInterface(adapter, &utf16);
VBOX_UTF16_TO_UTF8(utf16, &hostInt); VBOX_UTF16_TO_UTF8(utf16, &utf8);
ignore_value(VIR_STRDUP(net->data.bridge.brname, hostInt)); ignore_value(VIR_STRDUP(net->data.bridge.brname, utf8));
VBOX_UTF8_FREE(hostInt); VBOX_UTF8_FREE(utf8);
VBOX_UTF16_FREE(utf16); VBOX_UTF16_FREE(utf16);
} else if (attachmentType == NetworkAttachmentType_Internal) { } else if (attachmentType == NetworkAttachmentType_Internal) {
char *intNet = NULL;
net->type = VIR_DOMAIN_NET_TYPE_INTERNAL; net->type = VIR_DOMAIN_NET_TYPE_INTERNAL;
gVBoxAPI.UINetworkAdapter.GetInternalNetwork(adapter, &utf16); gVBoxAPI.UINetworkAdapter.GetInternalNetwork(adapter, &utf16);
VBOX_UTF16_TO_UTF8(utf16, &intNet); VBOX_UTF16_TO_UTF8(utf16, &utf8);
ignore_value(VIR_STRDUP(net->data.internal.name, intNet)); ignore_value(VIR_STRDUP(net->data.internal.name, utf8));
VBOX_UTF8_FREE(intNet); VBOX_UTF8_FREE(utf8);
VBOX_UTF16_FREE(utf16); VBOX_UTF16_FREE(utf16);
} else if (attachmentType == NetworkAttachmentType_HostOnly) { } else if (attachmentType == NetworkAttachmentType_HostOnly) {
char *hostInt = NULL;
net->type = VIR_DOMAIN_NET_TYPE_NETWORK; net->type = VIR_DOMAIN_NET_TYPE_NETWORK;
gVBoxAPI.UINetworkAdapter.GetHostOnlyInterface(adapter, &utf16); gVBoxAPI.UINetworkAdapter.GetHostOnlyInterface(adapter, &utf16);
VBOX_UTF16_TO_UTF8(utf16, &hostInt); VBOX_UTF16_TO_UTF8(utf16, &utf8);
ignore_value(VIR_STRDUP(net->data.network.name, hostInt)); ignore_value(VIR_STRDUP(net->data.network.name, utf8));
VBOX_UTF8_FREE(hostInt); VBOX_UTF8_FREE(utf8);
VBOX_UTF16_FREE(utf16); VBOX_UTF16_FREE(utf16);
} else { } else {
@ -3775,15 +3769,15 @@ vboxDumpNetwork(vboxDriverPtr data, INetworkAdapter *adapter)
} }
gVBoxAPI.UINetworkAdapter.GetMACAddress(adapter, &utf16); gVBoxAPI.UINetworkAdapter.GetMACAddress(adapter, &utf16);
VBOX_UTF16_TO_UTF8(utf16, &MACAddress); VBOX_UTF16_TO_UTF8(utf16, &utf8);
VBOX_UTF16_FREE(utf16); VBOX_UTF16_FREE(utf16);
if (virMacAddrParseHex(MACAddress, &net->mac) < 0) { if (virMacAddrParseHex(utf8, &net->mac) < 0) {
VBOX_UTF8_FREE(MACAddress); VBOX_UTF8_FREE(utf8);
goto error; goto error;
} }
VBOX_UTF8_FREE(MACAddress); VBOX_UTF8_FREE(utf8);
return net; return net;
error: error: