X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=nntp%2Fnntp.c;h=2977f0c94ed5c7c5177b6a3e53437e99b76ab4bf;hb=90c36546d834608e1ce96f4142ef9a1f6b405a7c;hp=0c7af826a0153a5669533e27eacc882d98618b48;hpb=4761fa78a6dfc9437caa6e6e0aac806e50e01c83;p=apps%2Fmadmutt.git

diff --git a/nntp/nntp.c b/nntp/nntp.c
index 0c7af82..2977f0c 100644
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -17,11 +17,13 @@
 #include <lib-lib/str.h>
 #include <lib-lib/file.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/debug.h>
 
 #include <lib-mime/mime.h>
 
+#include <lib-ui/curses.h>
+
 #include "mutt.h"
-#include "mutt_curses.h"
 #include "sort.h"
 #include "mx.h"
 #include "mx_nntp.h"
@@ -32,7 +34,6 @@
 
 #include <lib-crypt/crypt.h>
 
-#include "lib/debug.h"
 
 #include <unistd.h>
 #include <string.h>
@@ -532,7 +533,7 @@ static void nntp_get_desc (NNTP_DATA * data, const char *mask, char *msg, progre
   if (data->nserv->hasXGTITLE)
     snprintf (buf, sizeof (buf), "XGTITLE %s\r\n", mask);
   else
-    snprintf (buf, sizeof (buf), "LIST NEWSGROUPS %s\r\n", mask);
+    snprintf (buf, sizeof (buf), "string_list_t NEWSGROUPS %s\r\n", mask);
   if (mutt_nntp_fetch (data, buf, msg, bar, parse_description, data->nserv, 0) !=
       0) {
 #ifdef DEBUG
@@ -555,7 +556,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
   char *p, *b;
   int x, done = 0;
 
-  hdr->env = mutt_new_envelope ();
+  hdr->env = envelope_new();
   hdr->env->newsgroups = m_strdup(nntp_data->group);
   hdr->content = mutt_new_body ();
   hdr->content->type = TYPETEXT;
@@ -583,7 +584,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
       hdr->env->subject = m_strdup(b);
       break;
     case 2:
-      address_delete (&hdr->env->from);
+      address_list_wipe(&hdr->env->from);
       hdr->env->from = rfc822_parse_adrlist (hdr->env->from, b);
       /* same as for mutt_parse_rfc822_line():
        * don't leave from info NULL if there's an invalid address (or
@@ -604,7 +605,7 @@ static int nntp_parse_xover (CONTEXT * ctx, char *buf, HEADER * hdr)
       hdr->env->message_id = m_strdup(b);
       break;
     case 5:
-      mutt_free_list (&hdr->env->references);
+      string_list_wipe(&hdr->env->references);
       hdr->env->references = mutt_parse_references (b, 0);
       break;
     case 6:
@@ -666,7 +667,7 @@ static int add_xover_line (char *line, void *c)
 
   if (ctx->msgcount >= ctx->hdrmax)
     mx_alloc_memory (ctx);
-  ctx->hdrs[ctx->msgcount] = mutt_new_header ();
+  ctx->hdrs[ctx->msgcount] = header_new();
   ctx->hdrs[ctx->msgcount]->index = ctx->msgcount;
 
   nntp_parse_xover (ctx, line, ctx->hdrs[ctx->msgcount]);
@@ -682,7 +683,7 @@ static int add_xover_line (char *line, void *c)
       mutt_message ("%s %d/%d", fc->msg, num, total);
   }
   else
-    mutt_free_header (&ctx->hdrs[ctx->msgcount]);       /* skip it */
+    header_delete(&ctx->hdrs[ctx->msgcount]);       /* skip it */
 
   return 0;
 }
@@ -811,7 +812,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
 
       if (ctx->msgcount >= ctx->hdrmax)
         mx_alloc_memory (ctx);
-      h = ctx->hdrs[ctx->msgcount] = mutt_new_header ();
+      h = ctx->hdrs[ctx->msgcount] = header_new();
       h->index = ctx->msgcount;
 
       ret = nntp_read_header (ctx, NULL, current);
@@ -821,7 +822,7 @@ static int nntp_fetch_headers (CONTEXT * ctx, unsigned int first,
         mx_update_context (ctx, 1);
       }
       else
-        mutt_free_header (&h);  /* skip it */
+        header_delete(&h);  /* skip it */
       if (ret == -1) {
         p_delete(&fc.messages);
         return -1;
@@ -892,7 +893,7 @@ int nntp_open_mailbox (CONTEXT * ctx)
   }
 
   if (m_strncmp("211", buf, 3)) {
-    LIST *l = serv->list;
+    string_list_t *l = serv->list;
 
     /* GROUP command failed */
     if (!m_strncmp("411", buf, 3)) {
@@ -989,7 +990,7 @@ int nntp_fetch_message (MESSAGE * msg, CONTEXT * ctx, int msgno)
     return -1;
   }
 
-  mutt_free_envelope (&ctx->hdrs[msgno]->env);
+  envelope_delete(&ctx->hdrs[msgno]->env);
   ctx->hdrs[msgno]->env =
     mutt_read_rfc822_header (msg->fp, ctx->hdrs[msgno], 0, 0);
   /* fix content length */
@@ -1313,8 +1314,8 @@ int nntp_check_newgroups (NNTP_SERVER * serv, int force)
 {
   char buf[LONG_STRING];
   NNTP_DATA nntp_data;
-  LIST *l;
-  LIST emp;
+  string_list_t *l;
+  string_list_t emp;
   time_t now;
   struct tm *t;
 
@@ -1411,7 +1412,7 @@ int nntp_get_active (NNTP_SERVER * serv)
 {
   char msg[SHORT_STRING];
   NNTP_DATA nntp_data;
-  LIST *tmp;
+  string_list_t *tmp;
 
   if (nntp_open_connection (serv) < 0)
     return -1;
@@ -1424,9 +1425,9 @@ int nntp_get_active (NNTP_SERVER * serv)
   nntp_data.nserv = serv;
   nntp_data.group = NULL;
 
-  if (mutt_nntp_fetch (&nntp_data, "LIST\r\n", msg, NULL, add_group, serv, 0) < 0) {
+  if (mutt_nntp_fetch (&nntp_data, "string_list_t\r\n", msg, NULL, add_group, serv, 0) < 0) {
 #ifdef DEBUG
-    nntp_error ("nntp_get_active()", "LIST\r\n");
+    nntp_error ("nntp_get_active()", "string_list_t\r\n");
 #endif
     return -1;
   }
@@ -1463,7 +1464,7 @@ int nntp_check_msgid (CONTEXT * ctx, const char *msgid)
     return 1;
   if (ctx->msgcount == ctx->hdrmax)
     mx_alloc_memory (ctx);
-  ctx->hdrs[ctx->msgcount] = mutt_new_header ();
+  ctx->hdrs[ctx->msgcount] = header_new();
   ctx->hdrs[ctx->msgcount]->index = ctx->msgcount;
 
   mutt_message (_("Fetching %s from server..."), msgid);
@@ -1471,7 +1472,7 @@ int nntp_check_msgid (CONTEXT * ctx, const char *msgid)
   /* since nntp_read_header() may set read flag, we must reset it */
   ctx->hdrs[ctx->msgcount]->read = 0;
   if (ret != 0)
-    mutt_free_header (&ctx->hdrs[ctx->msgcount]);
+    header_delete(&ctx->hdrs[ctx->msgcount]);
   else {
     ctx->msgcount++;
     mx_update_context (ctx, 1);