]> granicus.if.org Git - curl/commitdiff
non-ascii: use iconv() with 'char **' argument
authorDaniel Stenberg <daniel@haxx.se>
Fri, 8 Sep 2017 07:22:01 +0000 (09:22 +0200)
committerDaniel Stenberg <daniel@haxx.se>
Fri, 15 Sep 2017 14:56:23 +0000 (16:56 +0200)
Bug: https://curl.haxx.se/mail/lib-2017-09/0031.html

lib/non-ascii.c

index b8ddb02e5d07c09c824125a136b71f858d096834..92b2f8d73206ae23b123b0aad559eccd174aff48 100644 (file)
@@ -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;