X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=curs_lib.c;h=443f510d6192fe76fe08c8a16b25928290f6a516;hp=be5583f3aafde33e43553f1a58c29c0f37600325;hb=766fd6928123218aca635827248299ceeeb1d170;hpb=9274cbe8e6410ddb95ddc667faa678a29da85420

diff --git a/curs_lib.c b/curs_lib.c
index be5583f..443f510 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -18,6 +18,7 @@
 #include <lib-lib/mem.h>
 #include <lib-lib/str.h>
 #include <lib-lib/macros.h>
+#include <lib-lib/file.h>
 
 #include "mutt.h"
 #include "enter.h"
@@ -209,7 +210,7 @@ int mutt_yesorno (const char *msg, int def)
   printw ("%.*s%s", COLS - answer_string_len, msg, answer_string);
   p_delete(&answer_string);
 
-  FOREVER {
+  for (;;) {
     mutt_refresh ();
     ch = mutt_getch ();
     if (CI_is_return (ch.ch))
@@ -420,7 +421,7 @@ int mutt_do_pager (const char *banner,
 {
   int rc;
 
-  if (!Pager || str_cmp (Pager, "builtin") == 0)
+  if (!Pager || m_strcmp(Pager, "builtin") == 0)
     rc = mutt_pager (banner, tempfile, do_color, info);
   else {
     char cmd[STRING];
@@ -530,7 +531,7 @@ int mutt_multi_choice (char *prompt, char *letters)
 
   mvaddstr (LINES - 1, 0, prompt);
   clrtoeol ();
-  FOREVER {
+  for (;;) {
     mutt_refresh ();
     ch = mutt_getch ();
     if (ch.ch == -1 || CI_is_return (ch.ch)) {
@@ -583,7 +584,7 @@ int mutt_addwch (wchar_t wc)
  */
 
 void mutt_format_string (char *dest, size_t destlen,
-                         int min_width, int max_width,
+                         unsigned int min_width, int max_width,
                          int right_justify, char m_pad_char,
                          const char *s, size_t n, int arboreal)
 {
@@ -620,7 +621,7 @@ void mutt_format_string (char *dest, size_t destlen,
       destlen -= k2;
     }
   }
-  w = (int) destlen < min_width ? destlen : min_width;
+  w = destlen < min_width ? destlen : min_width;
   if (w <= 0)
     *p = '\0';
   else if (right_justify) {