let m_strformat accept NULL formats.

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

diff --git a/lib-crypt/pgpkey.c b/lib-crypt/pgpkey.c
index 16d9e4c..87dee7d 100644 (file)
--- a/lib-crypt/pgpkey.c
+++ b/lib-crypt/pgpkey.c
@@ -99,8 +99,8 @@ typedef struct pgp_entry {
 static const char *
 pgp_entry_fmt (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];
   pgp_entry_t *entry;
@@ -109,7 +109,7 @@ pgp_entry_fmt (char *dest, ssize_t destlen, char op,
   int kflags = 0;
   int optional = (flags & M_FORMAT_OPTIONAL);
 
-  entry = (pgp_entry_t *) data;
+  entry = data.ptr;
   uid = entry->uid;
   key = uid->parent;
   pkey = pgp_principal_key (key);
@@ -125,7 +125,7 @@ pgp_entry_fmt (char *dest, ssize_t destlen, char op,
 
     {
       const char *cp;
-      char buf2[SHORT_STRING], *p;
+      char buf2[STRING], *p;
       int do_locales;
       struct tm *tm;
       ssize_t len;
@@ -235,11 +235,10 @@ pgp_entry_fmt (char *dest, ssize_t destlen, char op,
     *dest = '\0';
   }
 
-  if (optional)
-    mutt_FormatString (dest, destlen, ifstring, mutt_attach_fmt, data, 0);
-  else if (flags & M_FORMAT_OPTIONAL)
-    mutt_FormatString (dest, destlen, elsestring, mutt_attach_fmt, data, 0);
-  return (src);
+  if (flags & M_FORMAT_OPTIONAL)
+    m_strformat(dest, destlen, optional ? ifstr : elstr,
+                mutt_attach_fmt, data, 0);
+  return src;
 }
 
 static void pgp_entry (char *s, ssize_t l, MUTTMENU * menu, int num)
@@ -250,8 +249,8 @@ static void pgp_entry (char *s, ssize_t l, MUTTMENU * menu, int num)
   entry.uid = KeyTable[num];
   entry.num = num + 1;
 
-  mutt_FormatString (s, l, NONULL (PgpEntryFormat), pgp_entry_fmt,
-                     (unsigned long) &entry, M_FORMAT_ARROWCURSOR);
+  m_strformat(s, l, PgpEntryFormat, pgp_entry_fmt, &entry,
+              option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
 }
 
 static int _pgp_compare_address (const void *a, const void *b)
@@ -406,7 +405,7 @@ static pgp_key_t pgp_select_key (pgp_key_t keys, address_t * p, const char *s)
   pgp_uid_t **KeyTable;
   MUTTMENU *menu;
   int i, done = 0;
-  char helpstr[SHORT_STRING], buf[LONG_STRING], tmpbuf[STRING];
+  char helpstr[STRING], buf[LONG_STRING], tmpbuf[STRING];
   char cmd[LONG_STRING], tempfile[_POSIX_PATH_MAX];
   FILE *fp, *devnull;
   pid_t thepid;
@@ -466,15 +465,15 @@ static pgp_key_t pgp_select_key (pgp_key_t keys, address_t * p, const char *s)
 
   helpstr[0] = 0;
   mutt_make_help (buf, sizeof (buf), _("Exit  "), MENU_PGP, OP_EXIT);
-  strcat (helpstr, buf);        /* __STRCAT_CHECKED__ */
+  m_strcat(helpstr, sizeof(helpstr), buf);
   mutt_make_help (buf, sizeof (buf), _("Select  "), MENU_PGP,
                   OP_GENERIC_SELECT_ENTRY);
-  strcat (helpstr, buf);        /* __STRCAT_CHECKED__ */
+  m_strcat(helpstr, sizeof(helpstr), buf);
   mutt_make_help (buf, sizeof (buf), _("Check key  "), MENU_PGP,
                   OP_VERIFY_KEY);
-  strcat (helpstr, buf);        /* __STRCAT_CHECKED__ */
+  m_strcat(helpstr, sizeof(helpstr), buf);
   mutt_make_help (buf, sizeof (buf), _("Help"), MENU_PGP, OP_HELP);
-  strcat (helpstr, buf);        /* __STRCAT_CHECKED__ */
+  m_strcat(helpstr, sizeof(helpstr), buf);
 
   menu = mutt_new_menu ();
   menu->max = i;
@@ -500,7 +499,7 @@ static pgp_key_t pgp_select_key (pgp_key_t keys, address_t * p, const char *s)
 
     case OP_VERIFY_KEY:
 
-      if ((devnull = fopen ("/dev/null", "w")) == NULL) {       /* __FOPEN_CHECKED__ */
+      if ((devnull = fopen("/dev/null", "w")) == NULL) {
         mutt_perror (_("Can't open /dev/null"));
 
         break;
@@ -617,7 +616,7 @@ pgp_key_t pgp_ask_for_key (char *tag, char *whatfor,
                            short abilities, pgp_ring_t keyring)
 {
   pgp_key_t key;
-  char resp[SHORT_STRING];
+  char resp[STRING];
   struct pgp_cache *l = NULL;
 
   mutt_clear_error ();
@@ -694,7 +693,7 @@ BODY *pgp_make_key_attachment (char *tempf)
     return NULL;
   }
 
-  if ((devnull = fopen ("/dev/null", "w")) == NULL) {   /* __FOPEN_CHECKED__ */
+  if ((devnull = fopen("/dev/null", "w")) == NULL) {
     mutt_perror (_("Can't open /dev/null"));
 
     m_fclose(&tempfp);