make imap_private.h include message.h for IMAP_HEADER_DATA definition

cast &ctx->data to IMAP_HEADER_DATA** to fix compiler warning

imap_free_header_data should check for *data being NULL, rather than "data"

diff --git a/imap/command.c b/imap/command.c
index 70e7d4814bfdf2ae686c648f2bbef99d7affd8ee..4b47de2c8d3d83aec6adbe1eb6c14faec3252fd1 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -27,7 +27,6 @@
 
 #include "mutt.h"
 #include "imap_private.h"
-#include "message.h"
 #include "mx.h"
 #include "buffy.h"
 

diff --git a/imap/imap.c b/imap/imap.c
index 35dac43d4b8bd5510f894b6036d5d16173c3cb7f..83b05d68c22a9c56333c0a4155598d0609d67ea1 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -30,7 +30,6 @@
 #include "globals.h"
 #include "sort.h"
 #include "browser.h"
-#include "message.h"
 #include "imap_private.h"
 #if defined(USE_SSL)
 # include "mutt_ssl.h"
@@ -281,7 +280,7 @@ void imap_expunge_mailbox (IMAP_DATA* idata)
        FREE (&idata->cache[cacheno].path);
       }
 
-      imap_free_header_data (&h->data);
+      imap_free_header_data ((IMAP_HEADER_DATA**)&h->data);
     }
   }
 
@@ -1353,7 +1352,7 @@ int imap_close_mailbox (CONTEXT* ctx)
   for (i = 0; i < ctx->msgcount; i++)
     /* mailbox may not have fully loaded */
     if (ctx->hdrs[i] && ctx->hdrs[i]->data)
-      imap_free_header_data (&(ctx->hdrs[i]->data));
+      imap_free_header_data ((IMAP_HEADER_DATA**)&(ctx->hdrs[i]->data));
 
   for (i = 0; i < IMAP_CACHE_LEN; i++)
   {

diff --git a/imap/imap_private.h b/imap/imap_private.h
index d5895885f11cc61f0786c290e9962f4a033b9620..ab7ba8a9e8800ebfd04462e6657a580eed186db8 100644 (file)
--- a/imap/imap_private.h
+++ b/imap/imap_private.h
@@ -27,6 +27,7 @@
 #ifdef USE_HCACHE
 #include "hcache.h"
 #endif
+#include "message.h"  /* for IMAP_HEADER_DATA */
 
 /* -- symbols -- */
 #define IMAP_PORT 143
@@ -256,8 +257,7 @@ int imap_cmd_idle (IMAP_DATA* idata);
 
 /* message.c */
 void imap_add_keywords (char* s, HEADER* keywords, LIST* mailbox_flags, size_t slen);
-struct imap_header_data;
-void imap_free_header_data (struct imap_header_data** data);
+void imap_free_header_data (IMAP_HEADER_DATA** data);
 int imap_read_headers (IMAP_DATA* idata, int msgbegin, int msgend);
 char* imap_set_flags (IMAP_DATA* idata, HEADER* h, char* s);
 int imap_cache_del (IMAP_DATA* idata, HEADER* h);

diff --git a/imap/message.c b/imap/message.c
index a56182a62a8a705cdab117b6fde1526dc46d62a9..b2344cd67f202620c06414d61ad9970b20c9beec 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -30,7 +30,6 @@
 
 #include "mutt.h"
 #include "imap_private.h"
-#include "message.h"
 #include "mx.h"
 
 #ifdef HAVE_PGP
@@ -1018,11 +1017,11 @@ void imap_add_keywords (char* s, HEADER* h, LIST* mailbox_flags, size_t slen)
 /* imap_free_header_data: free IMAP_HEADER structure */
 void imap_free_header_data (IMAP_HEADER_DATA** data)
 {
-  if (data) {
+  if (*data)
+  {
     /* this should be safe even if the list wasn't used */
     mutt_free_list (&((*data)->keywords));
-
-    FREE (data);               /* __FREE_CHECKED__ */
+    FREE (data);
   }
 }
 

diff --git a/imap/util.c b/imap/util.c
index c8b002ef7a0c6cf132ce14cfd780937a881795e2..7ac0afdf1fdcbe0b23b011b0afb8e64962f44d5f 100644 (file)
--- a/imap/util.c
+++ b/imap/util.c
@@ -27,7 +27,6 @@
 #include "url.h"
 #include "imap_private.h"
 #ifdef USE_HCACHE
-#include "message.h"
 #include "hcache.h"
 #endif