X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=keymap.c;h=0c450f77fd4977afc5122fde1814798dc5cb9f70;hp=76ac63cfcdc1f2c7788874b26dd5ce6529d8e9ce;hb=c98480f8568e6c1bc927c6c5f2b5e80b4aa6548c;hpb=2ea77d3b2827ba23feb756ce2fb936565ae38998

diff --git a/keymap.c b/keymap.c
index 76ac63c..0c450f7 100644
--- a/keymap.c
+++ b/keymap.c
@@ -272,9 +272,9 @@ static const char *get_func (struct binding_t *bindings, int op)
   return NULL;
 }
 
-static void push_string (char *s)
+static void push_string(const char *s)
 {
-  char *pp, *p = s + m_strlen(s) - 1;
+  const char *pp, *p = s + m_strlen(s) - 1;
   size_t l;
   int i, op = OP_NULL;
 
@@ -359,7 +359,7 @@ int km_dokey (int menu)
   if (!map)
     return (retry_generic (menu, NULL, 0, 0));
 
-  FOREVER {
+  for (;;) {
     /* ncurses doesn't return on resized screen when timeout is set to zero */
     if (menu != MENU_EDITOR)
       timeout ((Timeout > 0 ? Timeout : 60) * 1000);
@@ -403,7 +403,7 @@ int km_dokey (int menu)
             /* careful not to feed the <..> as one token. otherwise 
              * push_string() will push the bogus op right back! */
             mutt_ungetch ('>', 0);
-            push_string (func);
+            push_string(func);
             mutt_ungetch ('<', 0);
             break;
           }
@@ -491,7 +491,7 @@ int km_expand_key (char *s, size_t len, struct keymap_t *map)
   if (!map)
     return (0);
 
-  FOREVER {
+  for (;;) {
     strfcpy (s, km_keyname (map->keys[p]), len);
     len -= (l = m_strlen(s));