X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=color.c;h=d3b4be540ab614bf75f290ca038ce0dfc661dca4;hp=82180f7b91a5f341a1310a16419f8be71800518d;hb=eed5352e46df93f8921d2e6dfdc95b027bad6e1e;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420

diff --git a/color.c b/color.c
index 82180f7..d3b4be5 100644
--- a/color.c
+++ b/color.c
@@ -15,9 +15,9 @@
 #include <lib-lib/ascii.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/buffer.h>
 
 #include "mutt.h"
-#include "buffer.h"
 #include "mutt_curses.h"
 #include "mapping.h"
 
@@ -214,7 +214,7 @@ int mutt_alloc_color (int fg, int bg)
 
   /* find the smallest available index (object) */
   i = 1;
-  FOREVER {
+  for (;;) {
     p = ColorList;
     while (p) {
       if (p->index == i)
@@ -402,7 +402,7 @@ _mutt_parse_uncolor (BUFFER * buf, BUFFER * s, unsigned long data,
 
   do {
     mutt_extract_token (buf, s, 0);
-    if (!str_cmp ("*", buf->data)) {
+    if (!m_strcmp("*", buf->data)) {
       for (tmp = ColorIndexList; tmp;) {
         if (!do_cache)
           do_cache = 1;
@@ -415,7 +415,7 @@ _mutt_parse_uncolor (BUFFER * buf, BUFFER * s, unsigned long data,
     else {
       for (last = NULL, tmp = ColorIndexList; tmp;
            last = tmp, tmp = tmp->next) {
-        if (!str_cmp (buf->data, tmp->pattern)) {
+        if (!m_strcmp(buf->data, tmp->pattern)) {
           if (!do_cache)
             do_cache = 1;
           debug_print (1, ("Freeing pattern \"%s\" from ColorIndexList\n", tmp->pattern));
@@ -457,7 +457,7 @@ add_pattern (COLOR_LINE ** top, const char *s, int sensitive,
 
   while (tmp) {
     if (sensitive) {
-      if (str_cmp (s, tmp->pattern) == 0)
+      if (m_strcmp(s, tmp->pattern) == 0)
         break;
     }
     else {