sort out some prototypes, put them where they belong.

[apps/madmutt.git] / commands.c

diff --git a/commands.c b/commands.c
index 648966c..280a3fd 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -21,10 +21,7 @@
 #include <sys/types.h>
 #include <utime.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/file.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/ascii.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-mime/mime.h>
 
@@ -240,7 +237,7 @@ void ci_bounce_message (HEADER * h, int *redraw)
   char prompt[SHORT_STRING];
   char buf[HUGE_STRING] = { 0 };
   address_t *adr = NULL;
-  const char *err = NULL;
+  char *err = NULL;
   int rc;
 
   if (h)
@@ -839,7 +836,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;
+    parameter_t *p;
     ssize_t l;
 
     for (p = b->parameter; p; p = p->next) {
@@ -893,7 +890,7 @@ void mutt_edit_content_type (HEADER * h, BODY * b, FILE * fp)
   b->force_charset |= charset_changed ? 1 : 0;
 
   if (!is_multipart(b) && b->parts)
-    mutt_free_body (&b->parts);
+    body_list_wipe(&b->parts);
   if (!mutt_is_message_type (b->type, b->subtype) && b->hdr) {
     b->hdr->content = NULL;
     header_delete(&b->hdr);