X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=copy.c;h=d658ffc96cd02618509779ca773ff6e24c55c543;hp=46dfd647c60d42b6d50268acb07a9ad66ac1d8b5;hb=ebc89176d4b5d2b1363114bd716c7f7fcb2464aa;hpb=108f3c7ab59844591f7540347914ea57be5245e2

diff --git a/copy.c b/copy.c
index 46dfd64..d658ffc 100644
--- a/copy.c
+++ b/copy.c
@@ -21,7 +21,6 @@
 #include <lib-lib/str.h>
 #include <lib-lib/file.h>
 #include <lib-lib/ascii.h>
-#include <lib-lib/debug.h>
 
 #include <lib-mime/mime.h>
 
@@ -121,13 +120,10 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
    */
   if (flags & CH_REORDER) {
     for (t = HeaderOrderList; t; t = t->next) {
-      debug_print (1, ("Reorder list: %s\n", t->data));
       hdr_count++;
     }
   }
 
-  debug_print (1, ("WEED is %s\n", (flags & CH_WEED) ? "Set" : "Not"));
-
   headers = p_new(char *, hdr_count);
 
   /* Read all the headers into the array */
@@ -208,7 +204,6 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
       if (flags & CH_REORDER) {
         for (t = HeaderOrderList, x = 0; (t); t = t->next, x++) {
           if (!ascii_strncasecmp (buf, t->data, m_strlen(t->data))) {
-            debug_print (2, ("Reorder: %s matches %s\n", t->data, buf));
             break;
           }
         }
@@ -218,7 +213,6 @@ mutt_copy_hdr (FILE* in, FILE* out, off_t off_start, off_t off_end,
     }                           /* If beginning of header */
 
     if (!ignore) {
-      debug_print (2, ("Reorder: x = %d; hdr_count = %d\n", x, hdr_count));
       if (!this_one)
         this_one = m_strdup(buf);
       /* we do want to see all lines if this header doesn't feature
@@ -561,18 +555,6 @@ _mutt_copy_message (FILE * fpout, FILE * fpin, HEADER * hdr, BODY * body,
       if (copy_delete_attach (body, fpin, fpout, date))
         return -1;
 
-#ifdef DEBUG
-      {
-        off_t fail = ((ftello (fpout) - new_offset) - new_length);
-
-        if (fail) {
-          mutt_error ("The length calculation was wrong by %ld bytes", fail);
-          new_length += fail;
-          mutt_sleep (1);
-        }
-      }
-#endif
-
       /* Update original message if we are sync'ing a mailfolder */
       if (flags & M_CM_UPDATE) {
         hdr->attach_del = 0;
@@ -695,7 +677,6 @@ mutt_copy_message (FILE * fpout, CONTEXT * src, HEADER * hdr, int flags,
        _mutt_copy_message (fpout, msg->fp, hdr, hdr->content, flags,
                            chflags)) == 0 && (ferror (fpout)
                                               || feof (fpout))) {
-    debug_print (1, ("_mutt_copy_message failed to detect EOF!\n"));
     r = -1;
   }
   mx_close_message (&msg);