X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=pop%2Fpop.c;h=ab5b7399336b316235594f9d0f6b3bd9e20426b0;hb=debd2491451020d9fd5f0440bb2dada0b9eac6e7;hp=358bed665b790367af66fdb744719ede6ed9a2f6;hpb=a384af7cde6a66b02dc98ddd3f38d7e4c3921af9;p=apps%2Fmadmutt.git

diff --git a/pop/pop.c b/pop/pop.c
index 358bed6..ab5b739 100644
--- a/pop/pop.c
+++ b/pop/pop.c
@@ -16,6 +16,11 @@
 #include "pop.h"
 #include "mutt_crypt.h"
 
+#include "lib/mem.h"
+#include "lib/str.h"
+#include "lib/intl.h"
+#include "lib/debug.h"
+
 #include <string.h>
 #include <unistd.h>
 
@@ -44,7 +49,6 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
   FILE *f;
   int index;
   pop_query_status ret;
-  cmd_status status;
   long length;
   char buf[LONG_STRING];
   char tempfile[_POSIX_PATH_MAX];
@@ -67,13 +71,13 @@ static pop_query_status pop_read_header (POP_DATA * pop_data, HEADER * h)
       if (ret == PQ_OK) {
         pop_data->cmd_top = CMD_AVAILABLE;
 
-        dprint (1, (debugfile, "pop_read_header: set TOP capability\n"));
+        debug_print (1, ("set TOP capability\n"));
       }
 
       if (ret == PQ_ERR) {
         pop_data->cmd_top = CMD_NOT_AVAILABLE;
 
-        dprint (1, (debugfile, "pop_read_header: unset TOP capability\n"));
+        debug_print (1, ("unset TOP capability\n"));
         snprintf (pop_data->err_msg, sizeof (pop_data->err_msg),
                   _("Command TOP is not supported by server."));
       }
@@ -124,9 +128,7 @@ static int fetch_uidl (char *line, void *data)
       break;
 
   if (i == ctx->msgcount) {
-    dprint (1,
-            (debugfile, "pop_fetch_headers: new header %d %s\n", index,
-             line));
+    debug_print (1, ("new header %d %s\n", index, line));
 
     if (i >= ctx->hdrmax)
       mx_alloc_memory (ctx);
@@ -173,13 +175,13 @@ static int pop_fetch_headers (CONTEXT * ctx)
     if (ret == PQ_OK) {
       pop_data->cmd_uidl = CMD_AVAILABLE;
 
-      dprint (1, (debugfile, "pop_fetch_headers: set UIDL capability\n"));
+      debug_print (1, ("set UIDL capability\n"));
     }
 
     if (ret == PQ_ERR && pop_data->cmd_uidl == CMD_UNKNOWN) {
       pop_data->cmd_uidl = CMD_NOT_AVAILABLE;
 
-      dprint (1, (debugfile, "pop_fetch_headers: unset UIDL capability\n"));
+      debug_print (1, ("unset UIDL capability\n"));
       snprintf (pop_data->err_msg, sizeof (pop_data->err_msg),
                 _("Command UIDL is not supported by server."));
     }
@@ -278,7 +280,7 @@ static void pop_clear_cache (POP_DATA * pop_data)
   if (!pop_data->clear_cache)
     return;
 
-  dprint (1, (debugfile, "pop_clear_cache: delete cached messages\n"));
+  debug_print (1, ("delete cached messages\n"));
 
   for (i = 0; i < POP_CACHE_LEN; i++) {
     if (pop_data->cache[i].path) {
@@ -420,7 +422,7 @@ int pop_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
 }
 
 /* update POP mailbox - delete messages from server */
-pop_query_status pop_sync_mailbox (CONTEXT * ctx, int *index_hint)
+pop_query_status pop_sync_mailbox (CONTEXT * ctx, int unused, int *index_hint)
 {
   int i;
   pop_query_status ret;
@@ -463,7 +465,7 @@ pop_query_status pop_sync_mailbox (CONTEXT * ctx, int *index_hint)
 }
 
 /* Check for new messages and fetch headers */
-int pop_check_mailbox (CONTEXT * ctx, int *index_hint)
+int pop_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
 {
   int ret;
   POP_DATA *pop_data = (POP_DATA *) ctx->data;