X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-crypt%2Fpgpkey.c;h=a4549cf0cc719a5aaf455c0c156f37c80c918cb1;hp=d9e2de32f2269d9e357f0753b4c474b4d0a0c832;hb=35f4e8cefa22d98782a720e4df428a1ce3be2237;hpb=108f3c7ab59844591f7540347914ea57be5245e2

diff --git a/lib-crypt/pgpkey.c b/lib-crypt/pgpkey.c
index d9e2de3..a4549cf 100644
--- a/lib-crypt/pgpkey.c
+++ b/lib-crypt/pgpkey.c
@@ -17,7 +17,6 @@
 #include <lib-lib/ascii.h>
 #include <lib-lib/macros.h>
 #include <lib-lib/file.h>
-#include <lib-lib/debug.h>
 
 #include <lib-mime/mime.h>
 
@@ -111,18 +110,15 @@ static pgp_key_t pgp_principal_key (pgp_key_t key)
  */
 
 typedef struct pgp_entry {
-  size_t num;
+  ssize_t num;
   pgp_uid_t *uid;
 } pgp_entry_t;
 
-static const char *pgp_entry_fmt (char *dest,
-                                  size_t destlen,
-                                  char op,
-                                  const char *src,
-                                  const char *prefix,
-                                  const char *ifstring,
-                                  const char *elsestring,
-                                  unsigned long data, format_flag flags)
+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)
 {
   char fmt[16];
   pgp_entry_t *entry;
@@ -150,7 +146,7 @@ static const char *pgp_entry_fmt (char *dest,
       char buf2[SHORT_STRING], *p;
       int do_locales;
       struct tm *tm;
-      size_t len;
+      ssize_t len;
 
       p = dest;
 
@@ -264,7 +260,7 @@ static const char *pgp_entry_fmt (char *dest,
   return (src);
 }
 
-static void pgp_entry (char *s, size_t l, MUTTMENU * menu, int num)
+static void pgp_entry (char *s, ssize_t l, MUTTMENU * menu, int num)
 {
   pgp_uid_t **KeyTable = (pgp_uid_t **) menu->data;
   pgp_entry_t entry;
@@ -583,26 +579,26 @@ static pgp_key_t pgp_select_key (pgp_key_t keys, address_t * p, const char *s)
       if (option (OPTPGPCHECKTRUST) &&
           (!pgp_id_is_valid (KeyTable[menu->current])
            || !pgp_id_is_strong (KeyTable[menu->current]))) {
-        const char *s = "";
+        const char *q = "";
         char buff[LONG_STRING];
 
         if (KeyTable[menu->current]->flags & KEYFLAG_CANTUSE)
-          s = N_("ID is expired/disabled/revoked.");
+          q = N_("ID is expired/disabled/revoked.");
         else
           switch (KeyTable[menu->current]->trust & 0x03) {
           case 0:
-            s = N_("ID has undefined validity.");
+            q = N_("ID has undefined validity.");
             break;
           case 1:
-            s = N_("ID is not valid.");
+            q = N_("ID is not valid.");
             break;
           case 2:
-            s = N_("ID is only marginally valid.");
+            q = N_("ID is only marginally valid.");
             break;
           }
 
         snprintf (buff, sizeof (buff),
-                  _("%s Do you really want to use the key?"), _(s));
+                  _("%s Do you really want to use the key?"), _(q));
 
         if (mutt_yesorno (buff, M_NO) != M_YES) {
           mutt_clear_error ();
@@ -817,16 +813,10 @@ pgp_key_t pgp_getkeybyaddr (address_t * a, short abilities, pgp_ring_t keyring)
   if (!keys)
     return NULL;
 
-  debug_print (5, ("looking for %s <%s>\n", a->personal, a->mailbox));
-
   for (k = keys; k; k = kn) {
     kn = k->next;
 
-    debug_print (5, ("  looking at key: %s\n", pgp_keyid (k)));
-
     if (abilities && !(k->flags & abilities)) {
-      debug_print (5, ("  insufficient abilities: Has %x, want %x\n",
-                  k->flags, abilities));
       continue;
     }
 
@@ -932,14 +922,12 @@ pgp_key_t pgp_getkeybystr (char *p, short abilities, pgp_ring_t keyring)
     match = 0;
 
     for (a = k->address; a; a = a->next) {
-      debug_print (5, ("matching \"%s\" against key %s, \"%s\":\n", p, pgp_keyid (k), a->addr));
       if (!*p || m_strcasecmp(p, pgp_keyid (k)) == 0
           || (!m_strncasecmp(p, "0x", 2)
               && !m_strcasecmp(p + 2, pgp_keyid (k)))
           || (option (OPTPGPLONGIDS) && !m_strncasecmp(p, "0x", 2)
               && !m_strcasecmp(p + 2, k->keyid + 8))
           || m_stristr(a->addr, p)) {
-        debug_print (5, ("match.\n"));
         match = 1;
         break;
       }