X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=thread.c;h=5dc98426336364fae25c911d5e65194750345359;hp=f66afba0a7aefa1b36687be0b886c4408e05f3c6;hb=95986f5aee1c2ee7d12c4b1e4bc47874856c5831;hpb=51239e43fd4a3c2440b4574379e8525d75646b3e

diff --git a/thread.c b/thread.c
index f66afba..5dc9842 100644
--- a/thread.c
+++ b/thread.c
@@ -20,10 +20,10 @@ static int is_descendant (THREAD * a, THREAD * b)
 {
   while (a) {
     if (a == b)
-      return (1);
+      return 1;
     a = a->parent;
   }
-  return (0);
+  return 0;
 }
 
 /* Determines whether to display a message's subject. */
@@ -33,11 +33,11 @@ static int need_display_subject (CONTEXT * ctx, HEADER * hdr)
 
   /* if the user disabled subject hiding, display it */
   if (!option (OPTHIDETHREADSUBJECT))
-    return (1);
+    return 1;
 
   /* if our subject is different from our parent's, display it */
   if (hdr->subject_changed)
-    return (1);
+    return 1;
 
   /* if our subject is different from that of our closest previously displayed
    * sibling, display the subject */
@@ -45,7 +45,7 @@ static int need_display_subject (CONTEXT * ctx, HEADER * hdr)
     hdr = tmp->message;
     if (hdr && VISIBLE (hdr, ctx)) {
       if (hdr->subject_changed)
-        return (1);
+        return 1;
       else
         break;
     }
@@ -57,14 +57,14 @@ static int need_display_subject (CONTEXT * ctx, HEADER * hdr)
     hdr = tmp->message;
     if (hdr) {
       if (VISIBLE (hdr, ctx))
-        return (0);
+        return 0;
       else if (hdr->subject_changed)
-        return (1);
+        return 1;
     }
   }
 
   /* if we have no visible parent or previous sibling, display the subject */
-  return (1);
+  return 1;
 }
 
 static void linearize_tree (CONTEXT * ctx)
@@ -195,10 +195,6 @@ static void calculate_visibility (CONTEXT * ctx, int *max_depth)
 /* Since the graphics characters have a value >255, I have to resort to
  * using escape sequences to pass the information to print_enriched_string().
  * These are the macros M_TREE_* defined in mutt.h.
- *
- * ncurses should automatically use the default ASCII characters instead of
- * graphics chars on terminals which don't support them (see the man page
- * for curs_addch).
  */
 void mutt_draw_tree (CONTEXT * ctx)
 {
@@ -357,7 +353,7 @@ static string_list_t *make_subject_list (THREAD * cur, time_t * dateptr)
     cur = cur->next;
   }
 
-  return (subjects);
+  return subjects;
 }
 
 /* find the best possible match for a parent mesage based upon subject.
@@ -399,7 +395,7 @@ static THREAD *find_subject (CONTEXT * ctx, THREAD * cur)
     subjects = subjects->next;
     p_delete(&oldlist);
   }
-  return (last);
+  return last;
 }
 
 /* remove cur and its descendants from their current location.
@@ -502,7 +498,7 @@ void mutt_clear_threads (CONTEXT * ctx)
   ctx->tree = NULL;
 
   if (ctx->thread_hash)
-    hash_destroy (&ctx->thread_hash, free);
+    hash_delete (&ctx->thread_hash, free);
 }
 
 static int compare_threads (const void *a, const void *b)
@@ -518,7 +514,7 @@ static int compare_threads (const void *a, const void *b)
   else {
     sort_func = NULL;
     sort_func = mutt_get_sort_func (Sort);
-    return (sort_func ? 1 : 0);
+    return sort_func ? 1 : 0;
   }
 }
 
@@ -535,7 +531,7 @@ THREAD *mutt_sort_subthreads (THREAD * thread, int init)
    */
   Sort ^= SORT_REVERSE;
   if (!compare_threads (NULL, NULL))
-    return (thread);
+    return thread;
 
   top = thread;
 
@@ -632,7 +628,7 @@ THREAD *mutt_sort_subthreads (THREAD * thread, int init)
       else {
         Sort ^= SORT_REVERSE;
         p_delete(&array);
-        return (top);
+        return top;
       }
     }
 
@@ -689,7 +685,7 @@ void mutt_sort_threads (CONTEXT * ctx, int init)
     init = 1;
 
   if (init)
-    ctx->thread_hash = hash_create (ctx->msgcount * 2, 1);
+    ctx->thread_hash = hash_new (ctx->msgcount * 2, 1);
 
   /* we want a quick way to see if things are actually attached to the top of the
    * thread tree or if they're just dangling, so we attach everything to a top
@@ -881,18 +877,18 @@ static HEADER *find_virtual (THREAD * cur, int reverse)
   THREAD *top;
 
   if (cur->message && cur->message->virtual >= 0)
-    return (cur->message);
+    return cur->message;
 
   top = cur;
   if ((cur = cur->child) == NULL)
-    return (NULL);
+    return NULL;
 
   while (reverse && cur->next)
     cur = cur->next;
 
   for (;;) {
     if (cur->message && cur->message->virtual >= 0)
-      return (cur->message);
+      return cur->message;
 
     if (cur->child) {
       cur = cur->child;
@@ -906,7 +902,7 @@ static HEADER *find_virtual (THREAD * cur, int reverse)
       while (!(reverse ? cur->prev : cur->next)) {
         cur = cur->parent;
         if (cur == top)
-          return (NULL);
+          return NULL;
       }
       cur = reverse ? cur->prev : cur->next;
     }
@@ -922,7 +918,7 @@ int _mutt_aside_thread (HEADER * hdr, short dir, short subthreads)
   if ((Sort & SORT_MASK) != SORT_THREADS) {
     mutt_error _("Threading is not enabled.");
 
-    return (hdr->virtual);
+    return hdr->virtual;
   }
 
   cur = hdr->thread;
@@ -946,7 +942,7 @@ int _mutt_aside_thread (HEADER * hdr, short dir, short subthreads)
     do {
       cur = cur->next;
       if (!cur)
-        return (-1);
+        return -1;
       tmp = find_virtual (cur, 0);
     } while (!tmp);
   }
@@ -954,12 +950,12 @@ int _mutt_aside_thread (HEADER * hdr, short dir, short subthreads)
     do {
       cur = cur->prev;
       if (!cur)
-        return (-1);
+        return -1;
       tmp = find_virtual (cur, 1);
     } while (!tmp);
   }
 
-  return (tmp->virtual);
+  return tmp->virtual;
 }
 
 int mutt_parent_message (CONTEXT * ctx, HEADER * hdr)
@@ -969,24 +965,24 @@ int mutt_parent_message (CONTEXT * ctx, HEADER * hdr)
   if ((Sort & SORT_MASK) != SORT_THREADS) {
     mutt_error _("Threading is not enabled.");
 
-    return (hdr->virtual);
+    return hdr->virtual;
   }
 
   for (thread = hdr->thread->parent; thread; thread = thread->parent) {
     if ((hdr = thread->message) != NULL) {
       if (VISIBLE (hdr, ctx))
-        return (hdr->virtual);
+        return hdr->virtual;
       else {
         mutt_error _("Parent message is not visible in this limited view.");
 
-        return (-1);
+        return -1;
       }
     }
   }
 
   mutt_error _("Parent message is not available.");
 
-  return (-1);
+  return -1;
 }
 
 void mutt_set_virtual (CONTEXT * ctx)
@@ -1023,7 +1019,7 @@ int _mutt_traverse_thread (CONTEXT * ctx, HEADER * cur, int flag)
 
   if ((Sort & SORT_MASK) != SORT_THREADS && !(flag & M_THREAD_GET_HIDDEN)) {
     mutt_error (_("Threading is not enabled."));
-    return (cur->virtual);
+    return cur->virtual;
   }
 
   final = cur->virtual;
@@ -1063,13 +1059,13 @@ int _mutt_traverse_thread (CONTEXT * ctx, HEADER * cur, int flag)
   if (thread == top && (thread = thread->child) == NULL) {
     /* return value depends on action requested */
     if (flag & (M_THREAD_COLLAPSE | M_THREAD_UNCOLLAPSE))
-      return (final);
+      return final;
     else if (flag & M_THREAD_UNREAD)
-      return ((old && new) ? new : (old ? old : new));
+      return (old && new) ? new : (old ? old : new);
     else if (flag & M_THREAD_GET_HIDDEN)
-      return (num_hidden);
+      return num_hidden;
     else if (flag & M_THREAD_NEXT_UNREAD)
-      return (min_unread);
+      return min_unread;
   }
 
   for (;;) {
@@ -1139,15 +1135,15 @@ int _mutt_traverse_thread (CONTEXT * ctx, HEADER * cur, int flag)
 
   /* return value depends on action requested */
   if (flag & (M_THREAD_COLLAPSE | M_THREAD_UNCOLLAPSE))
-    return (final);
+    return final;
   else if (flag & M_THREAD_UNREAD)
-    return ((old && new) ? new : (old ? old : new));
+    return (old && new) ? new : (old ? old : new);
   else if (flag & M_THREAD_GET_HIDDEN)
-    return (num_hidden + 1);
+    return num_hidden + 1;
   else if (flag & M_THREAD_NEXT_UNREAD)
-    return (min_unread);
+    return min_unread;
 
-  return (0);
+  return 0;
 #undef CHECK_LIMIT
 }
 
@@ -1161,7 +1157,7 @@ int mutt_messages_in_thread (CONTEXT * ctx, HEADER * hdr, int flag)
   int i, rc;
 
   if ((Sort & SORT_MASK) != SORT_THREADS || !hdr->thread)
-    return (1);
+    return 1;
 
   threads[0] = hdr->thread;
   while (threads[0]->parent)
@@ -1186,17 +1182,17 @@ int mutt_messages_in_thread (CONTEXT * ctx, HEADER * hdr, int flag)
   if (flag)
     rc += 1;
 
-  return (rc);
+  return rc;
 }
 
 
-HASH *mutt_make_id_hash (CONTEXT * ctx)
+hash_t *mutt_make_id_hash (CONTEXT * ctx)
 {
   int i;
   HEADER *hdr;
-  HASH *hash;
+  hash_t *hash;
 
-  hash = hash_create (ctx->msgcount * 2, 0);
+  hash = hash_new (ctx->msgcount * 2, 0);
 
   for (i = 0; i < ctx->msgcount; i++) {
     hdr = ctx->hdrs[i];
@@ -1207,13 +1203,13 @@ HASH *mutt_make_id_hash (CONTEXT * ctx)
   return hash;
 }
 
-HASH *mutt_make_subj_hash (CONTEXT * ctx)
+hash_t *mutt_make_subj_hash (CONTEXT * ctx)
 {
   int i;
   HEADER *hdr;
-  HASH *hash;
+  hash_t *hash;
 
-  hash = hash_create (ctx->msgcount * 2, 1);
+  hash = hash_new (ctx->msgcount * 2, 1);
 
   for (i = 0; i < ctx->msgcount; i++) {
     hdr = ctx->hdrs[i];