let m_strformat accept NULL formats.

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

diff --git a/lib-crypt/pgpinvoke.c b/lib-crypt/pgpinvoke.c
index 8feba18..6a6dd02 100644 (file)
--- a/lib-crypt/pgpinvoke.c
+++ b/lib-crypt/pgpinvoke.c
@@ -107,19 +107,18 @@ _mutt_fmt_pgp_command(char *dest, ssize_t destlen,
     }
   }
 
-  if (optional)
-    m_strformat(dest, destlen, ifstr, _mutt_fmt_pgp_command, data, 0);
-  else if (flags & M_FORMAT_OPTIONAL)
-    m_strformat(dest, destlen, elstr, _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, cctx, 0);
+    m_strformat(d, dlen, fmt, _mutt_fmt_pgp_command, cctx, 0);
 }
 
 /*