/* This is almost identical to ppgp's invoking interface. */
static const char *
-_mutt_fmt_smime_command (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)
+_mutt_fmt_smime_command (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];
- struct smime_command_context *cctx = (struct smime_command_context *) data;
+ struct smime_command_context *cctx = data.ptr;
int optional = (flags & M_FORMAT_OPTIONAL);
switch (op) {
break;
}
- if (optional)
- mutt_FormatString (dest, destlen, ifstring, _mutt_fmt_smime_command,
- data, 0);
- else if (flags & M_FORMAT_OPTIONAL)
- mutt_FormatString (dest, destlen, elsestring, _mutt_fmt_smime_command,
- data, 0);
+ if (flags & M_FORMAT_OPTIONAL)
+ m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+ _mutt_fmt_smime_command, data, 0);
- return (src);
+ return src;
}
struct smime_command_context *cctx,
const char *fmt)
{
- mutt_FormatString (d, dlen, NONULL (fmt), _mutt_fmt_smime_command,
- (unsigned long) cctx, 0);
+ m_strformat(d, dlen, 0, fmt, _mutt_fmt_smime_command, cctx, 0);
}
static pid_t smime_invoke (FILE ** smimein, FILE ** smimeout,
address_t *p, *q;
int i;
- const char *fqdn = mutt_fqdn (1);
-
for (i = 0; i < 3; i++) {
switch (i) {
case 0:
last = &((*last)->next);
}
- if (fqdn)
- rfc822_qualify (tmp, fqdn);
+ rfc822_qualify(tmp, mutt_fqdn(1));
address_list_uniq(tmp);