X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mh.c;h=d55115d6845b44295aff14a791b3959a5a845d99;hp=a013376bed25f11486d32f13f8b97cb9301170b0;hb=5ed593da25809636fe4266e212d8d382a738649b;hpb=83532821ae9fab034d0d630b78330c9ea4ff4cf3

diff --git a/mh.c b/mh.c
index a013376..d55115d 100644
--- a/mh.c
+++ b/mh.c
@@ -56,9 +56,6 @@ struct maildir {
   HEADER *h;
   char *canon_fname;
   unsigned header_parsed:1;
-#ifdef USE_INODESORT
-  ino_t inode;
-#endif /* USE_INODESORT */
   struct maildir *next;
 };
 
@@ -466,7 +463,7 @@ static void maildir_free_entry (struct maildir **md)
 
   p_delete(&(*md)->canon_fname);
   if ((*md)->h)
-    mutt_free_header (&(*md)->h);
+    header_delete(&(*md)->h);
 
   p_delete(md);
 }
@@ -570,7 +567,7 @@ static HEADER *maildir_parse_message (int magic, const char *fname,
 
   if ((f = fopen (fname, "r")) != NULL) {
     if (!h)
-      h = mutt_new_header ();
+      h = header_new();
     h->env = mutt_read_rfc822_header (f, h, 0, 0);
 
     fstat (fileno (f), &st);
@@ -627,7 +624,7 @@ static int maildir_parse_entry (CONTEXT * ctx, struct maildir ***last,
   if (ctx->magic == M_MH)
     h = maildir_parse_message (ctx->magic, buf, is_old, NULL);
   else {
-    h = mutt_new_header ();
+    h = header_new();
     h->old = is_old;
     maildir_parse_flags (h, buf);
   }
@@ -649,9 +646,6 @@ static int maildir_parse_entry (CONTEXT * ctx, struct maildir ***last,
     entry = p_new(struct maildir, 1);
     entry->h = h;
     entry->header_parsed = (ctx->magic == M_MH);
-#ifdef USE_INODESORT
-    entry->inode = inode;
-#endif /* USE_INODESORT */
     **last = entry;
     *last = &entry->next;
 
@@ -760,85 +754,6 @@ static int maildir_move_to_context (CONTEXT * ctx, struct maildir **md)
   return r;
 }
 
-#ifdef USE_INODESORT
-/*
- * Merge two maildir lists according to the inode numbers.
- */
-static struct maildir *maildir_merge_inode (struct maildir *left,
-                                            struct maildir *right)
-{
-  struct maildir *head;
-  struct maildir *tail;
-
-  if (left && right) {
-    if (left->inode < right->inode) {
-      head = left;
-      left = left->next;
-    }
-    else {
-      head = right;
-      right = right->next;
-    }
-  }
-  else {
-    if (left)
-      return left;
-    else
-      return right;
-  }
-
-  tail = head;
-
-  while (left && right) {
-    if (left->inode < right->inode) {
-      tail->next = left;
-      left = left->next;
-    }
-    else {
-      tail->next = right;
-      right = right->next;
-    }
-    tail = tail->next;
-  }
-
-  if (left) {
-    tail->next = left;
-  }
-  else {
-    tail->next = right;
-  }
-
-  return head;
-}
-
-/*
- * Sort maildir list according to inode.
- */
-static struct maildir *maildir_sort_inode (struct maildir *list)
-{
-  struct maildir *left = list;
-  struct maildir *right = list;
-
-  if (!list || !list->next) {
-    return list;
-  }
-
-  list = list->next;
-  while (list && list->next) {
-    right = right->next;
-    list = list->next->next;
-  }
-
-  list = right;
-  right = right->next;
-  list->next = 0;
-
-  left = maildir_sort_inode (left);
-  right = maildir_sort_inode (right);
-  return maildir_merge_inode (left, right);
-}
-#endif /* USE_INODESORT */
-
 #ifdef USE_HCACHE
 static size_t maildir_hcache_keylen (const char *fn)
 {
@@ -904,7 +819,7 @@ void maildir_delayed_parsing (CONTEXT * ctx, struct maildir *md)
 #endif
     }
     else
-      mutt_free_header (&p->h);
+      header_delete(&p->h);
 #ifdef USE_HCACHE
     p_delete(&data);
 #endif
@@ -945,10 +860,6 @@ static int _mh_read_dir (CONTEXT * ctx, const char *subdir)
     mhs_free_sequences (&mhs);
   }
 
-#ifdef USE_INODESORT
-  md = maildir_sort_inode (md);
-#endif /* USE_INODESORT */
-
   if (ctx->magic == M_MAILDIR)
     maildir_delayed_parsing (ctx, md);
 
@@ -1644,7 +1555,7 @@ static int maildir_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
       ctx->hdrs[i]->trash = p->h->trash;
 
       /* this is a duplicate of an existing header, so remove it */
-      mutt_free_header (&p->h);
+      header_delete(&p->h);
     }
     /* This message was not in the list of messages we just scanned.
      * Check to see if we have enough information to know if the
@@ -1763,7 +1674,7 @@ static int mh_check_mailbox (CONTEXT * ctx, int *index_hint, int unused)
       if (!ctx->hdrs[i]->changed)
         maildir_update_flags (ctx, ctx->hdrs[i], p->h);
 
-      mutt_free_header (&p->h);
+      header_delete(&p->h);
     }
     else                        /* message has disappeared */
       occult = 1;