#include <lib-ui/curses.h>
#include "mutt.h"
+#include "charset.h"
#include "keymap.h"
#include "pager.h"
return (NULL);
}
-void mutt_make_help (char *d, size_t dlen, char *txt, int menu, int op)
+void mutt_make_help (char *d, ssize_t dlen, char *txt, int menu, int op)
{
char buf[SHORT_STRING];
d[0] = 0;
}
-char *mutt_compile_help (char *buf, size_t buflen, int menu,
+char *mutt_compile_help (char *buf, ssize_t buflen, int menu,
struct mapping_t *items)
{
int i;
- size_t len;
+ ssize_t len;
char *pbuf = buf;
for (i = 0; items[i].name && buflen > 2; i++) {
int n = maxwidth;
wchar_t wc;
int w;
- size_t k;
- size_t len = m_strlen(*macro);
+ ssize_t k;
+ ssize_t len = m_strlen(*macro);
mbstate_t mbstate1, mbstate2;
p_clear(&mbstate1, 1);
p_clear(&mbstate2, 1);
for (; len && (k = mbrtowc (&wc, *macro, len, &mbstate1));
*macro += k, len -= k) {
- if (k == (size_t) (-1) || k == (size_t) (-2)) {
- k = (k == (size_t) (-1)) ? 1 : len;
- wc = replacement_char ();
+ if (k == -1 || k == -2) {
+ k = (k == -1) ? 1 : len;
+ wc = CharsetReplacement;
}
/* glibc-2.1.3's wcwidth() returns 1 for unprintable chars! */
if (IsWPrint (wc) && (w = wcwidth (wc)) >= 0) {
n -= w;
{
char buf[MB_LEN_MAX * 2];
- size_t n1, n2;
+ ssize_t n1, n2;
- if ((n1 = wcrtomb (buf, wc, &mbstate2)) != (size_t) (-1) &&
- (n2 = wcrtomb (buf + n1, 0, &mbstate2)) != (size_t) (-1))
+ if ((n1 = wcrtomb(buf, wc, &mbstate2)) != -1 &&
+ (n2 = wcrtomb(buf + n1, 0, &mbstate2)) != -1)
fputs (buf, f);
}
}