X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=recvattach.c;h=1c21de73dd0858e39adbc951e9cb02e24335404a;hp=8d94955642286abb548552f320d90c4e2526f480;hb=8a2967d883cee12f0de4c0cdf0cd594ea96e622b;hpb=6896715a0d62173a620b2377dba8e6d2058c1ee2

diff --git a/recvattach.c b/recvattach.c
index 8d94955..1c21de7 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -311,19 +311,19 @@ const char *mutt_attach_fmt (char *dest, ssize_t destlen,
     *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);
-  return (src);
+  if (flags & M_FORMAT_OPTIONAL)
+    m_strformat(dest, destlen, 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,
-                     ((ATTACHPTR **) menu->data)[num],
-                     option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
+    int w = MIN(COLS - SW, blen);
+
+    m_strformat(b, w, AttachFormat, mutt_attach_fmt,
+                ((ATTACHPTR **) menu->data)[num],
+                option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }
 
 int mutt_tag_attach (MUTTMENU * menu, int n, int m)