let m_strformat accept NULL formats.

[apps/madmutt.git] / remailer.c

diff --git a/remailer.c b/remailer.c
index 4722c1a..a261f1b 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -383,10 +383,9 @@ mix_entry_fmt (char *dest, ssize_t destlen, char op, const char *src,
         *dest = '\0';
     }
 
-    if (optional)
-        m_strformat (dest, destlen, ifstr, mutt_attach_fmt, data, 0);
-    else if (flags & M_FORMAT_OPTIONAL)
-        m_strformat (dest, destlen, elstr, mutt_attach_fmt, data, 0);
+    if (flags & M_FORMAT_OPTIONAL)
+        m_strformat (dest, destlen, optional ? ifstr : elstr,
+                     mutt_attach_fmt, data, 0);
     return (src);
 }
 
@@ -395,10 +394,9 @@ mix_entry_fmt (char *dest, ssize_t destlen, char op, const char *src,
 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,
-                type2_list[num],
+    int w = MIN(COLS - SW, blen);
+    m_strformat(b, w, MixEntryFormat, mix_entry_fmt, type2_list[num],
                 option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }