more constness.

[apps/madmutt.git] / status.c

diff --git a/status.c b/status.c
index 099157d..aa94a86 100644 (file)
--- a/status.c
+++ b/status.c
@@ -62,7 +62,8 @@ static const char *status_format_str (char *buf, size_t buflen, char op,
                                       const char *elsestring,
                                       unsigned long data, format_flag flags)
 {
-  char fmt[SHORT_STRING], tmp[SHORT_STRING], *cp, *p;
+  char fmt[SHORT_STRING], tmp[SHORT_STRING];
+  const char *cp, *p;
   int count, optional = (flags & M_FORMAT_OPTIONAL);
   MUTTMENU *menu = (MUTTMENU *) data;
 
@@ -316,6 +317,8 @@ void menu_status_line (char* buf, size_t len, MUTTMENU* menu, const char* p) {
    * if we have enough space for buffer, format lines to $COLS-$SidebarWidth
    * only to not wrap past end of screen
    */
-  mutt_FormatString (buf, (COLS-SW)>len?len:(COLS-SW), p, status_format_str,
+  int width = COLS - SW;
+  mutt_FormatString (buf, (width >= len ? len : (width + 1)),
+                     p, status_format_str,
                      (unsigned long) menu, 0);
 }