X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=keymap.c;h=17ee21fdedf94ce71733564ba690818cba5a87bc;hp=2c5bebedfded872fc2e4d183a2a20518d6511e7d;hb=204ddf09d4f46b07c86e36a796788c081b9f7277;hpb=1d0ce70b85c36973b50e5783fe7b72941c81c0a9

diff --git a/keymap.c b/keymap.c
index 2c5bebe..17ee21f 100644
--- a/keymap.c
+++ b/keymap.c
@@ -113,7 +113,7 @@ static int parse_keycode (const char *s)
 static int parsekeys (const char *str, keycode_t * d, int max)
 {
   int n, len = max;
-  char buff[SHORT_STRING];
+  char buff[STRING];
   char c;
   char *s, *t;
 
@@ -596,7 +596,7 @@ void km_init (void)
 
 void km_error_key (int menu)
 {
-  char buf[SHORT_STRING];
+  char buf[STRING];
   struct keymap_t *key;
 
   if (!(key = km_find_func (menu, OP_HELP)))
@@ -740,12 +740,11 @@ int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
 {
   struct binding_t *bindings = NULL;
   char *key;
-  int menu[sizeof (Menus) / sizeof (struct mapping_t) - 1], r =
+  int menu[countof(Menus) - 1], r =
     0, nummenus, i;
 
-  if ((key = parse_keymap (menu, s, sizeof (menu) / sizeof (menu[0]),
-                           &nummenus, err)) == NULL)
-    return (-1);
+  if (!(key = parse_keymap(menu, s, countof(menu), &nummenus, err)))
+    return -1;
 
   /* function to execute */
   mutt_extract_token (buf, s, 0);