X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fcodeconv.c;h=94ba39ef2c24698c173d510bbd96e7787e4ca2ca;hp=2546c8a0c438f49c0bd897a29e8d4f488b6e48c6;hb=94a27c44ab917d95403e288eb758025bf5bdd762;hpb=a04613f31a9fc4b34a78ccdd7d91e39cfb375d69 diff --git a/src/codeconv.c b/src/codeconv.c index 2546c8a0c..94ba39ef2 100644 --- a/src/codeconv.c +++ b/src/codeconv.c @@ -802,12 +802,12 @@ gchar *conv_iconv_strdup(const gchar *inbuf, const gchar *inbuf_p; gchar *outbuf; gchar *outbuf_p; - gint in_size; - gint in_left; - gint out_size; - gint out_left; - gint n_conv; - gint len; + size_t in_size; + size_t in_left; + size_t out_size; + size_t out_left; + size_t n_conv; + size_t len; if (!src_code) src_code = conv_get_outgoing_charset_str(); @@ -844,7 +844,7 @@ gchar *conv_iconv_strdup(const gchar *inbuf, } while ((n_conv = iconv(cd, (ICONV_CONST gchar **)&inbuf_p, &in_left, - &outbuf_p, &out_left)) < 0) { + &outbuf_p, &out_left)) == (size_t)-1) { if (EILSEQ == errno) { inbuf_p++; in_left--; @@ -864,7 +864,8 @@ gchar *conv_iconv_strdup(const gchar *inbuf, } } - while ((n_conv = iconv(cd, NULL, NULL, &outbuf_p, &out_left)) < 0) { + while ((n_conv = iconv(cd, NULL, NULL, &outbuf_p, &out_left)) == + (size_t)-1) { if (E2BIG == errno) { EXPAND_BUF(); } else {