projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
less horrible strncpy's
[apps/madmutt.git]
/
mbyte.c
diff --git
a/mbyte.c
b/mbyte.c
index
ce26508
..
6c9a76c
100644
(file)
--- a/
mbyte.c
+++ b/
mbyte.c
@@
-172,7
+172,7
@@
size_t mbrtowc_iconv (wchar_t * pwc, const char *s, size_t n,
r = my_iconv(cd, &ib, &ibl, &ob, &obl);
if (ob > bufo && (!k || ib > bufi + k)) {
/* we have a character */
r = my_iconv(cd, &ib, &ibl, &ob, &obl);
if (ob > bufo && (!k || ib > bufi + k)) {
/* we have a character */
-
memset (ps, 0, sizeof (*ps)
);
+
p_clear(ps, 1
);
utf8rtowc (pwc, bufo, ob - bufo, &mbstate);
return (pwc && *pwc) ? (ib - (k ? bufi + k : s)) : 0;
}
utf8rtowc (pwc, bufo, ob - bufo, &mbstate);
return (pwc && *pwc) ? (ib - (k ? bufi + k : s)) : 0;
}
@@
-189,7
+189,7
@@
size_t mbrtowc_iconv (wchar_t * pwc, const char *s, size_t n,
}
else {
/* save the state and give up */
}
else {
/* save the state and give up */
-
memset (ps, 0, sizeof (*ps)
);
+
p_clear(ps, 1
);
if (ibl <= sizeof (mbstate_t)) /* need extra condition here! */
memcpy (ps, ib, ibl);
return (size_t) (-2);
if (ibl <= sizeof (mbstate_t)) /* need extra condition here! */
memcpy (ps, ib, ibl);
return (size_t) (-2);
@@
-216,7
+216,7
@@
size_t mbrtowc (wchar_t * pwc, const char *s, size_t n, mbstate_t * ps)
return mbrtowc_iconv (pwc, s, n, ps, charset_to_utf8);
else {
if (!s) {
return mbrtowc_iconv (pwc, s, n, ps, charset_to_utf8);
else {
if (!s) {
-
memset (ps, 0, sizeof (*ps)
);
+
p_clear(ps, 1
);
return 0;
}
if (!n)
return 0;
}
if (!n)