X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fpgpinvoke.c;h=6a6dd02842a8cdb31f51843460d3f18e3298b97b;hp=312f59eff0fe5142841c81f7266c70044ba56857;hb=8a2967d883cee12f0de4c0cdf0cd594ea96e622b;hpb=1eeaaac6bdcad962c41bf975a32078cc4a0e578c

diff --git a/lib-crypt/pgpinvoke.c b/lib-crypt/pgpinvoke.c
index 312f59e..6a6dd02 100644
--- 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) {
@@ -107,22 +107,18 @@ _mutt_fmt_pgp_command(char *dest, ssize_t destlen,
     }
   }
 
-  if (optional)
-    m_strformat (dest, destlen, ifstring, _mutt_fmt_pgp_command, data,
-                       0);
-  else if (flags & M_FORMAT_OPTIONAL)
-    m_strformat (dest, destlen, elsestring, _mutt_fmt_pgp_command, data,
-                       0);
+  if (flags & M_FORMAT_OPTIONAL)
+    m_strformat(dest, destlen, optional ? ifstr : elstr,
+                _mutt_fmt_pgp_command, data, 0);
 
-  return (src);
+  return src;
 }
 
 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, fmt, _mutt_fmt_pgp_command, cctx, 0);
 }
 
 /*