use more ad-hoc list handling function, and avoid to muck with ->next

[apps/madmutt.git] / commands.c

diff --git a/commands.c b/commands.c
index b53fb3d..bc05999 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -25,7 +25,6 @@
 #include <lib-lib/file.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/ascii.h>
-#include <lib-lib/debug.h>
 
 #include <lib-mime/mime.h>
 
@@ -45,7 +44,6 @@
 #include "pager.h"
 #include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
-#include "rfc1524.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -144,7 +142,6 @@ int mutt_display_message (HEADER * cur)
                              (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) |
                              CH_DECODE | CH_FROM);
     if (res == 0 && (ferror(fpout) || feof(fpout))) {
-      debug_print (1, ("_mutt_copy_message failed to detect EOF!\n"));
       res = -1;
     }
 
@@ -829,7 +826,6 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
   char buf[LONG_STRING];
   char obuf[LONG_STRING];
   char tmp[STRING];
-  PARAMETER *p;
 
   char charset[STRING];
   char *cp;
@@ -843,6 +839,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
   snprintf (buf, sizeof (buf), "%s/%s", TYPE (b), b->subtype);
   m_strcpy(obuf, sizeof(obuf), buf);
   if (b->parameter) {
+    PARAMETER *p;
     ssize_t l;
 
     for (p = b->parameter; p; p = p->next) {