tests: esxutils: reduce variable scope in testConvertWindows1252ToUTF8

Also use g_auto.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Ján Tomko 2021-09-03 20:17:09 +02:00
parent ac1a9a5e8b
commit dfee211d91

View File

@ -197,10 +197,9 @@ static int
testConvertWindows1252ToUTF8(const void *data G_GNUC_UNUSED)
{
size_t i;
char *utf8 = NULL;
for (i = 0; i < G_N_ELEMENTS(windows1252ToUTF8); ++i) {
VIR_FREE(utf8);
g_autofree char *utf8 = NULL;
utf8 = virVMXConvertToUTF8("Windows-1252",
windows1252ToUTF8[i].windows1252);
@ -208,13 +207,10 @@ testConvertWindows1252ToUTF8(const void *data G_GNUC_UNUSED)
if (utf8 == NULL)
return -1;
if (STRNEQ(windows1252ToUTF8[i].utf8, utf8)) {
VIR_FREE(utf8);
if (STRNEQ(windows1252ToUTF8[i].utf8, utf8))
return -1;
}
}
VIR_FREE(utf8);
return 0;
}