and even less very old hacks.

[apps/madmutt.git] / curs_lib.c

diff --git a/curs_lib.c b/curs_lib.c
index 4203b0e..443f510 100644 (file)
--- 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))
@@ -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) {