X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=attach.c;h=0daba2764268f51fca6c17ffc21e6dee6951a822;hp=913dbb7522fbf280c5f19936d3249acfa206c675;hb=ecaab35b973fbceb58b5ed174971c82762cc0199;hpb=c8ceef3ed6424dcb5a6ec835e7d8d9cc00595372

diff --git a/attach.c b/attach.c
index 913dbb7..0daba27 100644
--- a/attach.c
+++ b/attach.c
@@ -12,8 +12,12 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
-#include "ascii.h"
 #include "handler.h"
 #include "recvattach.h"
 #include "mutt_menu.h"
@@ -26,9 +30,6 @@
 #include "mx.h"
 #include "mutt_crypt.h"
 
-#include "lib/mem.h"
-#include "lib/intl.h"
-#include "lib/str.h"
 #include "lib/debug.h"
 
 #include <ctype.h>
@@ -144,12 +145,12 @@ int mutt_compose_attachment (BODY * a)
               b->parameter = NULL;
             }
             if (b->description) {
-              mem_free (&a->description);
+              p_delete(&a->description);
               a->description = b->description;
               b->description = NULL;
             }
             if (b->form_name) {
-              mem_free (&a->form_name);
+              p_delete(&a->form_name);
               a->form_name = b->form_name;
               b->form_name = NULL;
             }
@@ -296,7 +297,7 @@ static int is_mmnoask (const char *buf)
         }
       }
       else {
-        lng = str_len (p);
+        lng = m_strlen(p);
         if (buf[lng] == '/' && str_ncasecmp (buf, p, lng) == 0)
           return (1);
       }
@@ -314,7 +315,7 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
   int i;
 
   for (; t; t = t->next) {
-    i = str_len (t->data) - 1;
+    i = m_strlen(t->data) - 1;
     if ((i > 0 && t->data[i - 1] == '/' && t->data[i] == '*' &&
          ascii_strncasecmp (type, t->data, i) == 0) ||
         ascii_strcasecmp (type, t->data) == 0) {
@@ -335,9 +336,9 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
         debug_print (1, ("\"%s\" -> %s\n", b->filename, type));
       }
       if (tmp.subtype)
-        mem_free (&tmp.subtype);
+        p_delete(&tmp.subtype);
       if (tmp.xtype)
-        mem_free (&tmp.xtype);
+        p_delete(&tmp.xtype);
     }
   }
 }
@@ -365,7 +366,7 @@ int mutt_is_autoview (BODY * b, const char *type)
   }
 
   for (; t; t = t->next) {
-    i = str_len (t->data) - 1;
+    i = m_strlen(t->data) - 1;
     if ((i > 0 && t->data[i - 1] == '/' && t->data[i] == '*' &&
          ascii_strncasecmp (type, t->data, i) == 0) ||
         ascii_strcasecmp (type, t->data) == 0)
@@ -426,7 +427,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
     strfcpy (command, entry->command, sizeof (command));
 
     if (fp) {
-      fname = str_dup (a->filename);
+      fname = m_strdup(a->filename);
       mutt_sanitize_filename (fname, 1);
     }
     else
@@ -452,7 +453,7 @@ int mutt_view_attachment (FILE * fp, BODY * a, int flag, HEADER * hdr,
 
     if (fp) {
       /* recv case: we need to save the attachment to a file */
-      mem_free (&fname);
+      p_delete(&fname);
       if (mutt_save_attachment (fp, a, tempfile, 0, NULL) == -1)
         goto return_error;
     }