more rationalization.

[apps/madmutt.git] / attach.c

diff --git a/attach.c b/attach.c
index 3f6a9ac..e352c4a 100644 (file)
--- a/attach.c
+++ b/attach.c
@@ -12,19 +12,32 @@
 # include "config.h"
 #endif
 
+#include <ctype.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/wait.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <errno.h>
+
 #include <lib-lib/mem.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/file.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
+
+#include <lib-sys/unix.h>
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
+
 #include "mutt.h"
 #include "handler.h"
 #include "recvattach.h"
-#include "mutt_menu.h"
-#include "mutt_curses.h"
 #include "keymap.h"
 #include "rfc1524.h"
 #include "pager.h"
@@ -32,17 +45,6 @@
 #include "mx.h"
 #include <lib-crypt/crypt.h>
 
-#include "lib/debug.h"
-
-#include <ctype.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <string.h>
-#include <errno.h>
-
 int mutt_get_tmp_attachment (BODY * a)
 {
   char type[STRING];
@@ -142,7 +144,7 @@ int mutt_compose_attachment (BODY * a)
           b = mutt_read_mime_header (fp, 0);
           if (b) {
             if (b->parameter) {
-              mutt_free_parameter (&a->parameter);
+              parameter_list_wipe(&a->parameter);
               a->parameter = b->parameter;
               b->parameter = NULL;
             }
@@ -313,7 +315,7 @@ static int is_mmnoask (const char *buf)
 
 void mutt_check_lookup_list (BODY * b, char *type, int len)
 {
-  LIST *t = MimeLookupList;
+  string_list_t *t = MimeLookupList;
   int i;
 
   for (; t; t = t->next) {
@@ -349,7 +351,7 @@ void mutt_check_lookup_list (BODY * b, char *type, int len)
 
 int mutt_is_autoview (BODY * b, const char *type)
 {
-  LIST *t = AutoViewList;
+  string_list_t *t = AutoViewList;
   char _type[SHORT_STRING];
   int i;
 
@@ -865,7 +867,7 @@ int mutt_decode_save_attachment (FILE * fp, BODY * m, char *path,
     m->length = 0;
     m->encoding = saved_encoding;
     if (saved_parts) {
-      mutt_free_header (&m->hdr);
+      header_delete(&m->hdr);
       m->parts = saved_parts;
       m->hdr = saved_hdr;
     }