X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurs_lib.c;h=b283e42cb37b662d6777b5cb09c2e47bde432ea1;hp=2268e5b2c6c5d3d004c2b95c83271f6186240cb5;hb=049b21f53af51ad7259613f5eefaa0f37b1b2167;hpb=dc726add2e8fe52be1f6859ea7cbe4651498eeb8 diff --git a/lib-ui/curs_lib.c b/lib-ui/curs_lib.c index 2268e5b..b283e42 100644 --- a/lib-ui/curs_lib.c +++ b/lib-ui/curs_lib.c @@ -21,6 +21,7 @@ #include #include "menu.h" +#include "browser.h" #include "mutt.h" #include "pager.h" @@ -41,7 +42,7 @@ event_t mutt_getch (void) event_t err = { -1, OP_NULL }, ret; if (!option (OPTUNBUFFEREDINPUT) && UngetCount) - return (KeyEvent[--UngetCount]); + return KeyEvent[--UngetCount]; SigInt = 0; @@ -57,7 +58,7 @@ event_t mutt_getch (void) ret.ch = ch; ret.op = 0; - return (ch == ctrl ('G') ? err : ret); + return ch == ctrl ('G') ? err : ret; } int mutt_get_field_unbuffered (char *msg, char *buf, ssize_t buflen, int flags) @@ -68,7 +69,7 @@ int mutt_get_field_unbuffered (char *msg, char *buf, ssize_t buflen, int flags) rc = mutt_get_field (msg, buf, buflen, flags); unset_option (OPTUNBUFFEREDINPUT); - return (rc); + return rc; } void mutt_clear_error (void) @@ -229,7 +230,7 @@ int mutt_yesorno (const char *msg, int def) mutt_refresh (); } CLEARLINE(stdscr, LINES - 1); - return (def); + return def; } /* this function is called when the user presses the abort key */ @@ -377,7 +378,7 @@ int mutt_any_key_to_continue (const char *s) close (f); fputs ("\r\n", stdout); mutt_clear_error (); - return (ch); + return ch; } int _mutt_enter_fname (const char *prompt, char *buf, ssize_t blen, @@ -396,7 +397,7 @@ int _mutt_enter_fname (const char *prompt, char *buf, ssize_t blen, ch = mutt_getch (); if (ch.ch == -1) { CLEARLINE(stdscr, LINES - 1); - return (-1); + return -1; } else if (ch.ch == '?') { mutt_refresh (); @@ -505,13 +506,13 @@ ssize_t mutt_pretty_size(char *s, ssize_t len, ssize_t n) if (n < 1023949) /* 10K - 999K */ /* 51 is magic which causes 10189/10240 to be rounded up to 10 */ - return snprintf(s, len, "%ldK", (n + 51) / 1024); + return snprintf(s, len, "%ldK", (n + 51) / 1024L); if (n < 10433332) /* 1.0M - 9.9M */ return snprintf(s, len, "%3.1fM", n / 1048576.0); /* (10433332 + 52428) / 1048576 = 10 */ - return snprintf (s, len, "%ldM", (n + 52428) / 1048576); + return snprintf (s, len, "%ldM", (n + 52428) / 1048576L); } /*