X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=remailer.c;h=f8f38822437bc85a31f16e8eed27f20d8204a142;hp=40f5bba832a80b62cffe738830d1f009cf2fc22e;hb=20deb4ce5f654f7c112a7a4c1cf154d00847cf30;hpb=1eeaaac6bdcad962c41bf975a32078cc4a0e578c

diff --git a/remailer.c b/remailer.c
index 40f5bba..f8f3882 100644
--- a/remailer.c
+++ b/remailer.c
@@ -340,17 +340,13 @@ static const char *mix_format_caps (remailer_t * r)
  * %a	address
  *
  */
-static const char *mix_entry_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)
+static const char *
+mix_entry_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];
-    remailer_t *remailer = (remailer_t *) data;
+    remailer_t *remailer = data.ptr;
     int optional = (flags & M_FORMAT_OPTIONAL);
 
     switch (op) {
@@ -387,10 +383,9 @@ static const char *mix_entry_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);
+    if (flags & M_FORMAT_OPTIONAL)
+        m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+                    mutt_attach_fmt, data, 0);
     return (src);
 }
 
@@ -399,10 +394,10 @@ static const char *mix_entry_fmt (char *dest,
 static void mix_entry (char *b, ssize_t blen, MUTTMENU * menu, int num)
 {
     remailer_t **type2_list = (remailer_t **) menu->data;
-    int w = (COLS-SW) > blen ? blen : (COLS-SW);
 
-    m_strformat (b, w, NONULL (MixEntryFormat), mix_entry_fmt,
-                       (unsigned long) type2_list[num], M_FORMAT_ARROWCURSOR);
+    m_strformat(b, blen, COLS - SW, MixEntryFormat, mix_entry_fmt,
+                type2_list[num],
+                option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }
 
 static int mix_chain_add (mixchain_t * chain, const char *s,