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

diff --git a/nntp/nntp.c b/nntp/nntp.c
index 0c7af82..c9b1a02 100644
--- a/nntp/nntp.c
+++ b/nntp/nntp.c
@@ -555,7 +555,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;
@@ -666,7 +666,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 +682,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 +811,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 +821,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;
@@ -989,7 +989,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 */
@@ -1463,7 +1463,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 +1471,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);