#define SW (option(OPTMBOXPANE)?SidebarWidth:0)
-#ifdef MIXMASTER
-
#define MIX_CAP_COMPRESS (1 << 0)
#define MIX_CAP_MIDDLEMAN (1 << 1)
#define MIX_CAP_NEWSPOST (1 << 2)
* %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) {
*dest = '\0';
}
- if (optional)
- mutt_FormatString (dest, destlen, ifstring, mutt_attach_fmt, data, 0);
- else if (flags & M_FORMAT_OPTIONAL)
- mutt_FormatString (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);
}
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);
- mutt_FormatString (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,
struct coord *coords = NULL;
MUTTMENU *menu;
- char helpstr[SHORT_STRING];
+ char helpstr[STRING];
short loop = 1;
int op;
if (need_hostname) {
- if (!(fqdn = mutt_fqdn (1))) {
+ if (!(fqdn = mutt_fqdn(1))) {
mutt_error
- _
- ("Please set the hostname variable to a proper value when using mixmaster!");
- return (-1);
+ _("Please set the hostname variable to a proper value when using mixmaster!");
+ return -1;
}
/* Cc and Bcc are empty at this point. */
- rfc822_qualify (msg->env->to, fqdn);
- rfc822_qualify (msg->env->reply_to, fqdn);
- rfc822_qualify (msg->env->mail_followup_to, fqdn);
+ rfc822_qualify(msg->env->to, fqdn);
+ rfc822_qualify(msg->env->reply_to, fqdn);
+ rfc822_qualify(msg->env->mail_followup_to, fqdn);
}
return 0;
return i;
}
-
-#endif