X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=compose.c;h=78f1ab96c7001cde57084be3ce8bba8840919906;hb=8e037c67a88cb4680c4391134c578e3b55a80f8a;hp=8af50841efb94a73a88126c4a1a88c3f5efe2bf8;hpb=c25bc063f35aaad6938c2022dae7a283346c2769;p=apps%2Fmadmutt.git

diff --git a/compose.c b/compose.c
index 8af5084..78f1ab9 100644
--- a/compose.c
+++ b/compose.c
@@ -15,6 +15,8 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "mutt_curses.h"
@@ -338,7 +340,7 @@ static int edit_address_list (int line, ADDRESS ** addr)
   if (mutt_addrlist_to_idna (*addr, &err) != 0) {
     mutt_error (_("Warning: '%s' is a bad IDN."), err);
     mutt_refresh ();
-    mem_free (&err);
+    p_delete(&err);
   }
 
   /* redraw the expanded list so the user can see the result */
@@ -374,8 +376,8 @@ static int delete_attachment (MUTTMENU * menu, short *idxlen, int x)
   idx[x]->content->next = NULL;
   idx[x]->content->parts = NULL;
   mutt_free_body (&(idx[x]->content));
-  mem_free (&idx[x]->tree);
-  mem_free (&idx[x]);
+  p_delete(&idx[x]->tree);
+  p_delete(&idx[x]);
   for (; x < *idxlen - 1; x++)
     idx[x] = idx[x + 1];
   menu->max = --(*idxlen);
@@ -618,7 +620,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           buf[0] = 0;
         if (mutt_get_field ("Newsgroups: ", buf, sizeof (buf), 0) == 0
             && buf[0]) {
-          mem_free (&msg->env->newsgroups);
+          p_delete(&msg->env->newsgroups);
           str_skip_trailws (buf);
           msg->env->newsgroups = str_dup (str_skip_initws (buf));
           move (HDR_TO, HDR_XOFFSET);
@@ -636,7 +638,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           strfcpy (buf, msg->env->followup_to, sizeof (buf));
         if (mutt_get_field ("Followup-To: ", buf, sizeof (buf), 0) == 0
             && buf[0]) {
-          mem_free (&msg->env->followup_to);
+          p_delete(&msg->env->followup_to);
           str_skip_trailws (buf);
           msg->env->followup_to = str_dup (str_skip_initws (buf));
           move (HDR_CC, HDR_XOFFSET);
@@ -654,7 +656,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           strfcpy (buf, msg->env->x_comment_to, sizeof (buf));
         if (mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) == 0
             && buf[0]) {
-          mem_free (&msg->env->x_comment_to);
+          p_delete(&msg->env->x_comment_to);
           msg->env->x_comment_to = str_dup (buf);
           move (HDR_BCC, HDR_XOFFSET);
           clrtoeol ();
@@ -715,7 +717,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
                            fcc, fcclen);
         if (mutt_env_to_idna (msg->env, &tag, &err)) {
           mutt_error (_("Bad IDN in \"%s\": '%s'"), tag, err);
-          mem_free (&err);
+          p_delete(&err);
         }
       }
       else {
@@ -730,7 +732,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
       /* attachments may have been added */
       if (idxlen && idx[idxlen - 1]->content->next) {
         for (i = 0; i < idxlen; i++)
-          mem_free (&idx[i]);
+          p_delete(&idx[i]);
         idxlen = 0;
         idx =
           mutt_gen_attach_list (msg->content, -1, idx, &idxlen, &idxmax, 0,
@@ -760,7 +762,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         menu->redraw |= REDRAW_INDEX;
       }
       else
-        mem_free (&idx[idxlen]);
+        p_delete(&idx[idxlen]);
 
       menu->redraw |= REDRAW_STATUS;
 
@@ -809,11 +811,11 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           else {
             error = 1;
             mutt_error (_("Unable to attach %s!"), att);
-            mem_free (&idx[idxlen]);
+            p_delete(&idx[idxlen]);
           }
         }
 
-        mem_free (&files);
+        p_delete(&files);
         if (!error)
           mutt_clear_error ();
 
@@ -889,7 +891,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
 
         if (!ctx->msgcount) {
           mx_close_mailbox (ctx, NULL);
-          mem_free (&ctx);
+          p_delete(&ctx);
           mutt_error _("No messages in that folder.");
 
           break;
@@ -933,7 +935,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
             else {
               mutt_error _("Unable to attach!");
 
-              mem_free (&idx[idxlen]);
+              p_delete(&idx[idxlen]);
             }
           }
         }
@@ -943,7 +945,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           mx_close_mailbox (Context, NULL);
         else
           mx_fastclose_mailbox (Context);
-        mem_free (&Context);
+        p_delete(&Context);
 
         /* go back to the folder we started from */
         Context = this;
@@ -1199,7 +1201,7 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
         /* Touch the file */
         if (!(fp = safe_fopen (fname, "w"))) {
           mutt_error (_("Can't create file %s"), fname);
-          mem_free (&idx[idxlen]);
+          p_delete(&idx[idxlen]);
           continue;
         }
         fclose (fp);
@@ -1285,10 +1287,10 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
           if (idx[idxlen]->unowned)
             idx[idxlen]->content->unlink = 0;
           mutt_free_body (&idx[idxlen]->content);
-          mem_free (&idx[idxlen]->tree);
-          mem_free (&idx[idxlen]);
+          p_delete(&idx[idxlen]->tree);
+          p_delete(&idx[idxlen]);
         }
-        mem_free (&idx);
+        p_delete(&idx);
         idxlen = 0;
         idxmax = 0;
         r = -1;
@@ -1420,13 +1422,13 @@ int mutt_compose_menu (HEADER * msg,    /* structure for new message */
     msg->content = idx[0]->content;
     for (i = 0; i < idxlen; i++) {
       idx[i]->content->aptr = NULL;
-      mem_free (&idx[i]);
+      p_delete(&idx[i]);
     }
   }
   else
     msg->content = NULL;
 
-  mem_free (&idx);
+  p_delete(&idx);
 
   return (r);
 }