X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=curs_lib.c;h=165c4fd2181e0d5fcd576bb4a7c531fd3209f415;hp=4203b0ee7a5d2686943e893c6fd19bcfc5f07768;hb=daf6df95bfcc7efc888b488a825e467268f20d3c;hpb=2ea77d3b2827ba23feb756ce2fb936565ae38998

diff --git a/curs_lib.c b/curs_lib.c
index 4203b0e..165c4fd 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))
@@ -263,7 +264,7 @@ void mutt_query_exit (void)
   curs_set (1);
   if (Timeout)
     timeout (-1);               /* restore blocking operation */
-  if (mutt_yesorno (_("Exit Mutt-ng?"), M_YES) == M_YES) {
+  if (mutt_yesorno (_("Exit Madmutt?"), M_YES) == M_YES) {
     mutt_endwin (NULL);
     exit (1);
   }
@@ -298,7 +299,6 @@ void mutt_curses_error (const char *fmt, ...)
   set_option (OPTMSGERR);
 }
 
-#ifdef USE_SOCKET
 void mutt_progress_bar (progress_t* progress, long pos) {
   char posstr[SHORT_STRING];
 
@@ -326,7 +326,6 @@ void mutt_progress_bar (progress_t* progress, long pos) {
       mutt_message ("%s %s", progress->msg, posstr);
   }
 }
-#endif
 
 void mutt_curses_message (const char *fmt, ...)
 {
@@ -530,7 +529,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)) {
@@ -582,10 +581,10 @@ int mutt_addwch (wchar_t wc)
  * when printed.
  */
 
-void mutt_format_string (char *dest, size_t destlen,
+void mutt_format_string (char *dest, ssize_t destlen,
                          int min_width, int max_width,
                          int right_justify, char m_pad_char,
-                         const char *s, size_t n, int arboreal)
+                         const char *s, ssize_t n, int arboreal)
 {
   char *p;
   wchar_t wc;
@@ -620,7 +619,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) {