forked from enlightenment/efl
parent
4d5b4b2f24
commit
3859b0ea96
|
@ -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>
|
2011-10-05 Vincent Torri <doursse at users dot sf dot net>
|
||||||
|
|
||||||
* src/lib/evil_inet.c:
|
* src/lib/evil_inet.c:
|
||||||
|
|
|
@ -38,21 +38,19 @@ char *
|
||||||
evil_wchar_to_char(const wchar_t *text)
|
evil_wchar_to_char(const wchar_t *text)
|
||||||
{
|
{
|
||||||
char *atext;
|
char *atext;
|
||||||
size_t size;
|
|
||||||
int asize;
|
int asize;
|
||||||
|
|
||||||
size = wcslen(text) + 1;
|
asize = WideCharToMultiByte(CP_ACP, 0, text, -1, NULL, 0, NULL, NULL);
|
||||||
|
|
||||||
asize = WideCharToMultiByte(CP_ACP, 0, text, (int)size, NULL, 0, NULL, NULL);
|
|
||||||
if (asize == 0)
|
if (asize == 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
atext = (char*)malloc((asize + 1) * sizeof(char));
|
atext = (char*)malloc(asize * sizeof(char));
|
||||||
|
if (!atext)
|
||||||
if (atext)
|
return NULL;
|
||||||
if (!WideCharToMultiByte(CP_ACP, 0, text, (int)size, atext, asize, NULL, NULL))
|
|
||||||
|
asize = WideCharToMultiByte(CP_ACP, 0, text, -1, atext, asize, NULL, NULL);
|
||||||
|
if (asize == 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
atext[asize] = '\0';
|
|
||||||
|
|
||||||
return atext;
|
return atext;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue