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

diff --git a/menu.c b/menu.c
index d3f422e..1431797 100644
--- a/menu.c
+++ b/menu.c
@@ -11,6 +11,8 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "mutt_curses.h"
@@ -22,7 +24,6 @@
 #include "imap.h"
 #endif
 
-#include "lib/mem.h"
 #include "lib/intl.h"
 #include "lib/str.h"
 
@@ -150,7 +151,7 @@ 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;
@@ -159,7 +160,7 @@ void menu_pad_string (char *s, size_t n)
   mutt_format_string (tmpbuf, n, cols, cols, 0, ' ', s, str_len (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