X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=menu.c;h=52547deba533aaf4df440d1f26a0df79059d365d;hp=1431797eca3e7e2cb982c6663b07ac096473f8c1;hb=21595f98b7c8132f99abb9fee60ecdce31fc980f;hpb=617e7d83d14e14e6a520a48e75437211b16c8834

diff --git a/menu.c b/menu.c
index 1431797..52547de 100644
--- a/menu.c
+++ b/menu.c
@@ -12,6 +12,8 @@
 #endif
 
 #include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -24,8 +26,6 @@
 #include "imap.h"
 #endif
 
-#include "lib/intl.h"
-#include "lib/str.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -38,10 +38,10 @@ static void print_enriched_string (int attr, unsigned char *s, int do_color)
 {
   wchar_t wc;
   size_t k;
-  size_t n = str_len ((char *) s);
+  size_t n = m_strlen((char *) s);
   mbstate_t mbstate;
 
-  memset (&mbstate, 0, sizeof (mbstate));
+  p_clear(&mbstate, 1);
   while (*s) {
     if (*s < M_TREE_MAX) {
       if (do_color)
@@ -157,7 +157,7 @@ void menu_pad_string (char *s, size_t n)
     cols = COLS - shift - SidebarWidth;
   else
     cols = COLS - shift;
-  mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s, str_len (s), 1);
+  mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s, m_strlen(s), 1);
   tmpbuf[n - 1] = 0;
   snprintf (s, n, "%s", tmpbuf);        /* overkill */
   p_delete(&tmpbuf);