moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

idn_win32.c: Fixed compilation warning from commit 9e7fcd4291

Browse Source 
warning C4267: 'function': conversion from 'size_t' to 'int',
               possible loss of data
This commit is contained in:
Steve Holme 2016-03-10 21:52:09 +00:00
parent eab769518e
commit 28477fd67a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/idn_win32.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -29,9 +29,10 @@
#ifdef USE_WIN32_IDN #ifdef USE_WIN32_IDN
#include "curl_multibyte.h" #include "curl_multibyte.h"
#include "curl_memory.h" #include "curl_memory.h"
/* The last #include file should be: */ #include "warnless.h"
/* The last #include file should be: */
#include "memdebug.h" #include "memdebug.h"
#ifdef WANT_IDN_PROTOTYPES #ifdef WANT_IDN_PROTOTYPES
@ -89,8 +90,10 @@ int curl_win32_ascii_to_idn(const char *in, char **out)
int ret = 0; int ret = 0;
wchar_t *in_w = Curl_convert_UTF8_to_wchar(in); wchar_t *in_w = Curl_convert_UTF8_to_wchar(in);
if(in_w) { if(in_w) {
size_t in_len = wcslen(in_w) + 1;
wchar_t unicode[IDN_MAX_LENGTH]; wchar_t unicode[IDN_MAX_LENGTH];
int chars = IdnToUnicode(0, in_w, wcslen(in_w)+1, unicode, IDN_MAX_LENGTH); int chars = IdnToUnicode(0, in_w, curlx_uztosi(in_len),
unicode, IDN_MAX_LENGTH);
free(in_w); free(in_w);
if(chars) { if(chars) {
*out = Curl_convert_wchar_to_UTF8(unicode); *out = Curl_convert_wchar_to_UTF8(unicode);