X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Futil.c;h=d7837e190a6033fc7f4cd082ce4485be2fbb1de2;hp=c14c72b7f4e237d8fc3e321d0bc19db6151b6dac;hb=f288d1771c814e6104da83e6f0f1761a40de1224;hpb=3e9a92ab72e04aecb0fc4098098a1b57c5101d84

diff --git a/imap/util.c b/imap/util.c
index c14c72b..d7837e1 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -11,31 +11,15 @@
 
 /* general IMAP utility functions */
 
-#include "config.h"
-
-#include <lib-lib/mem.h>
-#include <lib-lib/ascii.h>
-#include <lib-lib/url.h>
+#include <lib-lib/lib-lib.h>
+#include <signal.h>
+#include <netdb.h>
 
 #include "mutt.h"
 #include "mx.h"                 /* for M_IMAP */
 #include "imap_private.h"
 #include <lib-sys/mutt_ssl.h>
 
-#include <lib-lib/macros.h>
-#include <lib-lib/debug.h>
-
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <signal.h>
-#include <netdb.h>
-#include <netinet/in.h>
-
-#include <errno.h>
-
 /* -- public functions -- */
 
 /* imap_expand_path: IMAP implementation of mutt_expand_path. Rewrite
@@ -80,7 +64,6 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
       ImapPort = ntohs (service->s_port);
     else
       ImapPort = IMAP_PORT;
-    debug_print (3, ("Using default IMAP port %d\n", ImapPort));
   }
   if (!ImapsPort) {
     service = getservbyname ("imaps", "tcp");
@@ -88,7 +71,6 @@ int imap_parse_path (const char *path, IMAP_MBOX * mx)
       ImapsPort = ntohs (service->s_port);
     else
       ImapsPort = IMAP_SSL_PORT;
-    debug_print (3, ("Using default IMAPS port %d\n", ImapsPort));
   }
 
   /* Defaults */
@@ -200,7 +182,7 @@ void imap_free_idata (IMAP_DATA ** idata)
     return;
 
   p_delete(&(*idata)->capstr);
-  mutt_free_list (&(*idata)->flags);
+  string_list_wipe(&(*idata)->flags);
   p_delete(&((*idata)->cmd.buf));
   p_delete(idata);
 }
@@ -214,7 +196,7 @@ void imap_free_idata (IMAP_DATA ** idata)
  * Moreover, IMAP servers may dislike the path ending with the delimiter.
  */
 char *imap_fix_path (IMAP_DATA * idata, char *mailbox, char *path,
-                     size_t plen)
+                     ssize_t plen)
 {
   int x = 0;
 
@@ -474,7 +456,7 @@ int imap_wordcasecmp (const char *a, const char *b)
  * 
  */
 
-static RETSIGTYPE alrm_handler (int sig)
+static RETSIGTYPE alrm_handler (int sig __attribute__((unused)))
 {
   /* empty */
 }