X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvattach.c;h=301b12e8a3690aa12ba8cc5b5089011d5ba0a40a;hp=ab21e5442e297ebd5f9181e1c58fd7f7943c996c;hb=486de69aa30a7bfca3625a1b521411dc7a15c55c;hpb=3242c00b2d3f7f1c1554bcebfb8a390fddea095f

diff --git a/recvattach.c b/recvattach.c
index ab21e54..301b12e 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -139,19 +139,15 @@ ATTACHPTR **mutt_gen_attach_list (BODY * m,
  * %s = size
  * %u = unlink 
  */
-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 *
+mutt_attach_fmt(char *dest, ssize_t destlen, char op, const char *src,
+                const char *prefix, 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;
 
@@ -312,19 +308,17 @@ const char *mutt_attach_fmt (char *dest,
     *dest = 0;
   }
 
-  if (optional)
-    m_strformat (dest, destlen, ifstring, mutt_attach_fmt, data, 0);
-  else if (flags & M_FORMAT_OPTIONAL)
-    m_strformat (dest, destlen, elsestring, mutt_attach_fmt, data, 0);
-  return (src);
+  if (flags & M_FORMAT_OPTIONAL)
+    m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+                mutt_attach_fmt, data, 0);
+  return src;
 }
 
-static void attach_entry (char *b, ssize_t blen, MUTTMENU * menu, int num)
+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]),
-                     option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
+    m_strformat(b, blen, COLS - SW, AttachFormat, mutt_attach_fmt,
+                ((ATTACHPTR **) menu->data)[num],
+                option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }
 
 int mutt_tag_attach (MUTTMENU * menu, int n, int m)