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

[apps/madmutt.git] / recvattach.c

diff --git a/recvattach.c b/recvattach.c
index ab21e54..8d94955 100644 (file)
--- a/recvattach.c
+++ b/recvattach.c
@@ -139,19 +139,18 @@ ATTACHPTR **mutt_gen_attach_list (BODY * m,
  * %s = size
  * %u = unlink 
  */
-const char *mutt_attach_fmt (char *dest,
-                             ssize_t destlen,
+const char *mutt_attach_fmt (char *dest, ssize_t destlen,
                              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[16];
   char tmp[STRING];
   char charset[STRING];
-  ATTACHPTR *aptr = (ATTACHPTR *) data;
+  ATTACHPTR *aptr = data.ptr;
   int optional = (flags & M_FORMAT_OPTIONAL);
   ssize_t l;
 
@@ -313,9 +312,9 @@ const char *mutt_attach_fmt (char *dest,
   }
 
   if (optional)
-    m_strformat (dest, destlen, ifstring, mutt_attach_fmt, data, 0);
+    m_strformat (dest, destlen, ifstr, mutt_attach_fmt, data, 0);
   else if (flags & M_FORMAT_OPTIONAL)
-    m_strformat (dest, destlen, elsestring, mutt_attach_fmt, data, 0);
+    m_strformat (dest, destlen, elstr, mutt_attach_fmt, data, 0);
   return (src);
 }
 
@@ -323,7 +322,7 @@ static void attach_entry (char *b, ssize_t blen, MUTTMENU * menu, int num)
 {
   int w=(COLS-SW)>blen?blen:(COLS-SW);
   m_strformat (b, w, NONULL (AttachFormat), mutt_attach_fmt,
-                     (unsigned long) (((ATTACHPTR **) menu->data)[num]),
+                     ((ATTACHPTR **) menu->data)[num],
                      option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }