projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
the ‘kids don't do this at home’ commit.
[apps/madmutt.git]
/
lib-crypt
/
smime.c
diff --git
a/lib-crypt/smime.c
b/lib-crypt/smime.c
index
bbaa198
..
0178d60
100644
(file)
--- a/
lib-crypt/smime.c
+++ b/
lib-crypt/smime.c
@@
-115,11
+115,11
@@
int smime_valid_passphrase (void)
static const char *
_mutt_fmt_smime_command (char *dest, ssize_t destlen, char op,
const char *src, const char *prefix,
static const char *
_mutt_fmt_smime_command (char *dest, ssize_t destlen, char op,
const char *src, const char *prefix,
- const char *ifstr
ing, const char *elsestring
,
-
unsigned long
data, format_flag flags)
+ const char *ifstr
, const char *elstr
,
+
anytype
data, format_flag flags)
{
char fmt[16];
{
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) {
int optional = (flags & M_FORMAT_OPTIONAL);
switch (op) {
@@
-219,9
+219,9
@@
_mutt_fmt_smime_command (char *dest, ssize_t destlen, char op,
}
if (optional)
}
if (optional)
- m_strformat(dest, destlen, ifstr
ing
, _mutt_fmt_smime_command, data, 0);
+ m_strformat(dest, destlen, ifstr, _mutt_fmt_smime_command, data, 0);
else if (flags & M_FORMAT_OPTIONAL)
else if (flags & M_FORMAT_OPTIONAL)
- m_strformat(dest, destlen, els
estring
, _mutt_fmt_smime_command, data, 0);
+ m_strformat(dest, destlen, els
tr
, _mutt_fmt_smime_command, data, 0);
return (src);
}
return (src);
}
@@
-232,8
+232,7
@@
static void mutt_smime_command (char *d, ssize_t dlen,
struct smime_command_context *cctx,
const char *fmt)
{
struct smime_command_context *cctx,
const char *fmt)
{
- m_strformat(d, dlen, NONULL (fmt), _mutt_fmt_smime_command,
- (unsigned long)cctx, 0);
+ m_strformat(d, dlen, NONULL (fmt), _mutt_fmt_smime_command, cctx, 0);
}
static pid_t smime_invoke (FILE ** smimein, FILE ** smimeout,
}
static pid_t smime_invoke (FILE ** smimein, FILE ** smimeout,