X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=imap%2Futil.c;h=8ddca9e07a3fbbb2000df85895967bd7d4aa9a2c;hb=4282401a0bcdc285a228da4ad635cbf7baf71488;hp=4bef04b056693f26542d4cdf561b5199d36af543;hpb=238b70e39b78f585c586bd51aef41988b3cc73d1;p=apps%2Fmadmutt.git

diff --git a/imap/util.c b/imap/util.c
index 4bef04b..8ddca9e 100644
--- a/imap/util.c
+++ b/imap/util.c
@@ -15,15 +15,15 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/ascii.h>
+#include <lib-lib/url.h>
 
 #include "mutt.h"
 #include "mx.h"                 /* for M_IMAP */
-#include "url.h"
 #include "imap_private.h"
-#include "mutt_ssl.h"
+#include <lib-sys/mutt_ssl.h>
 
 #include <lib-lib/macros.h>
-#include "lib/debug.h"
+#include <lib-lib/debug.h>
 
 #include <stdlib.h>
 #include <ctype.h>
@@ -200,7 +200,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 +214,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;
 
@@ -292,8 +292,7 @@ char *imap_next_word (char *s)
     s++;
   }
 
-  SKIPWS (s);
-  return s;
+  return vskipspaces(s);
 }
 
 /* imap_parse_date: date is of the form: DD-MMM-YYYY HH:MM:SS +ZZzz */
@@ -475,7 +474,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 */
 }