mem_calloc -> p_new

[apps/madmutt.git] / edit.c

diff --git a/edit.c b/edit.c
index cb9ff23..2f1a377 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -13,6 +13,8 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
 #include "ascii.h"
 #include "enter.h"
@@ -35,7 +37,7 @@
  * SLcurses_waddnstr() can't take a "const char *", so this is only
  * declared "static" (sigh)
  */
-static char *EditorHelp = N_("\
+static const char *EditorHelp = N_("\
 ~~             insert a line begining with a single ~\n\
 ~b users       add users to the Bcc: field\n\
 ~c users       add users to the Cc: field\n\
@@ -56,7 +58,7 @@ static char *EditorHelp = N_("\
 .              on a line by itself ends input\n");
 
 static char **be_snarf_data (FILE * f, char **buf, int *bufmax, int *buflen,
-                             LOFF_T offset, int bytes, int prefix)
+                             off_t offset, int bytes, int prefix)
 {
   char tmp[HUGE_STRING];
   char *p = tmp;
@@ -132,9 +134,9 @@ static int be_barf_file (const char *path, char **buf, int buflen)
 static void be_free_memory (char **buf, int buflen)
 {
   while (buflen-- > 0)
-    mem_free (&buf[buflen]);
+    p_delete(&buf[buflen]);
   if (buf)
-    mem_free (&buf);
+    p_delete(&buf);
 }
 
 static char **be_include_messages (char *msg, char **buf, int *bufmax,
@@ -392,7 +394,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
           buflen--;
           strfcpy (tmp, buf[buflen], sizeof (tmp));
           tmp[str_len (tmp) - 1] = 0;
-          mem_free (&buf[buflen]);
+          p_delete(&buf[buflen]);
           buf[buflen] = NULL;
           continue;
         }
@@ -403,7 +405,7 @@ int mutt_builtin_editor (const char *path, HEADER * msg, HEADER * cur)
       case 'e':
       case 'v':
         if (be_barf_file (path, buf, buflen) == 0) {
-          char *tag, *err;
+          const char *tag, *err;
 
           be_free_memory (buf, buflen);
           buf = NULL;