the ‘kids don't do this at home’ commit.

[apps/madmutt.git] / lib-ui / status.c

diff --git a/lib-ui/status.c b/lib-ui/status.c
index 3da31d9..ffbdaee 100644 (file)
--- a/lib-ui/status.c
+++ b/lib-ui/status.c
@@ -48,14 +48,14 @@ static char *get_sort_str (char *buf, ssize_t buflen, int method)
  * %V = currently active limit pattern [option] */
 static const char *status_format_str (char *buf, ssize_t buflen, char op,
                                       const char *src, const char *prefix,
-                                      const char *ifstring,
-                                      const char *elsestring,
-                                      unsigned long data, format_flag flags)
+                                      const char *ifstr,
+                                      const char *elstr,
+                                      anytype data, format_flag flags)
 {
   char fmt[STRING], tmp[STRING];
   const char *cp, *p;
   int count, optional = (flags & M_FORMAT_OPTIONAL);
-  MUTTMENU *menu = (MUTTMENU *) data;
+  MUTTMENU *menu = data.ptr;
 
   *buf = 0;
   switch (op) {
@@ -280,9 +280,9 @@ static const char *status_format_str (char *buf, ssize_t buflen, char op,
   }
 
   if (optional)
-    menu_status_line (buf, buflen, menu, ifstring);
+    menu_status_line (buf, buflen, menu, ifstr);
   else if (flags & M_FORMAT_OPTIONAL)
-    menu_status_line (buf, buflen, menu, elsestring);
+    menu_status_line (buf, buflen, menu, elstr);
 
   return (src);
 }
@@ -293,7 +293,6 @@ void menu_status_line (char* buf, ssize_t len, MUTTMENU* menu, const char* p) {
    * only to not wrap past end of screen
    */
   int width = COLS - SW;
-  m_strformat (buf, (width >= len ? len : (width + 1)),
-                     p, status_format_str,
-                     (unsigned long) menu, 0);
+  m_strformat(buf, (width >= len ? len : (width + 1)), p, status_format_str,
+              menu, 0);
 }