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
/
crypt-gpgme.c
diff --git
a/lib-crypt/crypt-gpgme.c
b/lib-crypt/crypt-gpgme.c
index
7b85ab6
..
1c6990b
100644
(file)
--- a/
lib-crypt/crypt-gpgme.c
+++ b/
lib-crypt/crypt-gpgme.c
@@
-2126,8
+2126,8
@@
int smime_gpgme_application_handler (BODY * a, STATE * s)
static const char *
crypt_entry_fmt (char *dest, ssize_t destlen, char op,
const char *src, const char *prefix,
static const char *
crypt_entry_fmt (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];
crypt_entry_t *entry;
{
char fmt[16];
crypt_entry_t *entry;
@@
-2137,7
+2137,7
@@
crypt_entry_fmt (char *dest, ssize_t destlen, char op,
const char *s = NULL;
unsigned long val;
const char *s = NULL;
unsigned long val;
- entry =
(crypt_entry_t *) data
;
+ entry =
data.ptr
;
key = entry->key;
/* if (isupper ((unsigned char) op)) */
key = entry->key;
/* if (isupper ((unsigned char) op)) */
@@
-2309,9
+2309,9
@@
crypt_entry_fmt (char *dest, ssize_t destlen, char op,
}
if (optional)
}
if (optional)
- m_strformat (dest, destlen, ifstr
ing
, mutt_attach_fmt, data, 0);
+ m_strformat (dest, destlen, ifstr, mutt_attach_fmt, data, 0);
else if (flags & M_FORMAT_OPTIONAL)
else if (flags & M_FORMAT_OPTIONAL)
- m_strformat (dest, destlen, els
estring
, mutt_attach_fmt, data, 0);
+ m_strformat (dest, destlen, els
tr
, mutt_attach_fmt, data, 0);
return (src);
}
return (src);
}
@@
-2325,7
+2325,7
@@
static void crypt_entry (char *s, ssize_t l, MUTTMENU * menu, int num)
entry.num = num + 1;
m_strformat(s, l, NONULL (PgpEntryFormat), crypt_entry_fmt,
entry.num = num + 1;
m_strformat(s, l, NONULL (PgpEntryFormat), crypt_entry_fmt,
- (
unsigned long)
&entry,
+ (
void*)
&entry,
option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
}
option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
}