diff options
| author | Diego Nieto Cid <dnietoc@gmail.com> | 2010-07-31 00:59:33 -0300 |
|---|---|---|
| committer | Diego Nieto Cid <dnietoc@gmail.com> | 2011-04-08 14:36:16 -0300 |
| commit | cc562f054ceaceb0e1631d50cec03de3c1a9b853 (patch) | |
| tree | e4d7157912bb4f00fff5100c1495449da7de4ddd | |
| parent | 7b249045199afead84aad7a67890abf2523a1b00 (diff) | |
debian patch: 04_cleanups.patch
| -rw-r--r-- | console-client/xkb/xkb.c | 6 | ||||
| -rw-r--r-- | console-client/xkb/xkbdata.c | 2 | ||||
| -rw-r--r-- | console-client/xkb/xkbtimer.c | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/console-client/xkb/xkb.c b/console-client/xkb/xkb.c index bd8d60bb..b1bff63d 100644 --- a/console-client/xkb/xkb.c +++ b/console-client/xkb/xkb.c @@ -38,6 +38,7 @@ #include "keysymdef.h" #include <driver.h> #include <mach-inputdev.h> +#include <wctype.h> @@ -98,13 +99,15 @@ static xkb_indicator_t *indicators; static int indicator_count; static int indicator_map = 0; +/* unused static int stickykeys_active = 1; +*/ int debug_printf (const char *f, ...) { va_list ap; - int ret; + int ret = 0; va_start (ap, f); #ifdef XKB_DEBUG @@ -1358,7 +1361,6 @@ error_t xkb_load_layout (char *xkbdir, char *xkbkeymapfile, char *xkbkeymap) { error_t err; - int lastarg; err = parse_xkbconfig (xkbdir, xkbkeymapfile, xkbkeymap); if (err) diff --git a/console-client/xkb/xkbdata.c b/console-client/xkb/xkbdata.c index 97545e52..bd23c468 100644 --- a/console-client/xkb/xkbdata.c +++ b/console-client/xkb/xkbdata.c @@ -414,12 +414,10 @@ ksrm_apply (void) { symbol ks = keys[kc].groups[group].symbols[cursym]; int rmods = (int) hurd_ihash_find (&ksrm_mapping, ks); - struct ksrm *ksrm; if (rmods) { keys[kc].mods.rmods = rmods; - debug_printf ("kss %d = %d\n", kc, ksrm->rmods); } } } diff --git a/console-client/xkb/xkbtimer.c b/console-client/xkb/xkbtimer.c index 4d366de5..c842d188 100644 --- a/console-client/xkb/xkbtimer.c +++ b/console-client/xkb/xkbtimer.c @@ -24,9 +24,6 @@ #include "xkb.h" #include <timer.h> -/* Lock the access to handle_key. */ -static struct mutex *lock_key; - /* Timer used to time key controls. */ //static struct timer_list key_timer; |