make code more readable.

[apps/madmutt.git] / pop / pop_lib.c

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 4aa3409..285ed44 100644 (file)
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -11,8 +11,12 @@
 # include "config.h"
 #endif
 
+#include <lib-lib/mem.h>
+#include <lib-lib/str.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/macros.h>
+
 #include "mutt.h"
-#include "ascii.h"
 #include "mx.h"
 #include "url.h"
 #include "pop.h"
@@ -20,10 +24,7 @@
 # include "mutt_ssl.h"
 #endif
 
-#include "lib/mem.h"
-#include "lib/intl.h"
 #include "lib/debug.h"
-#include "lib/str.h"
 
 #include <string.h>
 #include <unistd.h>
@@ -41,7 +42,7 @@ int pop_parse_path (const char *path, ACCOUNT * acct)
   acct->port = POP_PORT;
   acct->type = M_ACCT_TYPE_POP;
 
-  c = str_dup (path);
+  c = m_strdup(path);
   url_parse_ciss (&url, c);
 
   if (url.scheme == U_POP || url.scheme == U_POPS) {
@@ -54,7 +55,7 @@ int pop_parse_path (const char *path, ACCOUNT * acct)
       ret = 0;
   }
 
-  mem_free (&c);
+  p_delete(&c);
   return ret;
 }
 
@@ -85,10 +86,10 @@ static int fetch_capa (char *line, void *data)
   char *c;
 
   if (!ascii_strncasecmp (line, "SASL", 4)) {
-    mem_free (&pop_data->auth_list);
+    p_delete(&pop_data->auth_list);
     c = line + 4;
     SKIPWS (c);
-    pop_data->auth_list = str_dup (c);
+    pop_data->auth_list = m_strdup(c);
   }
 
   else if (!ascii_strncasecmp (line, "STLS", 4))
@@ -112,12 +113,10 @@ static int fetch_auth (char *line, void *data)
   POP_DATA *pop_data = (POP_DATA *) data;
 
   if (!pop_data->auth_list) {
-    pop_data->auth_list = mem_malloc (strlen (line) + 1);
-    *pop_data->auth_list = '\0';
-  }
-  else {
-    mem_realloc (&pop_data->auth_list,
-                  strlen (pop_data->auth_list) + strlen (line) + 2);
+    pop_data->auth_list = p_new(char, strlen(line) + 1);
+  } else {
+    p_realloc(&pop_data->auth_list,
+              strlen(pop_data->auth_list) + strlen(line) + 2);
     strcat (pop_data->auth_list, " ");  /* __STRCAT_CHECKED__ */
   }
   strcat (pop_data->auth_list, line);   /* __STRCAT_CHECKED__ */
@@ -149,7 +148,7 @@ static pop_query_status pop_capabilities (POP_DATA * pop_data, int mode)
     pop_data->resp_codes = 0;
     pop_data->expire = 1;
     pop_data->login_delay = 0;
-    mem_free (&pop_data->auth_list);
+    p_delete(&pop_data->auth_list);
   }
 
   /* Execute CAPA command */
@@ -444,9 +443,9 @@ pop_query_status pop_fetch_data (POP_DATA * pop_data, const char *query, progres
   if (ret != PQ_OK)
     return ret;
 
-  inbuf = mem_malloc (sizeof (buf));
+  inbuf = p_new(char, sizeof(buf));
 
-  FOREVER {
+  for (;;) {
     chunk =
       mutt_socket_readln_d (buf, sizeof (buf), pop_data->conn,
                             M_SOCK_LOG_HDR);
@@ -463,7 +462,7 @@ pop_query_status pop_fetch_data (POP_DATA * pop_data, const char *query, progres
       p++;
     }
 
-    strfcpy (inbuf + lenbuf, p, sizeof (buf));
+    strfcpy(inbuf + lenbuf, p, sizeof(buf));
     pos += chunk;
 
     if (chunk >= sizeof (buf)) {
@@ -477,10 +476,10 @@ pop_query_status pop_fetch_data (POP_DATA * pop_data, const char *query, progres
       lenbuf = 0;
     }
 
-    mem_realloc (&inbuf, lenbuf + sizeof (buf));
+    p_realloc(&inbuf, lenbuf + sizeof(buf));
   }
 
-  mem_free (&inbuf);
+  p_delete(&inbuf);
   return ret;
 }
 
@@ -493,7 +492,7 @@ static int check_uidl (char *line, void *data)
 
   sscanf (line, "%u %s", &index, line);
   for (i = 0; i < ctx->msgcount; i++) {
-    if (!str_cmp (ctx->hdrs[i]->data, line)) {
+    if (!m_strcmp(ctx->hdrs[i]->data, line)) {
       ctx->hdrs[i]->refno = index;
       break;
     }
@@ -514,7 +513,7 @@ pop_query_status pop_reconnect (CONTEXT * ctx)
   if (pop_data->status == POP_BYE)
     return PQ_NOT_CONNECTED;
 
-  FOREVER {
+  for (;;) {
     mutt_socket_close (pop_data->conn);
 
     ret = pop_open_connection (pop_data);