Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve test_wchar2utf8().

Browse source 
Currently it contains strange code like using `do` loop in order to
avoid `goto`s (they aren't evil, honestly), the pointless `if (mem)`
conditional which doesn't even work (had semicolon for some reason).

You may think this code had a bug where the code didn't check for
the pointer to be null before calling `free`, but this is not the case,
as according to C and C++ standard, `free` should allow `NULL` pointers,
and ignore them.
This commit is contained in:
Konrad Borowski 2014-05-04 15:46:15 +02:00
parent 333fb1bf97
commit 16534ec644
1 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
fish_tests.cpp
View file

@ -1021,28 +1021,23 @@ static void test_wchar2utf8(const wchar_t *src, size_t slen, const char *dst, si
} }
} }
do size = wchar_to_utf8(src, slen, mem, dlen, flags);
if (res != size)
{ {
size = wchar_to_utf8(src, slen, mem, dlen, flags); err(L"w2u: %s: FAILED (rv: %lu, must be %lu)", descr, size, res);
if (res != size) goto finish;
{
err(L"w2u: %s: FAILED (rv: %lu, must be %lu)", descr, size, res);
break;
}
if (mem == NULL)
break; /* OK */
if (memcmp(mem, dst, size) != 0)
{
err(L"w2u: %s: BROKEN", descr);
break;
}
} }
while (0);
if (mem != NULL); if (mem == NULL)
goto finish; /* OK */
if (memcmp(mem, dst, size) != 0)
{
err(L"w2u: %s: BROKEN", descr);
goto finish;
}
finish:
free(mem); free(mem);
} }