norohind/kmscon
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kbd_*: fix log messages

Browse Source 
Remove new-lines again and set subsystem automatically.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
This commit is contained in:
David Herrmann 2012-03-24 13:54:27 +01:00
parent 84f1883809
commit 00c34e1685
2 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/kbd_dumb.c
View File

@ -35,6 +35,8 @@
#include "log.h" #include "log.h"
#include "imKStoUCS.h" #include "imKStoUCS.h"
#define LOG_SUBSYSTEM "kbd_dumb"
/* /*
* This is a very "dumb" and simple fallback backend for keycodes * This is a very "dumb" and simple fallback backend for keycodes
* interpretation. It uses direct mapping from kernel keycodes to X keysyms * interpretation. It uses direct mapping from kernel keycodes to X keysyms
@ -411,16 +413,15 @@ int kmscon_kbd_desc_new(struct kmscon_kbd_desc **out, const char *layout,
if (!out) if (!out)
return -EINVAL; return -EINVAL;
log_debug("kbd-dumb: new keyboard description (%s, %s, %s)\n",
layout, variant, options);
desc = malloc(sizeof(*desc)); desc = malloc(sizeof(*desc));
if (!desc) if (!desc)
return -ENOMEM; return -ENOMEM;
memset(desc, 0, sizeof(*desc)); memset(desc, 0, sizeof(*desc));
desc->ref = 1; desc->ref = 1;
log_debug("new keyboard description (%s, %s, %s)",
layout, variant, options);
*out = desc; *out = desc;
return 0; return 0;
} }
@ -441,7 +442,7 @@ void kmscon_kbd_desc_unref(struct kmscon_kbd_desc *desc)
if (--desc->ref) if (--desc->ref)
return; return;
log_debug("kbd-dumb: destroying keyboard description\n"); log_debug("destroying keyboard description");
free(desc); free(desc);
} }

38
src/kbd_xkb.c
View File

@ -69,6 +69,8 @@
#include "log.h" #include "log.h"
#include "imKStoUCS.h" #include "imKStoUCS.h"
#define LOG_SUBSYSTEM "kbd_xkb"
struct kmscon_kbd_desc { struct kmscon_kbd_desc {
unsigned long ref; unsigned long ref;
@ -945,20 +947,6 @@ int kmscon_kbd_desc_new(struct kmscon_kbd_desc **out, const char *layout,
const char *variant, const char *options) const char *variant, const char *options)
{ {
struct kmscon_kbd_desc *desc; struct kmscon_kbd_desc *desc;
if (!out)
return -EINVAL;
log_debug("kbd-xkb: new keyboard description (%s, %s, %s)\n",
layout, variant, options);
desc = malloc(sizeof(*desc));
if (!desc)
return -ENOMEM;
memset(desc, 0, sizeof(*desc));
desc->ref = 1;
struct xkb_rule_names rmlvo = { struct xkb_rule_names rmlvo = {
.rules = "evdev", .rules = "evdev",
.model = "evdev", .model = "evdev",
@ -967,9 +955,19 @@ int kmscon_kbd_desc_new(struct kmscon_kbd_desc **out, const char *layout,
.options = options, .options = options,
}; };
if (!out)
return -EINVAL;
desc = malloc(sizeof(*desc));
if (!desc)
return -ENOMEM;
memset(desc, 0, sizeof(*desc));
desc->ref = 1;
desc->desc = xkb_compile_keymap_from_rules(&rmlvo); desc->desc = xkb_compile_keymap_from_rules(&rmlvo);
if (!desc->desc) { if (!desc->desc) {
log_err("kbd-xkb: cannot compile keymap from rules\n"); log_err("cannot compile keymap from rules");
free(desc); free(desc);
return -EFAULT; return -EFAULT;
} }
@ -981,6 +979,8 @@ int kmscon_kbd_desc_new(struct kmscon_kbd_desc **out, const char *layout,
init_indicators(desc->desc); init_indicators(desc->desc);
init_autorepeat(desc->desc); init_autorepeat(desc->desc);
log_debug("new keyboard description (%s, %s, %s)",
layout, variant, options);
*out = desc; *out = desc;
return 0; return 0;
} }
@ -1001,13 +1001,7 @@ void kmscon_kbd_desc_unref(struct kmscon_kbd_desc *desc)
if (--desc->ref) if (--desc->ref)
return; return;
log_debug("kbd-xkb: destroying keyboard description\n"); log_debug("destroying keyboard description");
/*
* XXX: Seems this doesn't really free everything, valgrind shows some
* big leaks from libxkbcommon. Hopefully we use just one up until we
* exit.
*/
xkb_free_keymap(desc->desc); xkb_free_keymap(desc->desc);
free(desc); free(desc);
} }