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 dc0a6f4..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>
 
@@ -37,6 +36,7 @@
 #include <lib-ui/menu.h>
 
 #include "mutt.h"
+#include "alias.h"
 #include "recvattach.h"
 #include "sort.h"
 #include "copy.h"
@@ -44,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>
@@ -143,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;
     }
 
@@ -242,7 +240,7 @@ void ci_bounce_message (HEADER * h, int *redraw)
   char prompt[SHORT_STRING];
   char buf[HUGE_STRING] = { 0 };
   address_t *adr = NULL;
-  char *err = NULL;
+  const char *err = NULL;
   int rc;
 
   if (h)
@@ -828,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;
@@ -842,7 +839,8 @@ 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) {
-    size_t l;
+    PARAMETER *p;
+    ssize_t l;
 
     for (p = b->parameter; p; p = p->next) {
       l = m_strlen(buf);