diff options
Diffstat (limited to 'lib/idn_win32.c')
| -rw-r--r-- | lib/idn_win32.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/lib/idn_win32.c b/lib/idn_win32.c index 0c791ae60..74abfb6d0 100644 --- a/lib/idn_win32.c +++ b/lib/idn_win32.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -39,13 +39,13 @@ static wchar_t *_curl_win32_UTF8_to_wchar(const char *str_utf8) { wchar_t *str_w = NULL; - if (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) { str_w = (wchar_t *) malloc(str_w_len * sizeof(wchar_t)); - if (str_w) { - if (MultiByteToWideChar(CP_UTF8, 0, str_utf8, -1, str_w, + if(str_w) { + if(MultiByteToWideChar(CP_UTF8, 0, str_utf8, -1, str_w, str_w_len) == 0) { free(str_w); str_w = NULL; @@ -61,13 +61,13 @@ static const char *_curl_win32_wchar_to_UTF8(const wchar_t *str_w) { char *str_utf8 = NULL; - if (str_w) { + if(str_w) { size_t str_utf8_len = WideCharToMultiByte(CP_UTF8, 0, str_w, -1, NULL, 0, NULL, NULL); - if (str_utf8_len) { + if(str_utf8_len) { str_utf8 = (char *) malloc(str_utf8_len * sizeof(wchar_t)); - if (str_utf8) { - if (WideCharToMultiByte(CP_UTF8, 0, str_w, -1, str_utf8, str_utf8_len, + 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); @@ -86,9 +86,9 @@ static const char *_curl_win32_wchar_to_UTF8(const wchar_t *str_w) int curl_win32_idn_to_ascii(const char *in, char **out) { wchar_t *in_w = _curl_win32_UTF8_to_wchar(in); - if (in_w) { + if(in_w) { wchar_t punycode[IDN_MAX_LENGTH]; - if (IdnToAscii(0, in_w, -1, punycode, IDN_MAX_LENGTH) == 0) { + if(IdnToAscii(0, in_w, -1, punycode, IDN_MAX_LENGTH) == 0) { wprintf(L"ERROR %d converting to Punycode\n", GetLastError()); free(in_w); return 0; @@ -96,7 +96,7 @@ int curl_win32_idn_to_ascii(const char *in, char **out) free(in_w); *out = (char *)_curl_win32_wchar_to_UTF8(punycode); - if (!(*out)) { + if(!(*out)) { return 0; } } @@ -105,16 +105,16 @@ int curl_win32_idn_to_ascii(const char *in, char **out) int curl_win32_ascii_to_idn(const char *in, size_t in_len, char **out_utf8) { - if (in) { + if(in) { WCHAR unicode[IDN_MAX_LENGTH]; - if (IdnToUnicode(0, (wchar_t *)in, -1, unicode, IDN_MAX_LENGTH) == 0) { + if(IdnToUnicode(0, (wchar_t *)in, -1, unicode, IDN_MAX_LENGTH) == 0) { wprintf(L"ERROR %d converting to Punycode\n", GetLastError()); return 0; } else { const char *out_utf8 = _curl_win32_wchar_to_UTF8(unicode); - if (!out_utf8) { + if(!out_utf8) { return 0; } } |