From 46e14b6942c285f955c9217487e8e896068c10df Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 8 Sep 2017 09:22:01 +0200 Subject: [PATCH] non-ascii: use iconv() with 'char **' argument Bug: https://curl.haxx.se/mail/lib-2017-09/0031.html --- lib/non-ascii.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/non-ascii.c b/lib/non-ascii.c index b8ddb02e5..92b2f8d73 100644 --- a/lib/non-ascii.c +++ b/lib/non-ascii.c @@ -119,7 +119,7 @@ CURLcode Curl_convert_to_network(struct Curl_easy *data, /* call iconv */ input_ptr = output_ptr = buffer; in_bytes = out_bytes = length; - rc = iconv(*cd, (const char **)&input_ptr, &in_bytes, + rc = iconv(*cd, &input_ptr, &in_bytes, &output_ptr, &out_bytes); if(!data) iconv_close(tmpcd); @@ -182,7 +182,7 @@ CURLcode Curl_convert_from_network(struct Curl_easy *data, /* call iconv */ input_ptr = output_ptr = buffer; in_bytes = out_bytes = length; - rc = iconv(*cd, (const char **)&input_ptr, &in_bytes, + rc = iconv(*cd, &input_ptr, &in_bytes, &output_ptr, &out_bytes); if(!data) iconv_close(tmpcd); @@ -224,7 +224,7 @@ CURLcode Curl_convert_from_utf8(struct Curl_easy *data, /* do the translation ourselves */ iconv_t tmpcd = (iconv_t) -1; iconv_t *cd = &tmpcd; - const char *input_ptr; + char *input_ptr; char *output_ptr; size_t in_bytes, out_bytes, rc;