Remove compilation warnings from keymap.c

Signed-off-by: Julien Danjou <jd@abydos.adm.naquadah.org>
Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/keymap.c b/keymap.c
index 6205bae..e8bd397 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -105,9 +105,9 @@ static struct keymap_t *allocKeys(int len, keycode_t *keys)
     return p;
 }
 
-static int parse_fkey (char *s)
+static int parse_fkey (const char *s)
 {
-  char *t;
+  const char *t;
   int n = 0;
 
   if (s[0] != '<' || ascii_tolower (s[1]) != 'f')
@@ -247,7 +247,7 @@ void km_bindkey (const char *s, int menu, int op)
   km_bind (s, menu, op, NULL, NULL);
 }
 
-static int get_op (struct binding_t *bindings, const char *start, size_t len)
+static int get_op (struct binding_t *bindings, const char *start, ssize_t len)
 {
   int i;
 
@@ -276,7 +276,7 @@ static const char *get_func (struct binding_t *bindings, int op)
 static void push_string(const char *s)
 {
   const char *pp, *p = s + m_strlen(s) - 1;
-  size_t l;
+  ssize_t l;
   int i, op = OP_NULL;
 
   while (p >= s) {
@@ -652,7 +652,7 @@ void km_error_key (int menu)
   return;
 }
 
-int mutt_parse_push (BUFFER * buf, BUFFER * s, unsigned long data,
+int mutt_parse_push (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)),
                      BUFFER * err)
 {
   int r = 0;
@@ -771,7 +771,7 @@ struct binding_t *km_get_table (int menu)
 }
 
 /* bind menu-name '<key_sequence>' function-name */
-int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data,
+int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)),
                      BUFFER * err)
 {
   struct binding_t *bindings = NULL;
@@ -815,7 +815,7 @@ int mutt_parse_bind (BUFFER * buf, BUFFER * s, unsigned long data,
 }
 
 /* macro <menu> <key> <macro> <description> */
-int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data,
+int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)),
                       BUFFER * err)
 {
   int menu[sizeof (Menus) / sizeof (struct mapping_t) - 1], r =
@@ -862,7 +862,7 @@ int mutt_parse_macro (BUFFER * buf, BUFFER * s, unsigned long data,
 }
 
 /* exec function-name */
-int mutt_parse_exec (BUFFER * buf, BUFFER * s, unsigned long data,
+int mutt_parse_exec (BUFFER * buf, BUFFER * s, unsigned long data __attribute__ ((unused)),
                      BUFFER * err)
 {
   int ops[128];
@@ -894,7 +894,7 @@ int mutt_parse_exec (BUFFER * buf, BUFFER * s, unsigned long data,
     }
     nops++;
   }
-  while (MoreArgs (s) && nops < sizeof (ops) / sizeof (ops[0]));
+  while (MoreArgs (s) && nops < ssizeof (ops) / ssizeof (ops[0]));
 
   while (nops)
     mutt_ungetch (0, ops[--nops]);