drop str_[n]cat.

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

diff --git a/pop/pop_lib.c b/pop/pop_lib.c
index 8359cac..285ed44 100644 (file)
--- a/pop/pop_lib.c
+++ b/pop/pop_lib.c
@@ -12,9 +12,11 @@
 #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"
@@ -22,9 +24,7 @@
 # include "mutt_ssl.h"
 #endif
 
-#include "lib/intl.h"
 #include "lib/debug.h"
-#include "lib/str.h"
 
 #include <string.h>
 #include <unistd.h>
@@ -42,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) {
@@ -89,7 +89,7 @@ static int fetch_capa (char *line, void *data)
     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))
@@ -445,7 +445,7 @@ pop_query_status pop_fetch_data (POP_DATA * pop_data, const char *query, progres
 
   inbuf = p_new(char, sizeof(buf));
 
-  FOREVER {
+  for (;;) {
     chunk =
       mutt_socket_readln_d (buf, sizeof (buf), pop_data->conn,
                             M_SOCK_LOG_HDR);
@@ -492,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;
     }
@@ -513,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);