X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pop%2Fpop_lib.c;h=424ca73f73d5024c6647f604427d2d10869286e7;hp=38454ef1476807b108a7038fb3eca2709b433afc;hb=23e6291cb5d5b4cd2008403d8b628007fd75ff23;hpb=ccf2b75a9ed50a79c4d8e5d6235c7313fcd3719a

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 38454ef..424ca73 100644
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -19,38 +19,37 @@
 #include <lib-lib/str.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
-#include <lib-lib/debug.h>
+#include <lib-lib/url.h>
 
 #include "mutt.h"
 #include "mx.h"
-#include "url.h"
 #include "pop.h"
 #if defined (USE_SSL) || defined (USE_GNUTLS)
 # include <lib-sys/mutt_ssl.h>
 #endif
 
 /* given an POP mailbox name, return host, port, username and password */
-int pop_parse_path (const char *path, ACCOUNT * acct)
+int pop_parse_path (const char *path, ACCOUNT * act)
 {
   ciss_url_t url;
   char *c;
   int ret = -1;
 
   /* Defaults */
-  acct->flags = 0;
-  acct->port = POP_PORT;
-  acct->type = M_ACCT_TYPE_POP;
+  act->flags = 0;
+  act->port = POP_PORT;
+  act->type = M_ACCT_TYPE_POP;
 
   c = m_strdup(path);
   url_parse_ciss (&url, c);
 
   if (url.scheme == U_POP || url.scheme == U_POPS) {
     if (url.scheme == U_POPS) {
-      acct->flags |= M_ACCT_SSL;
-      acct->port = POP_SSL_PORT;
+      act->flags |= M_ACCT_SSL;
+      act->port = POP_SSL_PORT;
     }
 
-    if ((!url.path || !*url.path) && mutt_account_fromurl (acct, &url) == 0)
+    if ((!url.path || !*url.path) && mutt_account_fromurl (act, &url) == 0)
       ret = 0;
   }
 
@@ -389,14 +388,6 @@ pop_query_status pop_query_d (POP_DATA * pop_data, char *buf, size_t buflen, con
   if (pop_data->status != POP_CONNECTED)
     return PQ_NOT_CONNECTED;
 
-#ifdef DEBUG
-  /* print msg instaed of real command */
-  if (msg) {
-    dbg = M_SOCK_LOG_FULL;
-    debug_print (M_SOCK_LOG_CMD, ("> %s", msg));
-  }
-#endif
-
   mutt_socket_write_d (pop_data->conn, buf, dbg);
 
   c = strpbrk (buf, " \r\n");
@@ -461,10 +452,9 @@ pop_query_status pop_fetch_data (POP_DATA * pop_data, const char *query, progres
     m_strcpy(inbuf + lenbuf,sizeof(buf), p);
     pos += chunk;
 
-    if (chunk >= sizeof (buf)) {
+    if (chunk >= ssizeof(buf)) {
       lenbuf += strlen (p);
-    }
-    else {
+    } else {
       if (bar)
         mutt_progress_bar (bar, pos);
       if (ret == 0 && funct (inbuf, data) < 0)
@@ -482,14 +472,13 @@ pop_query_status pop_fetch_data (POP_DATA * pop_data, const char *query, progres
 /* find message with this UIDL and set refno */
 static int check_uidl (char *line, void *data)
 {
-  int i;
-  unsigned int index;
-  CONTEXT *ctx = (CONTEXT *) data;
+  int i, idx;
+  CONTEXT *ctx = (CONTEXT *)data;
 
-  sscanf (line, "%u %s", &index, line);
+  sscanf (line, "%u %s", &idx, line);
   for (i = 0; i < ctx->msgcount; i++) {
     if (!m_strcmp(ctx->hdrs[i]->data, line)) {
-      ctx->hdrs[i]->refno = index;
+      ctx->hdrs[i]->refno = idx;
       break;
     }
   }