From 00c34e16854449d2a78bab8273dfa176efdf53cf Mon Sep 17 00:00:00 2001
From: David Herrmann <dh.herrmann@googlemail.com>
Date: Sat, 24 Mar 2012 13:54:27 +0100
Subject: [PATCH] kbd_*: fix log messages

Remove new-lines again and set subsystem automatically.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
---
 src/kbd_dumb.c | 11 ++++++-----
 src/kbd_xkb.c  | 32 +++++++++++++-------------------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/src/kbd_dumb.c b/src/kbd_dumb.c
index df2feff..2cfa9d8 100644
--- a/src/kbd_dumb.c
+++ b/src/kbd_dumb.c
@@ -35,6 +35,8 @@
 #include "log.h"
 #include "imKStoUCS.h"
 
+#define LOG_SUBSYSTEM "kbd_dumb"
+
 /*
  * This is a very "dumb" and simple fallback backend for keycodes
  * 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)
 		return -EINVAL;
 
-	log_debug("kbd-dumb: 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;
+
+	log_debug("new keyboard description (%s, %s, %s)",
+						layout, variant, options);
 	*out = desc;
 	return 0;
 }
@@ -441,7 +442,7 @@ void kmscon_kbd_desc_unref(struct kmscon_kbd_desc *desc)
 	if (--desc->ref)
 		return;
 
-	log_debug("kbd-dumb: destroying keyboard description\n");
+	log_debug("destroying keyboard description");
 
 	free(desc);
 }
diff --git a/src/kbd_xkb.c b/src/kbd_xkb.c
index 0e88be3..cf15c4d 100644
--- a/src/kbd_xkb.c
+++ b/src/kbd_xkb.c
@@ -69,6 +69,8 @@
 #include "log.h"
 #include "imKStoUCS.h"
 
+#define LOG_SUBSYSTEM "kbd_xkb"
+
 struct kmscon_kbd_desc {
 	unsigned long ref;
 
@@ -945,13 +947,17 @@ int kmscon_kbd_desc_new(struct kmscon_kbd_desc **out, const char *layout,
 				const char *variant, const char *options)
 {
 	struct kmscon_kbd_desc *desc;
+	struct xkb_rule_names rmlvo = {
+		.rules = "evdev",
+		.model = "evdev",
+		.layout = layout,
+		.variant = variant,
+		.options = options,
+	};
 
 	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;
@@ -959,17 +965,9 @@ int kmscon_kbd_desc_new(struct kmscon_kbd_desc **out, const char *layout,
 	memset(desc, 0, sizeof(*desc));
 	desc->ref = 1;
 
-	struct xkb_rule_names rmlvo = {
-		.rules = "evdev",
-		.model = "evdev",
-		.layout = layout,
-		.variant = variant,
-		.options = options,
-	};
-
 	desc->desc = xkb_compile_keymap_from_rules(&rmlvo);
 	if (!desc->desc) {
-		log_err("kbd-xkb: cannot compile keymap from rules\n");
+		log_err("cannot compile keymap from rules");
 		free(desc);
 		return -EFAULT;
 	}
@@ -981,6 +979,8 @@ int kmscon_kbd_desc_new(struct kmscon_kbd_desc **out, const char *layout,
 	init_indicators(desc->desc);
 	init_autorepeat(desc->desc);
 
+	log_debug("new keyboard description (%s, %s, %s)",
+						layout, variant, options);
 	*out = desc;
 	return 0;
 }
@@ -1001,13 +1001,7 @@ void kmscon_kbd_desc_unref(struct kmscon_kbd_desc *desc)
 	if (--desc->ref)
 		return;
 
-	log_debug("kbd-xkb: destroying keyboard description\n");
-
-	/*
-	 * XXX: Seems this doesn't really free everything, valgrind shows some
-	 * big leaks from libxkbcommon. Hopefully we use just one up until we
-	 * exit.
-	 */
+	log_debug("destroying keyboard description");
 	xkb_free_keymap(desc->desc);
 	free(desc);
 }
-- 
2.7.4