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

[apps/madmutt.git] / browser.c

diff --git a/browser.c b/browser.c
index 4af5dca..f8fbb3d 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -147,14 +147,14 @@ static int link_is_dir (const char *folder, const char *path)
 
 static const char *folder_format_str (char *dest, ssize_t destlen, char op,
                                       const char *src, const char *fmt,
-                                      const char *ifstring,
-                                      const char *elsestring,
-                                      unsigned long data, format_flag flags)
+                                      const char *ifstr,
+                                      const char *elstr,
+                                      anytype data, format_flag flags)
 {
   char fn[STRING], tmp[STRING], permission[11], date[16];
   const char *t_fmt;
   time_t tnow;
-  FOLDER *folder = (FOLDER *) data;
+  FOLDER *folder = data.ptr;
   struct passwd *pw;
   struct group *gr;
   int optional = (flags & M_FORMAT_OPTIONAL);
@@ -301,9 +301,9 @@ static const char *folder_format_str (char *dest, ssize_t destlen, char op,
   }
 
   if (optional)
-    m_strformat (dest, destlen, ifstring, folder_format_str, data, 0);
+    m_strformat (dest, destlen, ifstr, folder_format_str, data, 0);
   else if (flags & M_FORMAT_OPTIONAL)
-    m_strformat (dest, destlen, elsestring, folder_format_str, data, 0);
+    m_strformat (dest, destlen, elstr, folder_format_str, data, 0);
 
   return (src);
 }
@@ -311,13 +311,12 @@ static const char *folder_format_str (char *dest, ssize_t destlen, char op,
 #ifdef USE_NNTP
 static const char *newsgroup_format_str (char *dest, ssize_t destlen, char op,
                                          const char *src, const char *fmt,
-                                         const char *ifstring,
-                                         const char *elsestring,
-                                         unsigned long data,
-                                         format_flag flags)
+                                         const char *ifstr,
+                                         const char *elstr,
+                                         anytype data, format_flag flags)
 {
   char fn[STRING], tmp[STRING];
-  FOLDER *folder = (FOLDER *) data;
+  FOLDER *folder = data.ptr;
 
   switch (op) {
   case 'C':
@@ -350,10 +349,10 @@ static const char *newsgroup_format_str (char *dest, ssize_t destlen, char op,
   case 's':
     if (flags & M_FORMAT_OPTIONAL) {
       if (folder->ff->nd->unread != 0)
-        m_strformat (dest, destlen, ifstring, newsgroup_format_str,
+        m_strformat (dest, destlen, ifstr, newsgroup_format_str,
                            data, flags);
       else
-        m_strformat (dest, destlen, elsestring, newsgroup_format_str,
+        m_strformat (dest, destlen, elstr, newsgroup_format_str,
                            data, flags);
     }
     else if (Context && Context->data == folder->ff->nd) {
@@ -646,12 +645,12 @@ static void folder_entry (char *s, ssize_t slen, MUTTMENU * menu, int num)
 #ifdef USE_NNTP
   if (option (OPTNEWS))
     m_strformat(s, slen, NONULL (GroupFormat), newsgroup_format_str,
-                (unsigned long)&folder,
+                (void*)&folder,
                 option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
   else
 #endif
     m_strformat(s, slen, NONULL (FolderFormat), folder_format_str,
-               (unsigned long)&folder,
+               (void *)&folder,
                option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }