the ‘kids don't do this at home’ commit.

[apps/madmutt.git] / lib-crypt / pgpkey.c

diff --git a/lib-crypt/pgpkey.c b/lib-crypt/pgpkey.c
index 44facd6..b1ded7c 100644 (file)
--- a/lib-crypt/pgpkey.c
+++ b/lib-crypt/pgpkey.c
@@ -99,8 +99,8 @@ typedef struct pgp_entry {
 static const char *
 pgp_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)
+               const char *ifstr, const char *elstr,
+               anytype data, format_flag flags)
 {
   char fmt[16];
   pgp_entry_t *entry;
@@ -109,7 +109,7 @@ pgp_entry_fmt (char *dest, ssize_t destlen, char op,
   int kflags = 0;
   int optional = (flags & M_FORMAT_OPTIONAL);
 
-  entry = (pgp_entry_t *) data;
+  entry = data.ptr;
   uid = entry->uid;
   key = uid->parent;
   pkey = pgp_principal_key (key);
@@ -236,9 +236,9 @@ pgp_entry_fmt (char *dest, ssize_t destlen, char op,
   }
 
   if (optional)
-    m_strformat (dest, destlen, ifstring, mutt_attach_fmt, data, 0);
+    m_strformat (dest, destlen, ifstr, mutt_attach_fmt, data, 0);
   else if (flags & M_FORMAT_OPTIONAL)
-    m_strformat (dest, destlen, elsestring, mutt_attach_fmt, data, 0);
+    m_strformat (dest, destlen, elstr, mutt_attach_fmt, data, 0);
   return (src);
 }
 
@@ -251,7 +251,7 @@ static void pgp_entry (char *s, ssize_t l, MUTTMENU * menu, int num)
   entry.num = num + 1;
 
   m_strformat(s, l, NONULL (PgpEntryFormat), pgp_entry_fmt,
-              (unsigned long)&entry,
+              (void*)&entry,
               option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }