X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=enter.c;h=b979a2ed5db33e966f803fb0e9a2acc19ae9f3cb;hb=c25bc063f35aaad6938c2022dae7a283346c2769;hp=cd98df94558ac5c1c1990ca180bad0fe12cd83b7;hpb=18ea5e8b861632627335b8d94787c742dbf5f567;p=apps%2Fmadmutt.git

diff --git a/enter.c b/enter.c
index cd98df9..b979a2e 100644
--- a/enter.c
+++ b/enter.c
@@ -13,6 +13,7 @@
 #endif
 
 #include "mutt.h"
+#include "enter.h"
 #include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "keymap.h"
@@ -132,7 +133,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;
-      safe_realloc (&wbuf, wbuflen * sizeof (*wbuf));
+      mem_realloc (&wbuf, wbuflen * sizeof (*wbuf));
     }
     wbuf[i++] = wc;
   }
@@ -144,11 +145,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 = safe_calloc (savelen, sizeof (wchar_t));
+  wchar_t *savebuf = mem_calloc (savelen, sizeof (wchar_t));
 
   memcpy (savebuf, state->wbuf + state->curpos, savelen * sizeof (wchar_t));
 
@@ -158,14 +159,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;
-    safe_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t));
+    mem_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t));
   }
 
   /* Restore suffix */
   memcpy (state->wbuf + state->curpos, savebuf, savelen * sizeof (wchar_t));
   state->lastchar = state->curpos + savelen;
 
-  FREE (&savebuf);
+  mem_free (&savebuf);
 }
 
 /*
@@ -274,13 +275,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 +469,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
           }
           if (!mutt_complete (buf, buflen)) {
             templen = state->lastchar - i;
-            safe_realloc (&tempbuf, templen * sizeof (wchar_t));
+            mem_realloc (&tempbuf, templen * sizeof (wchar_t));
           }
           else
             BEEP ();
@@ -501,7 +502,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
           goto bye;
         } else if (flags & M_COMMAND) {
           my_wcstombs (buf, buflen, state->wbuf, state->curpos);
-          i = mutt_strlen (buf);
+          i = str_len (buf);
           if (i && buf[i - 1] == '=' &&
               mutt_var_value_complete (buf, buflen, i))
             state->tabs = 0;
@@ -536,7 +537,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
 
           if (!mutt_complete (buf, buflen)) {
             templen = state->lastchar;
-            safe_realloc (&tempbuf, templen * sizeof (wchar_t));
+            mem_realloc (&tempbuf, templen * sizeof (wchar_t));
             memcpy (tempbuf, state->wbuf, templen * sizeof (wchar_t));
           }
           else
@@ -635,9 +636,9 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
           char **tfiles;
 
           *numfiles = 1;
-          tfiles = safe_calloc (*numfiles, sizeof (char *));
+          tfiles = mem_calloc (*numfiles, sizeof (char *));
           mutt_expand_path (buf, buflen);
-          tfiles[0] = safe_strdup (buf);
+          tfiles[0] = str_dup (buf);
           *files = tfiles;
         }
         rv = 0;
@@ -646,7 +647,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;
-          safe_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t));
+          mem_realloc (&state->wbuf, state->wbuflen * sizeof (wchar_t));
         }
         memmove (state->wbuf + state->curpos + 1, state->wbuf + state->curpos,
                  (state->lastchar - state->curpos) * sizeof (wchar_t));
@@ -662,7 +663,7 @@ int _mutt_enter_string (char *buf, size_t buflen, int y, int x,
 
 bye:
 
-  FREE (&tempbuf);
+  mem_free (&tempbuf);
   return rv;
 }
 
@@ -671,8 +672,8 @@ void mutt_free_enter_state (ENTER_STATE ** esp)
   if (!esp)
     return;
 
-  FREE (&(*esp)->wbuf);
-  FREE (esp);
+  mem_free (&(*esp)->wbuf);
+  mem_free (esp);
 }
 
 /*