X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=keymap.c;h=580c2a4ab821b8d0e5070b70e292e5b5f459a179;hp=87b2b28d4dd3f937f9605a6b111e46416a741673;hb=049b21f53af51ad7259613f5eefaa0f37b1b2167;hpb=142d30ec0fa23abf29a327968f7cfeb1cd27bb3f

diff --git a/keymap.c b/keymap.c
index 87b2b28..580c2a4 100644
--- a/keymap.c
+++ b/keymap.c
@@ -146,7 +146,7 @@ static int parsekeys (const char *str, keycode_t * d, int max)
     len--;
   }
 
-  return (max - len);
+  return max - len;
 }
 
 /* insert a key sequence into the specified map.  the map is sorted by ASCII
@@ -301,7 +301,7 @@ static int retry_generic (int menu, keycode_t * keys, int keyslen,
       mutt_ungetch (lastkey, 0);
     for (; keyslen; keyslen--)
       mutt_ungetch (keys[keyslen - 1], 0);
-    return (km_dokey (MENU_GENERIC));
+    return km_dokey (MENU_GENERIC);
   }
   if (menu != MENU_EDITOR) {
     /* probably a good idea to flush input here so we can abort macros */
@@ -325,7 +325,7 @@ int km_dokey (int menu)
 
 
   if (!map)
-    return (retry_generic (menu, NULL, 0, 0));
+    return retry_generic (menu, NULL, 0, 0);
 
   for (;;) {
     /* ncurses doesn't return on resized screen when timeout is set to zero */
@@ -385,12 +385,12 @@ int km_dokey (int menu)
     /* Nope. Business as usual */
     while (LastKey > map->keys[pos]) {
       if (pos > map->eq || !map->next)
-        return (retry_generic (menu, map->keys, pos, LastKey));
+        return retry_generic (menu, map->keys, pos, LastKey);
       map = map->next;
     }
 
     if (LastKey != map->keys[pos])
-      return (retry_generic (menu, map->keys, pos, LastKey));
+      return retry_generic (menu, map->keys, pos, LastKey);
 
     if (++pos == map->len) {
 
@@ -448,7 +448,7 @@ const char *km_keyname(int c)
     snprintf (buf, sizeof (buf), "%c", (unsigned char) c);
   else
     snprintf (buf, sizeof (buf), "\\x%hx", (unsigned short) c);
-  return (buf);
+  return buf;
 }
 
 int km_expand_key (char *s, size_t len, struct keymap_t *map)
@@ -457,14 +457,14 @@ int km_expand_key (char *s, size_t len, struct keymap_t *map)
   int p = 0;
 
   if (!map)
-    return (0);
+    return 0;
 
   for (;;) {
     m_strcpy(s, len, km_keyname(map->keys[p]));
     len -= (l = m_strlen(s));
 
     if (++p >= map->len || !len)
-      return (1);
+      return 1;
 
     s += l;
   }
@@ -479,7 +479,7 @@ struct keymap_t *km_find_func (int menu, int func)
   for (; map; map = map->next)
     if (map->op == func)
       break;
-  return (map);
+  return map;
 }
 
 void km_init (void)
@@ -618,7 +618,7 @@ int mutt_parse_push (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
   }
   else
     push_string (buf->data);
-  return (r);
+  return r;
 }
 
 /* expects to see: <menu-string>,<menu-string>,... <key-string> */
@@ -658,14 +658,14 @@ static char *parse_keymap (int *menu, BUFFER * s, int maxmenus, int *nummenus,
       m_strcpy(err->data, err->dsize, _("null key sequence"));
     }
     else if (MoreArgs (s))
-      return (buf.data);
+      return buf.data;
   }
   else {
     m_strcpy(err->data, err->dsize, _("too few arguments"));
   }
 error:
   p_delete(&buf.data);
-  return (NULL);
+  return NULL;
 }
 
 static int
@@ -676,9 +676,9 @@ try_bind (char *key, int menu, char *func, struct binding_t *bindings)
   for (i = 0; bindings[i].name; i++)
     if (m_strcmp(func, bindings[i].name) == 0) {
       km_bindkey (key, menu, bindings[i].op);
-      return (0);
+      return 0;
     }
-  return (-1);
+  return -1;
 }
 
 struct binding_t *km_get_table (int menu)
@@ -754,7 +754,7 @@ int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
     }
   }
   p_delete(&key);
-  return (r);
+  return r;
 }
 
 /* macro <menu> <key> <macro> <description> */
@@ -769,7 +769,7 @@ int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
   if ((key =
        parse_keymap (menu, s, sizeof (menu) / sizeof (menu[0]), &nummenus,
                      err)) == NULL)
-    return (-1);
+    return -1;
 
   mutt_extract_token (buf, s, M_TOKEN_CONDENSE);
   /* make sure the macro sequence is not an empty string */
@@ -801,7 +801,7 @@ int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
     }
   }
   p_delete(&key);
-  return (r);
+  return r;
 }
 
 /* exec function-name */
@@ -815,7 +815,7 @@ int mutt_parse_exec (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
 
   if (!MoreArgs (s)) {
     m_strcpy(err->data, err->dsize, _("exec: no arguments"));
-    return (-1);
+    return -1;
   }
 
   do {
@@ -833,7 +833,7 @@ int mutt_parse_exec (BUFFER * buf, BUFFER * s, unsigned long data __attribute__
     if (ops[nops] == OP_NULL) {
       mutt_flushinp ();
       mutt_error (_("%s: no such function"), function);
-      return (-1);
+      return -1;
     }
     nops++;
   }