always build imap as well.

[apps/madmutt.git] / gnupgparse.c

diff --git a/gnupgparse.c b/gnupgparse.c
index a05d2da..03bab1a 100644 (file)
--- a/gnupgparse.c
+++ b/gnupgparse.c
@@ -42,8 +42,6 @@
 #include "pgp.h"
 #include "charset.h"
 
-/* for hexval */
-
 #include "lib/debug.h"
 
 /****************
@@ -88,7 +86,7 @@ static void fix_uid (char *uid)
     char *buf;
     const char *ib;
     char *ob;
-    size_t ibl, obl;
+    ssize_t ibl, obl;
 
     buf = p_new(char, n + 1);
     ib = uid, ibl = d - uid + 1, ob = buf, obl = n;
@@ -206,29 +204,29 @@ static pgp_key_t parse_pub_line (char *buf, int *is_subkey, pgp_key_t k)
         debug_print (2, ("key id: %s\n", p));
 
         if (!(*is_subkey && option (OPTPGPIGNORESUB)))
-          str_replace (&k->keyid, p);
+          m_strreplace(&k->keyid, p);
         break;
 
       }
     case 6:                    /* timestamp (1998-02-28) */
       {
         char tstr[11];
-        struct tm time;
+        struct tm st_time;
 
         debug_print (2, ("time stamp: %s\n", p));
 
         if (!p)
           break;
-        time.tm_sec = 0;
-        time.tm_min = 0;
-        time.tm_hour = 12;
+        st_time.tm_sec = 0;
+        st_time.tm_min = 0;
+        st_time.tm_hour = 12;
         m_strcpy(tstr, sizeof(tstr), p);
         tstr[4] = '\0';
-        time.tm_year = atoi (tstr) - 1900;
+        st_time.tm_year = atoi (tstr) - 1900;
         tstr[7] = '\0';
-        time.tm_mon = (atoi (tstr + 5)) - 1;
-        time.tm_mday = atoi (tstr + 8);
-        k->gen_time = mutt_mktime (&time, 0);
+        st_time.tm_mon = (atoi (tstr + 5)) - 1;
+        st_time.tm_mday = atoi (tstr + 8);
+        k->gen_time = mutt_mktime (&st_time, 0);
         break;
       }
     case 7:                    /* valid for n days */
@@ -312,7 +310,7 @@ pgp_key_t pgp_get_candidates (pgp_ring_t keyring, LIST * hints)
   if ((devnull = open ("/dev/null", O_RDWR)) == -1)
     return NULL;
 
-  str_replace (&_chs, Charset);
+  m_strreplace(&_chs, Charset);
 
   thepid = pgp_invoke_list_keys (NULL, &fp, NULL, -1, -1, devnull,
                                  keyring, hints);