X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=enter.c;h=4841111211276eb0391a3991f3f82f98ab4224a6;hp=2f7a0f340b3d7101d6ee8cc0b6a45a4c2ca28e5a;hb=1dc7032b59cc5b91d70076ed228bda8caf65a7f3;hpb=ba5e3af4ea19e1d20c80941c077039871ec84258

diff --git a/enter.c b/enter.c
index 2f7a0f3..4841111 100644
--- a/enter.c
+++ b/enter.c
@@ -12,14 +12,16 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
+#include "enter.h"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "keymap.h"
 #include "history.h"
 #include "buffy.h"
 
-#include "lib/mem.h"
 
 #include <string.h>
 
@@ -132,7 +134,7 @@ size_t my_mbstowcs (wchar_t ** pwbuf, size_t * pwbuflen, size_t i, char *buf)
        k != (size_t) (-1) && k != (size_t) (-2); buf += k) {
     if (i >= wbuflen) {
       wbuflen = i + 20;
-      mem_realloc (&wbuf, wbuflen * sizeof (*wbuf));
+      p_realloc(&wbuf, wbuflen);
     }
     wbuf[i++] = wc;
   }
@@ -144,11 +146,11 @@ size_t my_mbstowcs (wchar_t ** pwbuf, size_t * pwbuflen, size_t i, char *buf)
  * Replace part of the wchar_t buffer, from FROM to CURPOS, by BUF.
  */
 
-static void replace_part (ENTER_STATE * state, size_t from, char *buf)
+static void replace_part (ENTER_STATE *state, size_t from, const char *buf)
 {
   /* Save the suffix */
   size_t savelen = state->lastchar - state->curpos;
-  wchar_t *savebuf = mem_calloc (savelen, sizeof (wchar_t));
+  wchar_t *savebuf = p_new(wchar_t, savelen);
 
   memcpy (savebuf, state->wbuf + state->curpos, savelen * sizeof (wchar_t));
 
@@ -158,14 +160,14 @@ static void replace_part (ENTER_STATE * state, size_t from, char *buf)
   /* Make space for suffix */
   if (state->curpos + savelen > state->wbuflen) {
     state->wbuflen = state->curpos + savelen;
-    mem_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t));
+    p_realloc(&state->wbuf, state->wbuflen);
   }
 
   /* Restore suffix */
   memcpy (state->wbuf + state->curpos, savebuf, savelen * sizeof (wchar_t));
   state->lastchar = state->curpos + savelen;
 
-  mem_free (&savebuf);
+  p_delete(&savebuf);
 }
 
 /*
@@ -274,13 +276,13 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
       switch (ch) {
       case OP_EDITOR_HISTORY_UP:
         state->curpos = state->lastchar;
-        replace_part (state, 0, mutt_history_prev (hclass));
+        replace_part(state, 0, mutt_history_prev(hclass));
         redraw = M_REDRAW_INIT;
         break;
 
       case OP_EDITOR_HISTORY_DOWN:
         state->curpos = state->lastchar;
-        replace_part (state, 0, mutt_history_next (hclass));
+        replace_part(state, 0, mutt_history_next(hclass));
         redraw = M_REDRAW_INIT;
         break;
 
@@ -468,7 +470,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
           }
           if (!mutt_complete (buf, buflen)) {
             templen = state->lastchar - i;
-            mem_realloc (&tempbuf, templen * sizeof (wchar_t));
+            p_realloc(&tempbuf, templen);
           }
           else
             BEEP ();
@@ -536,7 +538,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
 
           if (!mutt_complete (buf, buflen)) {
             templen = state->lastchar;
-            mem_realloc (&tempbuf, templen * sizeof (wchar_t));
+            p_realloc(&tempbuf, templen);
             memcpy (tempbuf, state->wbuf, templen * sizeof (wchar_t));
           }
           else
@@ -635,7 +637,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
           char **tfiles;
 
           *numfiles = 1;
-          tfiles = mem_calloc (*numfiles, sizeof (char *));
+          tfiles = p_new(char *, *numfiles);
           mutt_expand_path (buf, buflen);
           tfiles[0] = str_dup (buf);
           *files = tfiles;
@@ -646,7 +648,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
       else if (wc && (wc < ' ' || IsWPrint (wc))) {     /* why? */
         if (state->lastchar >= state->wbuflen) {
           state->wbuflen = state->lastchar + 20;
-          mem_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t));
+          p_realloc(&state->wbuf, state->wbuflen);
         }
         memmove (state->wbuf + state->curpos + 1, state->wbuf + state->curpos,
                  (state->lastchar - state->curpos) * sizeof (wchar_t));
@@ -662,7 +664,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
 
 bye:
 
-  mem_free (&tempbuf);
+  p_delete(&tempbuf);
   return rv;
 }
 
@@ -671,8 +673,8 @@ void mutt_free_enter_state (ENTER_STATE ** esp)
   if (!esp)
     return;
 
-  mem_free (&(*esp)->wbuf);
-  mem_free (esp);
+  p_delete(&(*esp)->wbuf);
+  p_delete(esp);
 }
 
 /*