X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=help.c;h=4bd1b01127343018d51e62be854dab6b64baaeb7;hp=627f4c21acfc69ab0daf4f823d31bf6eac06a350;hb=230399f9632c37b66c1c117a17e8327eae6b3235;hpb=10e80e482eff3762b0b8d41b0c7795b76704479c

diff --git a/help.c b/help.c
index 627f4c2..4bd1b01 100644
--- a/help.c
+++ b/help.c
@@ -18,14 +18,12 @@
 #include <ctype.h>
 #include <string.h>
 
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-#include <lib-lib/str.h>
-#include <lib-lib/mapping.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-ui/curses.h>
 
 #include "mutt.h"
+#include "charset.h"
 #include "keymap.h"
 #include "pager.h"
 
@@ -50,7 +48,7 @@ static struct binding_t *help_lookupFunction (int op, int menu)
   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];
 
@@ -61,11 +59,11 @@ void mutt_make_help (char *d, size_t dlen, char *txt, int menu, int op)
     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++) {
@@ -87,29 +85,29 @@ static int print_macro (FILE * f, int maxwidth, const char **macro)
   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) {
+    if (iswprint(wc) && (w = wcwidth (wc)) >= 0) {
       if (w > n)
         break;
       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);
       }
     }