X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mbox.c;h=e140ee42f91709f2039b3e0c062e2f6de94eaf7b;hp=c3dc0fd185cb1c93a5e6684d7b43e392f7564052;hb=ab4e61871dafd1556fcbff220f01efd817beb3d0;hpb=6771688a116512f5fc5ce0844dc5987a22c2e0f6

diff --git a/mbox.c b/mbox.c
index c3dc0fd..e140ee4 100644
--- a/mbox.c
+++ b/mbox.c
@@ -125,7 +125,7 @@ static int mmdf_parse_mailbox (CONTEXT * ctx)
 
       if (ctx->msgcount == ctx->hdrmax)
         mx_alloc_memory (ctx);
-      ctx->hdrs[ctx->msgcount] = hdr = mutt_new_header ();
+      ctx->hdrs[ctx->msgcount] = hdr = header_new();
       hdr->offset = loc;
       hdr->index = ctx->msgcount;
 
@@ -262,7 +262,7 @@ static int mbox_parse_mailbox (CONTEXT * ctx)
       if (ctx->msgcount == ctx->hdrmax)
         mx_alloc_memory (ctx);
 
-      curhdr = ctx->hdrs[ctx->msgcount] = mutt_new_header ();
+      curhdr = ctx->hdrs[ctx->msgcount] = header_new();
       curhdr->received = t - tz;
       curhdr->offset = loc;
       curhdr->index = ctx->msgcount;
@@ -906,7 +906,7 @@ static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
   p_delete(&ctx->v2r);
   if (ctx->readonly) {
     for (i = 0; i < ctx->msgcount; i++)
-      mutt_free_header (&(ctx->hdrs[i]));       /* nothing to do! */
+      header_delete(&(ctx->hdrs[i]));       /* nothing to do! */
     p_delete(&ctx->hdrs);
   }
   else {
@@ -952,7 +952,7 @@ static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
   if (rc == -1) {
     /* free the old headers */
     for (j = 0; j < old_msgcount; j++)
-      mutt_free_header (&(old_hdrs[j]));
+      header_delete(&(old_hdrs[j]));
     p_delete(&old_hdrs);
 
     ctx->quiet = 0;
@@ -1010,14 +1010,14 @@ static int mbox_reopen_mailbox (CONTEXT * ctx, int *index_hint)
         mutt_set_flag (ctx, ctx->hdrs[i], M_TAG, old_hdrs[j]->tagged);
 
         /* we don't need this header any more */
-        mutt_free_header (&(old_hdrs[j]));
+        header_delete(&(old_hdrs[j]));
       }
     }
 
     /* free the remaining old headers */
     for (j = 0; j < old_msgcount; j++) {
       if (old_hdrs[j]) {
-        mutt_free_header (&(old_hdrs[j]));
+        header_delete(&(old_hdrs[j]));
         msg_mod = 1;
       }
     }