X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fsmime.c;h=0178d60e286325be241053e4257c4a1839871396;hp=bbaa198173099b8669dd4d0cce8eb2545de9086c;hb=38dacbf03fe1a0daa9ce426caaef5582b90006b2;hpb=27c3007f2cfb52db5a357eaa2a8313a5ab03c93d

diff --git a/lib-crypt/smime.c b/lib-crypt/smime.c
index bbaa198..0178d60 100644
--- 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,
-                         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 smime_command_context *cctx = (struct smime_command_context *) data;
+  struct smime_command_context *cctx = data.ptr;
   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)
-    m_strformat(dest, destlen, ifstring, _mutt_fmt_smime_command, data, 0);
+    m_strformat(dest, destlen, ifstr, _mutt_fmt_smime_command, data, 0);
   else if (flags & M_FORMAT_OPTIONAL)
-    m_strformat(dest, destlen, elsestring, _mutt_fmt_smime_command, data, 0);
+    m_strformat(dest, destlen, elstr, _mutt_fmt_smime_command, data, 0);
 
   return (src);
 }
@@ -232,8 +232,7 @@ static void mutt_smime_command (char *d, ssize_t dlen,
                                 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,