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

vboxDumpDisplay: reuse the keyUtf16 variable

Browse Source 
We free the key right after calling the API.

Reuse a single variable to remove the typo.
This commit is contained in:
Ján Tomko 2016-02-05 17:43:00 +01:00
parent 2ab95531ca
commit 5a16197459
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/vbox/vbox_common.c
View File

@ -3300,7 +3300,7 @@ static int
vboxDumpDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine) vboxDumpDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
{ {
/* dump display options vrdp/gui/sdl */ /* dump display options vrdp/gui/sdl */
PRUnichar *keyTypeUtf16 = NULL; PRUnichar *keyUtf16 = NULL;
PRUnichar *valueTypeUtf16 = NULL; PRUnichar *valueTypeUtf16 = NULL;
char *valueTypeUtf8 = NULL; char *valueTypeUtf8 = NULL;
char *netAddressUtf8 = NULL; char *netAddressUtf8 = NULL;
@ -3311,9 +3311,9 @@ vboxDumpDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
def->ngraphics = 0; def->ngraphics = 0;
VBOX_UTF8_TO_UTF16("FRONTEND/Type", &keyTypeUtf16); VBOX_UTF8_TO_UTF16("FRONTEND/Type", &keyUtf16);
gVBoxAPI.UIMachine.GetExtraData(machine, keyTypeUtf16, &valueTypeUtf16); gVBoxAPI.UIMachine.GetExtraData(machine, keyUtf16, &valueTypeUtf16);
VBOX_UTF16_FREE(keyTypeUtf16); VBOX_UTF16_FREE(keyUtf16);
if (valueTypeUtf16) { if (valueTypeUtf16) {
VBOX_UTF16_TO_UTF8(valueTypeUtf16, &valueTypeUtf8); VBOX_UTF16_TO_UTF8(valueTypeUtf16, &valueTypeUtf8);
@ -3322,16 +3322,15 @@ vboxDumpDisplay(virDomainDefPtr def, vboxGlobalData *data, IMachine *machine)
if (STREQ_NULLABLE(valueTypeUtf8, "sdl") || if (STREQ_NULLABLE(valueTypeUtf8, "sdl") ||
STREQ_NULLABLE(valueTypeUtf8, "gui")) { STREQ_NULLABLE(valueTypeUtf8, "gui")) {
PRUnichar *keyDislpayUtf16 = NULL;
PRUnichar *valueDisplayUtf16 = NULL; PRUnichar *valueDisplayUtf16 = NULL;
char *valueDisplayUtf8 = NULL; char *valueDisplayUtf8 = NULL;
if (VIR_ALLOC(graphics) < 0) if (VIR_ALLOC(graphics) < 0)
goto cleanup; goto cleanup;
VBOX_UTF8_TO_UTF16("FRONTEND/Display", &keyDislpayUtf16); VBOX_UTF8_TO_UTF16("FRONTEND/Display", &keyUtf16);
gVBoxAPI.UIMachine.GetExtraData(machine, keyDislpayUtf16, &valueDisplayUtf16); gVBoxAPI.UIMachine.GetExtraData(machine, keyUtf16, &valueDisplayUtf16);
VBOX_UTF16_FREE(keyDislpayUtf16); VBOX_UTF16_FREE(keyUtf16);
if (valueDisplayUtf16) { if (valueDisplayUtf16) {
VBOX_UTF16_TO_UTF8(valueDisplayUtf16, &valueDisplayUtf8); VBOX_UTF16_TO_UTF8(valueDisplayUtf16, &valueDisplayUtf8);