X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=keymap.c;h=716308a23a4d50bfa2e0a685a5cc70a99f74d90f;hp=272fe0aff625057b3c5a036fffe0af426eab4454;hb=10e80e482eff3762b0b8d41b0c7795b76704479c;hpb=10b7d54ecaa5c54622bf1239b57fa2e3359db0e1

diff --git a/keymap.c b/keymap.c
index 272fe0a..716308a 100644
--- a/keymap.c
+++ b/keymap.c
@@ -18,11 +18,12 @@
 #include <lib-lib/buffer.h>
 #include <lib-lib/mapping.h>
 
+#include <lib-ui/curses.h>
+#include <lib-ui/menu.h>
+
 #include "mutt.h"
-#include "mutt_menu.h"
-#include "mutt_curses.h"
 #include "keymap.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 
 
 #include <stdlib.h>
@@ -105,9 +106,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 +248,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 +277,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 +653,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 +772,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 +816,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 +863,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 +895,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]);