mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-02-23 15:10:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Silence iconv() warnings.

Browse Source
This commit is contained in:
Gisle Vanem 2006-07-25 11:35:35 +00:00
parent 9111909c1d
commit ab486d1e27
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/easy.c
View File

@ -98,6 +98,7 @@
#ifndef CURL_ICONV_CODESET_FOR_UTF8 #ifndef CURL_ICONV_CODESET_FOR_UTF8
#define CURL_ICONV_CODESET_FOR_UTF8 "UTF-8" #define CURL_ICONV_CODESET_FOR_UTF8 "UTF-8"
#endif #endif
#define ICONV_ERROR (size_t)-1
#endif /* CURL_DOES_CONVERSIONS && HAVE_ICONV */ #endif /* CURL_DOES_CONVERSIONS && HAVE_ICONV */
/* The last #include file should be: */ /* The last #include file should be: */
@ -722,9 +723,9 @@ CURLcode Curl_convert_to_network(struct SessionHandle *data,
/* call iconv */ /* call iconv */
input_ptr = output_ptr = buffer; input_ptr = output_ptr = buffer;
in_bytes = out_bytes = length; in_bytes = out_bytes = length;
rc = iconv(data->outbound_cd, &input_ptr, &in_bytes, rc = iconv(data->outbound_cd, (const char**)&input_ptr, &in_bytes,
&output_ptr, &out_bytes); &output_ptr, &out_bytes);
if ((rc == -1) || (in_bytes != 0)) { if ((rc == ICONV_ERROR) || (in_bytes != 0)) {
failf(data, failf(data,
"The Curl_convert_to_network iconv call failed with errno %i: %s", "The Curl_convert_to_network iconv call failed with errno %i: %s",
errno, strerror(errno)); errno, strerror(errno));
@ -779,9 +780,9 @@ CURLcode Curl_convert_from_network(struct SessionHandle *data,
/* call iconv */ /* call iconv */
input_ptr = output_ptr = buffer; input_ptr = output_ptr = buffer;
in_bytes = out_bytes = length; in_bytes = out_bytes = length;
rc = iconv(data->inbound_cd, &input_ptr, &in_bytes, rc = iconv(data->inbound_cd, (const char **)&input_ptr, &in_bytes,
&output_ptr, &out_bytes); &output_ptr, &out_bytes);
if ((rc == -1) || (in_bytes != 0)) { if ((rc == ICONV_ERROR) || (in_bytes != 0)) {
failf(data, failf(data,
"The Curl_convert_from_network iconv call failed with errno %i: %s", "The Curl_convert_from_network iconv call failed with errno %i: %s",
errno, strerror(errno)); errno, strerror(errno));
@ -836,8 +837,9 @@ CURLcode Curl_convert_from_utf8(struct SessionHandle *data,
/* call iconv */ /* call iconv */
input_ptr = output_ptr = buffer; input_ptr = output_ptr = buffer;
in_bytes = out_bytes = length; in_bytes = out_bytes = length;
rc = iconv(data->utf8_cd, &input_ptr, &in_bytes, &output_ptr, &out_bytes); rc = iconv(data->utf8_cd, (const char**)&input_ptr, &in_bytes,
if ((rc == -1) || (in_bytes != 0)) { &output_ptr, &out_bytes);
if ((rc == ICONV_ERROR) || (in_bytes != 0)) {
failf(data, failf(data,
"The Curl_convert_from_utf8 iconv call failed with errno %i: %s", "The Curl_convert_from_utf8 iconv call failed with errno %i: %s",
errno, strerror(errno)); errno, strerror(errno));