static void snd_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]),
- M_FORMAT_STAT_FILE | M_FORMAT_ARROWCURSOR);
+ m_strformat(b, blen, COLS - SW, AttachFormat, mutt_attach_fmt,
+ ((ATTACHPTR **)menu->data)[num],
+ M_FORMAT_STAT_FILE | (option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0));
}
static void redraw_crypt_lines (HEADER * msg)
static const char *compose_format_str (char *buf, ssize_t buflen, char op,
const char *src, const char *prefix,
- const char *ifstring,
- const char *elsestring,
- unsigned long data, format_flag flags)
+ const char *ifstr,
+ const char *elstr,
+ anytype data, format_flag flags)
{
char fmt[STRING], tmp[STRING];
int optional = (flags & M_FORMAT_OPTIONAL);
- MUTTMENU *menu = (MUTTMENU *) data;
+ MUTTMENU *menu = data.ptr;
*buf = 0;
switch (op) {
return (src);
default:
- snprintf (buf, buflen, "%%%s%c", prefix, op);
+ *buf = 0;
break;
}
- if (optional)
- compose_status_line (buf, buflen, menu, ifstring);
- else if (flags & M_FORMAT_OPTIONAL)
- compose_status_line (buf, buflen, menu, elsestring);
+ if (flags & M_FORMAT_OPTIONAL)
+ compose_status_line(buf, buflen, menu, optional ? ifstr : elstr);
return (src);
}
static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
const char *p)
{
- int w=(COLS-SW)>buflen?buflen:(COLS-SW);
- m_strformat (buf, w, p, compose_format_str,
- (unsigned long) menu, 0);
+ m_strformat(buf, buflen, COLS - SW, p, compose_format_str, menu, 0);
}
/* return values: