X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=menu.c;h=05b6b11609999e5927adc72aedb4036eed45343e;hp=d3f422e26a451ec57077f042357ffa952fcef84f;hb=efe9a0bac26a7dabf3953ea0597ce06b3dcb21fe;hpb=75291cb065ec25499a125665cba1123ee4c64abf

diff --git a/menu.c b/menu.c
index d3f422e..05b6b11 100644
--- a/menu.c
+++ b/menu.c
@@ -11,6 +11,10 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "mutt_curses.h"
@@ -22,9 +26,6 @@
 #include "imap.h"
 #endif
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -37,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)
@@ -139,7 +140,7 @@ static void print_enriched_string (int attr, unsigned char *s, int do_color)
 static void menu_make_entry (char *s, int l, MUTTMENU * menu, int i)
 {
   if (menu->dialog) {
-    strncpy (s, menu->dialog[i], l);
+    m_strcpy(s, l, menu->dialog[i]);
     menu->current = -1;         /* hide menubar */
   }
   else
@@ -150,16 +151,16 @@ void menu_pad_string (char *s, size_t n)
 {
   int shift = option (OPTARROWCURSOR) ? 3 : 0;
   int cols;
-  char *tmpbuf = mem_malloc (n);
+  char *tmpbuf = p_new(char, n);
 
   if (option (OPTMBOXPANE))
     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 */
-  mem_free (&tmpbuf);
+  p_delete(&tmpbuf);
 }
 
 void menu_redraw_full (MUTTMENU * menu)
@@ -642,7 +643,7 @@ static int menu_search_generic (MUTTMENU * m, regex_t * re, int n)
 
 MUTTMENU *mutt_new_menu (void)
 {
-  MUTTMENU *p = (MUTTMENU *) mem_calloc (1, sizeof (MUTTMENU));
+  MUTTMENU *p = p_new(MUTTMENU, 1);
 
   p->current = 0;
   p->top = 0;
@@ -658,16 +659,16 @@ void mutt_menuDestroy (MUTTMENU ** p)
 {
   int i;
 
-  mem_free (&(*p)->searchBuf);
+  p_delete(&(*p)->searchBuf);
 
   if ((*p)->dialog) {
     for (i = 0; i < (*p)->max; i++)
-      mem_free (&(*p)->dialog[i]);
+      p_delete(&(*p)->dialog[i]);
 
-    mem_free (&(*p)->dialog);
+    p_delete(&(*p)->dialog);
   }
 
-  mem_free (p);
+  p_delete(p);
 }
 
 #define M_SEARCH_UP   1
@@ -681,12 +682,12 @@ static int menu_search (MUTTMENU * menu, int op)
   char buf[SHORT_STRING];
 
   if (op != OP_SEARCH_NEXT && op != OP_SEARCH_OPPOSITE) {
-    strfcpy (buf, menu->searchBuf ? menu->searchBuf : "", sizeof (buf));
+    m_strcpy(buf, sizeof(buf), NONULL(menu->searchBuf));
     if (mutt_get_field ((op == OP_SEARCH) ? _("Search for: ") :
                         _("Reverse search for: "),
                         buf, sizeof (buf), M_CLEAR) != 0 || !buf[0])
       return (-1);
-    str_replace (&menu->searchBuf, buf);
+    m_strreplace(&menu->searchBuf, buf);
     menu->searchDir = (op == OP_SEARCH) ? M_SEARCH_DOWN : M_SEARCH_UP;
   }
   else {
@@ -799,7 +800,7 @@ int mutt_menuLoop (MUTTMENU * menu)
 {
   int i = OP_NULL;
 
-  FOREVER {
+  for (;;) {
     if (option (OPTMENUCALLER)) {
       unset_option (OPTMENUCALLER);
       return OP_NULL;