diff options
| author | Yang Tse <yangsita@gmail.com> | 2012-07-05 22:16:15 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2012-07-05 22:18:11 +0200 |
| commit | e77d8670685d38d80c940877a4fdfa3382c4d6cc (patch) | |
| tree | 91b785d4fc38e8b741c62f8335b9a1bf5f5e7b1c /lib/curl_multibyte.c | |
| parent | 1b27bb446fad52d94a44d1d9bb5ee4b9c65d1e24 (diff) | |
unicode NTLM SSPI: cleanup
Reduce the number of #ifdef UNICODE directives used in source files.
Diffstat (limited to 'lib/curl_multibyte.c')
| -rw-r--r-- | lib/curl_multibyte.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/lib/curl_multibyte.c b/lib/curl_multibyte.c index c85ec563b..7cb9e4c60 100644 --- a/lib/curl_multibyte.c +++ b/lib/curl_multibyte.c @@ -22,8 +22,7 @@ #include "setup.h" -#if defined(USE_WIN32_IDN) || \ - (defined(USE_WINDOWS_SSPI) && (defined(_WIN32_WCE) || defined(UNICODE))) +#if defined(USE_WIN32_IDN) || (defined(USE_WINDOWS_SSPI) && defined(UNICODE)) /* * MultiByte conversions using Windows kernel32 library. @@ -45,13 +44,12 @@ wchar_t *Curl_convert_UTF8_to_wchar(const char *str_utf8) if(str_utf8) { int str_w_len = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str_utf8, -1, NULL, 0); - if(str_w_len) { + if(str_w_len > 0) { str_w = malloc(str_w_len * sizeof(wchar_t)); if(str_w) { if(MultiByteToWideChar(CP_UTF8, 0, str_utf8, -1, str_w, str_w_len) == 0) { - free(str_w); - str_w = NULL; + Curl_safefree(str_w); } } } @@ -60,30 +58,25 @@ wchar_t *Curl_convert_UTF8_to_wchar(const char *str_utf8) return str_w; } -const char *Curl_convert_wchar_to_UTF8(const wchar_t *str_w) +char *Curl_convert_wchar_to_UTF8(const wchar_t *str_w) { char *str_utf8 = NULL; if(str_w) { - size_t str_utf8_len = WideCharToMultiByte(CP_UTF8, 0, str_w, -1, NULL, - 0, NULL, NULL); - if(str_utf8_len) { + int str_utf8_len = WideCharToMultiByte(CP_UTF8, 0, str_w, -1, NULL, + 0, NULL, NULL); + if(str_utf8_len > 0) { str_utf8 = malloc(str_utf8_len * sizeof(wchar_t)); if(str_utf8) { if(WideCharToMultiByte(CP_UTF8, 0, str_w, -1, str_utf8, str_utf8_len, NULL, FALSE) == 0) { - (void) GetLastError(); - free((void *)str_utf8); - str_utf8 = NULL; + Curl_safefree(str_utf8); } } } - else { - (void) GetLastError(); - } } return str_utf8; } -#endif /* USE_WIN32_IDN || (USE_WINDOWS_SSPI && (_WIN32_WCE || UNICODE)) */ +#endif /* USE_WIN32_IDN || (USE_WINDOWS_SSPI && UNICODE) */ |