X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=thread.c;h=e34c543ea88bf62b1d547c15eff7f8780dc22eab;hp=ed690f25888d2d31f206e48360148305147eaf39;hb=7d29626ce4e1fa932c6349c7253e6f774df069fc;hpb=108f3c7ab59844591f7540347914ea57be5245e2

diff --git a/thread.c b/thread.c
index ed690f2..e34c543 100644
--- a/thread.c
+++ b/thread.c
@@ -7,21 +7,12 @@
  * please see the file GPL in the top level source directory.
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <lib-lib/mem.h>
-#include <lib-lib/macros.h>
+#include <lib-lib/lib-lib.h>
 
 #include "mutt.h"
 #include "sort.h"
 #include "thread.h"
 
-
-#include <string.h>
-#include <ctype.h>
-
 #define VISIBLE(hdr, ctx) (hdr->virtual >= 0 || (hdr->collapsed && (!ctx->pattern || hdr->limited)))
 
 /* determine whether a is a descendant of b */
@@ -1233,7 +1224,7 @@ HASH *mutt_make_subj_hash (CONTEXT * ctx)
   return hash;
 }
 
-static void clean_references (THREAD * brk, THREAD * cur)
+static void clean_references (THREAD * tbrk, THREAD * cur)
 {
   THREAD *p;
   string_list_t *ref = NULL;
@@ -1241,7 +1232,7 @@ static void clean_references (THREAD * brk, THREAD * cur)
 
   for (; cur; cur = cur->next, done = 0) {
     /* parse subthread recursively */
-    clean_references (brk, cur->child);
+    clean_references (tbrk, cur->child);
 
     if (!cur->message)
       break;                    /* skip pseudo-message */
@@ -1249,7 +1240,7 @@ static void clean_references (THREAD * brk, THREAD * cur)
     /* Looking for the first bad reference according to the new threading.
      * Optimal since Mutt stores the references in reverse order, and the
      * first loop should match immediatly for mails respecting RFC2822. */
-    for (p = brk; !done && p; p = p->parent)
+    for (p = tbrk; !done && p; p = p->parent)
       for (ref = cur->message->env->references; p->message && ref;
            ref = ref->next)
         if (!m_strcasecmp(ref->data, p->message->env->message_id)) {