X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=commands.c;h=52fe118aab2d64960c3904152e96fa9ff5e84289;hp=95a7d1d9905d65bd9dc71cff9cd72ed90db7a1da;hb=7f7a0be369840b290248e5b0302beb447fa1b3cd;hpb=4eaac5c4a87b84ea9ec0668b4e088ac27e2d1106

diff --git a/commands.c b/commands.c
index 95a7d1d..52fe118 100644
--- a/commands.c
+++ b/commands.c
@@ -12,6 +12,10 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
 #include "enter.h"
 #include "recvattach.h"
@@ -38,9 +42,6 @@
 #include "buffy.h"
 #endif
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <errno.h>
@@ -273,7 +274,7 @@ void ci_bounce_message (HEADER * h, int *redraw)
 
   if (mutt_addrlist_to_idna (adr, &err) < 0) {
     mutt_error (_("Bad IDN: '%s'"), err);
-    mem_free (&err);
+    p_delete(&err);
     rfc822_free_address (&adr);
     return;
   }
@@ -581,7 +582,7 @@ void mutt_enter_command (void)
   err.dsize = sizeof (errbuf);
   memset (&token, 0, sizeof (token));
   r = mutt_parse_rc_line (buffer, &token, &err);
-  mem_free (&token.data);
+  p_delete(&token.data);
   if (errbuf[0]) {
     /* since errbuf could potentially contain printf() sequences in it,
        we must call mutt_error() in this fashion so that vsprintf()
@@ -858,7 +859,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
     size_t l;
 
     for (p = b->parameter; p; p = p->next) {
-      l = str_len (buf);
+      l = m_strlen(buf);
 
       rfc822_cat (tmp, sizeof (tmp), p->value, MimeSpecials);
       snprintf (buf + l, sizeof (buf) - l, "; %s=%s", p->attribute, tmp);
@@ -871,7 +872,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
 
   /* clean up previous junk */
   mutt_free_parameter (&b->parameter);
-  mem_free (&b->subtype);
+  p_delete(&b->subtype);
 
   mutt_parse_content_type (buf, b);