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

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

diff --git a/lib-crypt/pgpinvoke.c b/lib-crypt/pgpinvoke.c
index a8f0bb8..8feba18 100644 (file)
--- a/lib-crypt/pgpinvoke.c
+++ b/lib-crypt/pgpinvoke.c
@@ -37,11 +37,11 @@ struct pgp_command_context {
 static const char *
 _mutt_fmt_pgp_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)
+                      const char *ifstr, const char *elstr,
+                      anytype data, format_flag flags)
 {
   char fmt[16];
-  struct pgp_command_context *cctx = (struct pgp_command_context *) data;
+  struct pgp_command_context *cctx = data.ptr;
   int optional = (flags & M_FORMAT_OPTIONAL);
 
   switch (op) {
@@ -108,9 +108,9 @@ _mutt_fmt_pgp_command(char *dest, ssize_t destlen,
   }
 
   if (optional)
-    m_strformat(dest, destlen, ifstring, _mutt_fmt_pgp_command, data, 0);
+    m_strformat(dest, destlen, ifstr, _mutt_fmt_pgp_command, data, 0);
   else if (flags & M_FORMAT_OPTIONAL)
-    m_strformat(dest, destlen, elsestring, _mutt_fmt_pgp_command, data, 0);
+    m_strformat(dest, destlen, elstr, _mutt_fmt_pgp_command, data, 0);
 
   return (src);
 }
@@ -119,8 +119,7 @@ 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,
-                     (unsigned long) cctx, 0);
+  m_strformat(d, dlen, NONULL (fmt), _mutt_fmt_pgp_command, cctx, 0);
 }
 
 /*