X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=nntp%2Fnntp.c;h=3a1e626d51130df0987b7ec45b651b7503e4be9a;hb=9f66d0f5a23ad4fe8359006fa82abdc20737ddf1;hp=2b9ead7da3a05f1840fa40c333ebd02d196dac02;hpb=7f7a0be369840b290248e5b0302beb447fa1b3cd;p=apps%2Fmadmutt.git

diff --git a/nntp/nntp.c b/nntp/nntp.c
index 2b9ead7..3a1e626 100644
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -15,6 +15,7 @@
 
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
+#include <lib-lib/file.h>
 #include <lib-lib/macros.h>
 
 #include "mutt.h"
@@ -261,7 +262,7 @@ static int nntp_reconnect (NNTP_SERVER * serv)
 
   mutt_socket_close (serv->conn);
 
-  FOREVER {
+  for (;;) {
     if (nntp_connect_and_auth (serv) == 0)
       return 0;
 
@@ -349,7 +350,7 @@ static int mutt_nntp_fetch (NNTP_DATA * nntp_data, const char *query, char *msg,
     line = 0;
     inbuf = p_new(char, sizeof(buf));
 
-    FOREVER {
+    for (;;) {
       chunk = mutt_socket_readln_d (buf, sizeof (buf), nntp_data->nserv->conn,
                                     M_SOCK_LOG_HDR);
       if (chunk < 0)
@@ -440,7 +441,7 @@ static void nntp_parse_xref (CONTEXT * ctx, char *group, char *xref,
       *colon = '\0';
       colon++;
       nntp_get_status (ctx, h, b, atoi (colon));
-      if (h && h->article_num == 0 && str_cmp (group, b) == 0)
+      if (h && h->article_num == 0 && m_strcmp(group, b) == 0)
         h->article_num = atoi (colon);
     }
   }
@@ -512,7 +513,7 @@ static int parse_description (char *line, void *n)
     d++;
   debug_print (2, ("group: %s, desc: %s\n", line, d));
   if ((data = (NNTP_DATA *) hash_find (news->newsgroups, line)) != NULL &&
-      str_cmp (d, data->desc)) {
+      m_strcmp(d, data->desc)) {
     p_delete(&data->desc);
     data->desc = m_strdup(d);
   }
@@ -848,7 +849,7 @@ int nntp_open_mailbox (CONTEXT * ctx)
   unsigned int first;
   ACCOUNT acct;
 
-  memset (&acct, 0, sizeof (ACCOUNT));
+  p_clear(&acct, 1);
 
   if (nntp_parse_url (ctx->path, &acct, buf, sizeof (buf)) < 0 || !*buf) {
     mutt_error (_("%s is an invalid newsgroup specification!"), ctx->path);