Nits from Vikas.

diff --git a/handler.c b/handler.c
index 80da7bc93158e70cb304cdaa911b0d363d4b5c97..23f541e2dc66de8a288610c323c6f877dda08e6c 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -320,7 +320,7 @@ void mutt_decode_uuencoded (STATE *s, BODY *b, int istext)
     if ((fgets(tmps, sizeof(tmps), s->fpin)) == NULL)
       return;
     len -= strlen(tmps);
-    if ((!strncmp (tmps, "begin", 5)) && isspace (tmps[5]))
+    if ((!strncmp (tmps, "begin", 5)) && ISSPACE (tmps[5]))
       break;
   }
   while(len > 0)

diff --git a/keymap.c b/keymap.c
index 74a0eb5dfa49e832bf3ffcb4de0466a56141abff..42d3d74250e6cca9d4687c973092a6021617c4f2 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -477,7 +477,7 @@ int km_expand_key (char *s, size_t len, struct keymap_t *map)
   FOREVER
   {
     strfcpy (s, km_keyname (map->keys[p]), len);
-    len -= (1 + (l = strlen (s)));
+    len -= (l = strlen (s));
 
     if (++p >= map->len || !len)
       return (1);