projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move pop into lib-mx.
[apps/madmutt.git]
/
lib-mime
/
rfc2047.c
diff --git
a/lib-mime/rfc2047.c
b/lib-mime/rfc2047.c
index
a2629a9
..
1d42403
100644
(file)
--- a/
lib-mime/rfc2047.c
+++ b/
lib-mime/rfc2047.c
@@
-69,9
+69,9
@@
convert_string(const char *from, const char *f, ssize_t flen,
obl = 4 * flen + 1;
ob = buf = p_new(char, obl);
obl = 4 * flen + 1;
ob = buf = p_new(char, obl);
- n = m
utt
_iconv(cd, &f, &flen, &ob, &obl);
+ n = m
y
_iconv(cd, &f, &flen, &ob, &obl);
- if (n < 0 || m
utt
_iconv(cd, 0, 0, &ob, &obl) < 0) {
+ if (n < 0 || m
y
_iconv(cd, 0, 0, &ob, &obl) < 0) {
int e = errno;
iconv_close(cd);
errno = e;
int e = errno;
iconv_close(cd);
errno = e;
@@
-266,14
+266,14
@@
static size_t try_block(const char *d, ssize_t dlen,
ob = buf1;
ob = buf1;
- if (m
utt
_iconv(cd, &ib, &ibl, &ob, &obl) < 0
- || m
utt
_iconv(cd, 0, 0, &ob, &obl) < 0)
+ if (m
y
_iconv(cd, &ib, &ibl, &ob, &obl) < 0
+ || m
y
_iconv(cd, 0, 0, &ob, &obl) < 0)
{
assert (errno == E2BIG && ib > d);
iconv_close(cd);
return (ib - d == dlen) ? dlen : ib - d + 1;
}
{
assert (errno == E2BIG && ib > d);
iconv_close(cd);
return (ib - d == dlen) ? dlen : ib - d + 1;
}
- iconv_close(cd);
+ iconv_close
(cd);
} else {
if (dlen > obl)
return obl + 1;
} else {
if (dlen > obl)
return obl + 1;
@@
-331,10
+331,10
@@
encode_block(char *s, char *d, ssize_t dlen,
cd = mutt_iconv_open(tocode, fromcode, 0);
assert (cd != MUTT_ICONV_ERROR);
ib = d, ibl = dlen, ob = buf1, obl = sizeof(buf1) - m_strlen(tocode);
cd = mutt_iconv_open(tocode, fromcode, 0);
assert (cd != MUTT_ICONV_ERROR);
ib = d, ibl = dlen, ob = buf1, obl = sizeof(buf1) - m_strlen(tocode);
- n1 = m
utt
_iconv(cd, &ib, &ibl, &ob, &obl);
- n2 = m
utt
_iconv(cd, 0, 0, &ob, &obl);
+ n1 = m
y
_iconv(cd, &ib, &ibl, &ob, &obl);
+ n2 = m
y
_iconv(cd, 0, 0, &ob, &obl);
assert (n1 >= 0 && n2 >= 0);
assert (n1 >= 0 && n2 >= 0);
- iconv_close(cd);
+ iconv_close
(cd);
return (*encoder)(s, buf1, ob - buf1, tocode);
} else {
return (*encoder)(s, d, dlen, tocode);
return (*encoder)(s, buf1, ob - buf1, tocode);
} else {
return (*encoder)(s, d, dlen, tocode);