rationnalize includes a lot:

[apps/madmutt.git] / imap / message.c

diff --git a/imap/message.c b/imap/message.c
index e9b98d5..8412c61 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -10,18 +10,7 @@
 
 /* message parsing/updating functions */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/str.h>
-#include <lib-lib/buffer.h>
-#include <lib-lib/debug.h>
+#include <lib-lib/lib-lib.h>
 
 #include <lib-ui/curses.h>
 
@@ -35,15 +24,6 @@
 #include "pgp.h"
 #endif
 
-#include <lib-lib/macros.h>
-#include <lib-lib/file.h>
-
-#if HAVE_STDINT_H
-#include <stdint.h>
-#elif HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-
 static void flush_buffer (char *buf, size_t * len, CONNECTION * conn);
 static int msg_fetch_header (CONTEXT * ctx, IMAP_HEADER * h, char *buf,
                              FILE * fp);
@@ -158,8 +138,6 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
         if (uid_validity != NULL && *uid_validity == idata->uid_validity) {
           ctx->hdrs[msgno] = mutt_hcache_restore((unsigned char *) uid_validity, 0);
           ctx->hdrs[msgno]->index = h.sid - 1;
-          if (h.sid != ctx->msgcount + 1)
-            debug_print (1, ("imap_read_headers: msgcount and sequence ID are inconsistent!"));
           /* messages which have not been expunged are ACTIVE (borrowed from mh 
           * folders) */
           ctx->hdrs[msgno]->active = 1;
@@ -251,8 +229,6 @@ int imap_read_headers (IMAP_DATA * idata, int msgbegin, int msgend)
       ctx->hdrs[msgno] = header_new();
 
       ctx->hdrs[msgno]->index = h.sid - 1;
-      if (h.sid != ctx->msgcount + 1)
-        debug_print (1, ("msgcount and sequence ID are inconsistent!\n"));
       /* messages which have not been expunged are ACTIVE (borrowed from mh 
        * folders) */
       ctx->hdrs[msgno]->active = 1;
@@ -551,8 +527,6 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg)
   if (rc != IMAP_CMD_RESPOND) {
     char *pc;
 
-    debug_print (1, ("command failed: %s\n", idata->cmd.buf));
-
     pc = vskipspaces(idata->cmd.buf + SEQLEN);
     pc = imap_next_word (pc);
     mutt_error ("%s", pc);
@@ -587,7 +561,6 @@ int imap_append_message (CONTEXT * ctx, MESSAGE * msg)
   if (!imap_code (idata->cmd.buf)) {
     char *pc;
 
-    debug_print (1, ("command failed: %s\n", idata->cmd.buf));
     pc = vskipspaces(idata->cmd.buf + SEQLEN);
     pc = imap_next_word (pc);
     mutt_error ("%s", pc);
@@ -624,18 +597,15 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete)
   idata = (IMAP_DATA *) ctx->data;
 
   if (imap_parse_path (dest, &mx)) {
-    debug_print (1, ("bad destination %s\n", dest));
     return -1;
   }
 
   /* check that the save-to folder is in the same account */
   if (!mutt_account_match (&(CTX_DATA->conn->account), &(mx.account))) {
-    debug_print (3, ("%s not same server as %s\n", dest, ctx->path));
     return 1;
   }
 
   if (h && h->attach_del) {
-    debug_print (3, ("Message contains attachments to be deleted\n"));
     return 1;
   }
 
@@ -652,7 +622,6 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete)
      * remainder. */
     for (n = 0; n < ctx->msgcount; n++) {
       if (ctx->hdrs[n]->tagged && ctx->hdrs[n]->attach_del) {
-        debug_print (3, ("Message contains attachments to be deleted\n"));
         return 1;
       }
 
@@ -662,7 +631,6 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete)
        rc = imap_sync_message (idata, ctx->hdrs[n], &sync_cmd, &err_continue);
        if (rc < 0)
        {
-         debug_print (1, ("could not sync\n"));
          goto fail;
        }
       }
@@ -670,7 +638,6 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete)
 
     rc = imap_make_msg_set (idata, &cmd, M_TAG, 0);
     if (!rc) {
-      debug_print (1, ("No messages tagged\n"));
       goto fail;
     }
     mutt_message (_("Copying %d messages to %s..."), rc, mbox);
@@ -685,7 +652,6 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete)
       rc = imap_sync_message (idata, h, &sync_cmd, &err_continue);
       if (rc < 0)
       {
-       debug_print (1, ("could not sync\n"));
        goto fail;
       }
     }
@@ -704,7 +670,6 @@ int imap_copy_messages (CONTEXT * ctx, HEADER * h, char *dest, int delete)
       imap_error ("imap_copy_messages", idata->cmd.buf);
       goto fail;
     }
-    debug_print (2, ("server suggests TRYCREATE\n"));
     snprintf (mmbox, sizeof (mmbox), _("Create %s?"), mbox);
     if (option (OPTCONFIRMCREATE) && mutt_yesorno (mmbox, 1) < 1) {
       mutt_clear_error ();
@@ -797,7 +762,6 @@ char *imap_set_flags (IMAP_DATA * idata, HEADER * h, char *s)
   p_clear(&newh, 1);
   newh.data = p_new(IMAP_HEADER_DATA, 1);
 
-  debug_print (2, ("parsing FLAGS\n"));
   if ((s = msg_parse_flags (&newh, s)) == NULL) {
     p_delete(&newh.data);
     return NULL;
@@ -984,7 +948,6 @@ static int msg_parse_fetch (IMAP_HEADER * h, char *s)
     else if (ascii_strncasecmp ("INTERNALDATE", s, 12) == 0) {
       s = vskipspaces(s + 12);
       if (*s != '\"') {
-        debug_print (1, ("bogus INTERNALDATE entry: %s\n", s));
         return -1;
       }
       s++;
@@ -1029,12 +992,10 @@ static char *msg_parse_flags (IMAP_HEADER * h, char *s)
 
   /* sanity-check string */
   if (ascii_strncasecmp ("FLAGS", s, 5) != 0) {
-    debug_print (1, ("not a FLAGS response: %s\n", s));
     return NULL;
   }
   s = vskipspaces(s + 5);
   if (*s != '(') {
-    debug_print (1, ("bogus FLAGS response: %s\n", s));
     return NULL;
   }
   s++;
@@ -1087,7 +1048,6 @@ static char *msg_parse_flags (IMAP_HEADER * h, char *s)
     s++;
   }
   else {
-    debug_print (1, ("Unterminated FLAGS response: %s\n", s));
     return NULL;
   }