X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=thread.c;h=ee923b127f98a77569e61f9527dd95d21ca0e74d;hp=1bf0b5fd40fa2f020057d1275e1ed94524f6ced7;hb=85832555b8d510499b13bc454e458382d36e195d;hpb=2ea77d3b2827ba23feb756ce2fb936565ae38998

diff --git a/thread.c b/thread.c
index 1bf0b5f..ee923b1 100644
--- a/thread.c
+++ b/thread.c
@@ -124,7 +124,7 @@ static void calculate_visibility (CONTEXT * ctx, int *max_depth)
     tree = tree->next;
   *max_depth = 0;
 
-  FOREVER {
+  for (;;) {
     if (depth > *max_depth)
       *max_depth = depth;
 
@@ -180,7 +180,7 @@ static void calculate_visibility (CONTEXT * ctx, int *max_depth)
   /* now fix up for the OPTHIDETOP* options if necessary */
   if (hide_top_limited || hide_top_missing) {
     tree = ctx->tree;
-    FOREVER {
+    for (;;) {
       if (!tree->visible && tree->deep && tree->subtree_visible < 2
           && ((tree->message && hide_top_limited)
               || (!tree->message && hide_top_missing)))
@@ -243,12 +243,12 @@ void mutt_draw_tree (CONTEXT * ctx)
         myarrow[width + 1] = 0;
         new_tree = p_new(char, (2 + depth * width));
         if (start_depth > 1) {
-          strncpy (new_tree, pfx, (start_depth - 1) * width);
-          strfcpy (new_tree + (start_depth - 1) * width,
-                   arrow, (1 + depth - start_depth) * width + 2);
+          memcpy(new_tree, pfx, (start_depth - 1) * width);
+          m_strcpy(new_tree + (start_depth - 1) * width,
+                   (1 + depth - start_depth) * width + 2, arrow);
         }
         else
-          strfcpy (new_tree, arrow, 2 + depth * width);
+          m_strcpy(new_tree, 2 + depth * width, arrow);
         tree->message->tree = new_tree;
       }
     }
@@ -324,7 +324,7 @@ static LIST *make_subject_list (THREAD * cur, time_t * dateptr)
   LIST *curlist, *oldlist, *newlist, *subjects = NULL;
   int rc = 0;
 
-  FOREVER {
+  for (;;) {
     while (!cur->message)
       cur = cur->child;
 
@@ -463,7 +463,7 @@ static void pseudo_threads (CONTEXT * ctx)
       insert_message (&parent->child, parent, cur);
       parent->sort_children = 1;
       tmp = cur;
-      FOREVER {
+      for (;;) {
         while (!tmp->message)
           tmp = tmp->child;
 
@@ -899,7 +899,7 @@ static HEADER *find_virtual (THREAD * cur, int reverse)
   while (reverse && cur->next)
     cur = cur->next;
 
-  FOREVER {
+  for (;;) {
     if (cur->message && cur->message->virtual >= 0)
       return (cur->message);
 
@@ -1081,7 +1081,7 @@ int _mutt_traverse_thread (CONTEXT * ctx, HEADER * cur, int flag)
       return (min_unread);
   }
 
-  FOREVER {
+  for (;;) {
     cur = thread->message;
 
     if (cur) {
@@ -1252,7 +1252,7 @@ static void clean_references (THREAD * brk, THREAD * cur)
     for (p = brk; !done && p; p = p->parent)
       for (ref = cur->message->env->references; p->message && ref;
            ref = ref->next)
-        if (!str_casecmp (ref->data, p->message->env->message_id)) {
+        if (!m_strcasecmp(ref->data, p->message->env->message_id)) {
           done = 1;
           break;
         }