optimizations, remove horrors.

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

diff --git a/lib-crypt/smime.c b/lib-crypt/smime.c
index 218b442..0178d60 100644 (file)
--- 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,11 +219,9 @@ _mutt_fmt_smime_command (char *dest, ssize_t destlen, char op,
   }
 
   if (optional)
-    mutt_FormatString (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)
-    mutt_FormatString (dest, destlen, elsestring, _mutt_fmt_smime_command,
-                       data, 0);
+    m_strformat(dest, destlen, elstr, _mutt_fmt_smime_command, data, 0);
 
   return (src);
 }
@@ -234,8 +232,7 @@ static void mutt_smime_command (char *d, ssize_t dlen,
                                 struct smime_command_context *cctx,
                                 const char *fmt)
 {
-  mutt_FormatString (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,
@@ -404,12 +401,12 @@ char *smime_ask_for_key (char *prompt, char *mailbox __attribute__((unused)),
     /* Make Helpstring */
     helpstr[0] = 0;
     mutt_make_help (buf, sizeof (buf), _("Exit  "), MENU_SMIME, OP_EXIT);
-    strcat (helpstr, buf);      /* __STRCAT_CHECKED__ */
+    m_strcat(helpstr, sizeof(helpstr), buf);
     mutt_make_help (buf, sizeof (buf), _("Select  "), MENU_SMIME,
                     OP_GENERIC_SELECT_ENTRY);
-    strcat (helpstr, buf);      /* __STRCAT_CHECKED__ */
+    m_strcat(helpstr, sizeof(helpstr), buf);
     mutt_make_help (buf, sizeof (buf), _("Help"), MENU_SMIME, OP_HELP);
-    strcat (helpstr, buf);      /* __STRCAT_CHECKED__ */
+    m_strcat(helpstr, sizeof(helpstr), buf);
 
     /* Create the menu */
     menu = mutt_new_menu ();
@@ -708,8 +705,6 @@ char *smime_findKeys (address_t * to, address_t * cc, address_t * bcc)
   address_t *p, *q;
   int i;
 
-  const char *fqdn = mutt_fqdn (1);
-
   for (i = 0; i < 3; i++) {
     switch (i) {
     case 0:
@@ -730,8 +725,7 @@ char *smime_findKeys (address_t * to, address_t * cc, address_t * bcc)
       last = &((*last)->next);
   }
 
-  if (fqdn)
-    rfc822_qualify (tmp, fqdn);
+  rfc822_qualify(tmp, mutt_fqdn(1));
 
   address_list_uniq(tmp);
 
@@ -754,7 +748,7 @@ char *smime_findKeys (address_t * to, address_t * cc, address_t * bcc)
 
     keylist_size += m_strlen(keyID) + 2;
     p_realloc(&keylist, keylist_size);
-    sprintf (keylist + keylist_used, "%s\n", keyID);    /* __SPRINTF_CHECKED__ */
+    sprintf (keylist + keylist_used, "%s\n", keyID);
     keylist_used = m_strlen(keylist);
 
     address_list_wipe(&addr);
@@ -1912,10 +1906,6 @@ int smime_send_menu (HEADER * msg, int *redraw)
       /* probably need a different passphrase */
       crypt_smime_void_passphrase ();
     }
-#if 0
-    else
-      msg->security &= ~SIGN;
-#endif
 
     *redraw = REDRAW_FULL;
     break;