Evil: simplify evil_wchar_to_char()

SVN revision: 64023
This commit is contained in:
Vincent Torri 2011-10-12 18:50:11 +00:00
parent 4d5b4b2f24
commit 3859b0ea96
2 changed files with 12 additions and 9 deletions

View File

@ -1,3 +1,8 @@
2011-10-12 Vincent Torri <doursse at users dot sf dot net>
* src/lib/evil_util.c:
simplify evil_wchar_to_char()
2011-10-05 Vincent Torri <doursse at users dot sf dot net>
* src/lib/evil_inet.c:

View File

@ -38,21 +38,19 @@ char *
evil_wchar_to_char(const wchar_t *text)
{
char *atext;
size_t size;
int asize;
size = wcslen(text) + 1;
asize = WideCharToMultiByte(CP_ACP, 0, text, (int)size, NULL, 0, NULL, NULL);
asize = WideCharToMultiByte(CP_ACP, 0, text, -1, NULL, 0, NULL, NULL);
if (asize == 0)
return NULL;
atext = (char*)malloc((asize + 1) * sizeof(char));
atext = (char*)malloc(asize * sizeof(char));
if (!atext)
return NULL;
if (atext)
if (!WideCharToMultiByte(CP_ACP, 0, text, (int)size, atext, asize, NULL, NULL))
return NULL;
atext[asize] = '\0';
asize = WideCharToMultiByte(CP_ACP, 0, text, -1, atext, asize, NULL, NULL);
if (asize == 0)
return NULL;
return atext;
}