X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fmx_imap.c;h=1c4358f00813dbad88151fd235bc2a20fcd0a952;hp=6ad4b324590ba594615532c5e8133859c23d7897;hb=0dbe922d4298aed78dcba64b7c770f315a64505e;hpb=ba5e3af4ea19e1d20c80941c077039871ec84258

diff --git a/imap/mx_imap.c b/imap/mx_imap.c
index 6ad4b32..1c4358f 100644
--- a/imap/mx_imap.c
+++ b/imap/mx_imap.c
@@ -9,18 +9,20 @@
 
 #include <sys/stat.h>
 
+#include <lib-lib/mem.h>
+#include <lib-lib/file.h>
+#include <lib-lib/str.h>
+#include <lib-lib/url.h>
+
 #include "mutt.h"
 #include "imap_private.h"
 
 #include "mx.h"
 #include "mx_imap.h"
 
-#include "lib/mem.h"
-#include "lib/str.h"
 
-#include "url.h"
 
-int imap_is_magic (const char* path, struct stat* st) {
+int imap_is_magic (const char* path, struct stat* st __attribute__ ((unused))) {
   url_scheme_t s;
   if (!path || !*path)
     return (-1);
@@ -33,7 +35,9 @@ static int acl_check_imap (CONTEXT* ctx, int bit) {
           mutt_bit_isset (((IMAP_DATA*) ctx->data)->rights, bit));
 }
 
-static int imap_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr)
+static int imap_open_new_message (MESSAGE * msg,
+                                  CONTEXT * dest __attribute__ ((unused)),
+                                  HEADER * hdr __attribute__ ((unused)))
 {
   char tmp[_POSIX_PATH_MAX];
 
@@ -42,13 +46,15 @@ static int imap_open_new_message (MESSAGE * msg, CONTEXT * dest, HEADER * hdr)
     mutt_perror (tmp);
     return (-1);
   }
-  msg->path = str_dup (tmp);
+  msg->path = m_strdup(tmp);
   return 0;
 }
 
 /* this ugly kludge is required since the last int to
  * imap_check_mailbox() doesn't mean 'lock' but 'force'... */
-static int _imap_check_mailbox (CONTEXT* ctx, int* index_hint, int lock) {
+static int _imap_check_mailbox (CONTEXT* ctx,
+                                int* index_hint,
+                                int lock __attribute__ ((unused))) {
   return (imap_check_mailbox (ctx, index_hint, 0));
 }
 
@@ -61,7 +67,7 @@ static int imap_commit_message (MESSAGE* msg, CONTEXT* ctx) {
 }
 
 mx_t* imap_reg_mx (void) {
-  mx_t* fmt = mem_calloc (1, sizeof (mx_t));
+  mx_t* fmt = p_new(mx_t, 1);
 
   /* make up mx_t record... */
   fmt->type = M_IMAP;