}
}
- if (optional)
- m_strformat(dest, destlen, ifstr, _mutt_fmt_pgp_command, data, 0);
- else if (flags & M_FORMAT_OPTIONAL)
- m_strformat(dest, destlen, elstr, _mutt_fmt_pgp_command, data, 0);
+ if (flags & M_FORMAT_OPTIONAL)
+ m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+ _mutt_fmt_pgp_command, data, 0);
- return (src);
+ return src;
}
static void
mutt_pgp_command(char *d, ssize_t dlen, struct pgp_command_context *cctx,
const char *fmt)
{
- m_strformat(d, dlen, NONULL (fmt), _mutt_fmt_pgp_command, cctx, 0);
+ m_strformat(d, dlen, 0, fmt, _mutt_fmt_pgp_command, cctx, 0);
}
/*