X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=imap%2Fmx_imap.c;h=2d9e3338d47ac99aa3bfa57b088a074aa695af90;hp=26ee4769951cd20e02a0ef2a12c2c4dcc60fe631;hb=f288d1771c814e6104da83e6f0f1761a40de1224;hpb=42cc85de46ed8971a6c793835023cf26766fb096

diff --git a/imap/mx_imap.c b/imap/mx_imap.c
index 26ee476..2d9e333 100644
--- a/imap/mx_imap.c
+++ b/imap/mx_imap.c
@@ -3,11 +3,8 @@
  * It's licensed under the GNU General Public License,
  * please see the file GPL in the top level source directory.
  */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
-#include <sys/stat.h>
+#include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
 #include "imap_private.h"
@@ -15,12 +12,7 @@
 #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,20 +25,26 @@ 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];
 
   mutt_mktemp (tmp);
-  if ((msg->fp = safe_fopen (tmp, "w")) == NULL)
+  if ((msg->fp = safe_fopen (tmp, "w")) == NULL) {
+    mutt_perror (tmp);
     return (-1);
-  msg->path = safe_strdup (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));
 }
 
@@ -59,7 +57,7 @@ static int imap_commit_message (MESSAGE* msg, CONTEXT* ctx) {
 }
 
 mx_t* imap_reg_mx (void) {
-  mx_t* fmt = safe_calloc (1, sizeof (mx_t));
+  mx_t* fmt = p_new(mx_t, 1);
 
   /* make up mx_t record... */
   fmt->type = M_IMAP;