X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=504a1e2f555fde0c5b2aa466456cf470a9acb19f;hp=05a73713417f564b758d4f6418c1979207b6597f;hb=f3092f53ef58ddc983e72796b578ee6456c2f750;hpb=7a368b3670a90656b2e0e724ed3efd79221f3d31

diff --git a/copy.c b/copy.c
index 05a7371..504a1e2 100644
--- a/copy.c
+++ b/copy.c
@@ -23,7 +23,6 @@
 #include "handler.h"
 #include "mx.h"
 #include "copy.h"
-#include "rfc2047.h"
 #include "mutt_crypt.h"
 #include "mutt_idna.h"
 
@@ -445,7 +444,7 @@ mutt_copy_header (FILE * in, HEADER * h, FILE * out, int flags,
   }
 
   if (flags & CH_UPDATE_LEN && (flags & CH_NOLEN) == 0) {
-    fprintf (out, "Content-Length: %zd\n", h->content->length);
+    fprintf (out, "Content-Length: %lld\n", h->content->length);
     if (h->lines != 0 || h->content->length == 0)
       fprintf (out, "Lines: %d\n", h->lines);
   }
@@ -549,7 +548,7 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
       if (mutt_copy_header (fpin, hdr, fpout,
                             chflags | CH_NOLEN | CH_NONEWLINE, NULL))
         return -1;
-      fprintf (fpout, "Content-Length: %zd\n", new_length);
+      fprintf (fpout, "Content-Length: %lld\n", new_length);
       if (new_lines <= 0)
         new_lines = 0;
       else
@@ -719,7 +718,7 @@ mutt_copy_message (FILE * fpout, CONTEXT * src, HEADER * hdr, int flags,
  */
 
 int
-_mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src,
+_mutt_append_message (CONTEXT * dest, FILE * fpin, CONTEXT * src __attribute__ ((unused)),
                       HEADER * hdr, BODY * body, int flags, int chflags) {
   char buf[STRING];
   MESSAGE *msg;
@@ -778,7 +777,7 @@ static int copy_delete_attach (BODY * b, FILE * fpin, FILE * fpout,
       if (part->deleted) {
         fprintf (fpout,
                  "Content-Type: message/external-body; access-type=x-mutt-deleted;\n"
-                 "\texpiration=%s; length=%zd\n"
+                 "\texpiration=%s; length=%lld\n"
                  "\n", date + 5, part->length);
         if (ferror (fpout))
           return -1;