returns number of converted chars from f, see iconv(3)
*/
static ssize_t
-convert_string(const char *from, const char *f, ssize_t flen,
+convert_string(const char *from, const char *f, size_t flen,
const char *to, char **t, size_t *tlen)
{
iconv_t cd;
char *buf, *ob;
- size_t obl, n;
+ size_t obl;
+ ssize_t n;
int e;
cd = mutt_iconv_open(to, from, 0);
cd = mutt_iconv_open (tocode, fromcode, 0);
assert (cd != (iconv_t) (-1));
ib = d, ibl = dlen, ob = buf1, obl = sizeof (buf1) - m_strlen(tocode);
- if (my_iconv(cd, &ib, &ibl, &ob, &obl) == (size_t) (-1) ||
- my_iconv(cd, 0, 0, &ob, &obl) == (size_t) (-1)) {
+ if (my_iconv(cd, &ib, &ibl, &ob, &obl) < 0
+ || my_iconv(cd, 0, 0, &ob, &obl) < 0)
+ {
assert (errno == E2BIG);
iconv_close (cd);
assert (ib > d);
}
void rfc2047_encode_string(char **pd) {
- _rfc2047_encode_string(a, 0, 32);
+ _rfc2047_encode_string(pd, 0, 32);
}
void rfc2047_encode_adrlist (address_t * addr, const char *tag)