*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, 0, optional ? ifstr : elstr,
+ mutt_attach_fmt, data, 0);
return (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,
+ m_strformat(b, blen, COLS - SW, MixEntryFormat, mix_entry_fmt,
type2_list[num],
option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
}