a whole lot of size_t -> ssize_t.

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

diff --git a/lib-crypt/pgpkey.c b/lib-crypt/pgpkey.c
index d9e2de3..ef99d75 100644 (file)
--- a/lib-crypt/pgpkey.c
+++ b/lib-crypt/pgpkey.c
@@ -111,18 +111,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 +147,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 +261,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 +580,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 ();