diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-09-08 09:22:01 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-09-15 16:56:23 +0200 |
| commit | 46e14b6942c285f955c9217487e8e896068c10df (patch) | |
| tree | 962eac2e632834043cc7e2f005c2c18703b89f75 | |
| parent | 2fc1db56cd13a4cdaf363c86042d7f5a99710241 (diff) | |
| download | curl-46e14b6942c285f955c9217487e8e896068c10df.tar.gz | |
non-ascii: use iconv() with 'char **' argument
Bug: https://curl.haxx.se/mail/lib-2017-09/0031.html
| -rw-r--r-- | lib/non-ascii.c | 6 |
1 files 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; |