tinyds-tdm: clean up devicemgr related code

Change-Id: I92d3142f98f26c8d21dca7f3abd82a7698ca7c5f

diff --git a/examples/tinyds-tdm.c b/examples/tinyds-tdm.c
index eb542d0..9a82f65 100644 (file)
--- a/examples/tinyds-tdm.c
+++ b/examples/tinyds-tdm.c
@@ -525,7 +525,7 @@ devicemgr_add_keymap_data(struct wl_list *list, const char *name, int keycode)
 
     data = calloc(1, sizeof *data);
     if (!data) {
-        ds_err("Failed to alloc memory\n");
+        ds_err("Failed to alloc memory");
         return;
     }
 
@@ -536,15 +536,14 @@ devicemgr_add_keymap_data(struct wl_list *list, const char *name, int keycode)
 }
 
 static void
-devicemgr_remove_keymap_data(struct wl_list *list, int keycode)
+devicemgr_cleanup_keymap_list(struct wl_list *list)
 {
     struct ds_tizen_input_devicemgr_keymap_data *data, *tmp;
 
     wl_list_for_each_safe(data, tmp, list, link) {
-        if (data->keycode == keycode) {
-            wl_list_remove(&data->link);
-            free(data);
-        }
+        wl_list_remove(&data->link);
+        free(data->name);
+        free(data);
     }
 }
 
@@ -565,10 +564,7 @@ devicemgr_set_keymap(struct ds_tizen_input_devicemgr *devicemgr)
     if (!res)
         ds_inf("Failed to set keymap");
 
-    devicemgr_remove_keymap_data(&keymap_list, 455);
-    devicemgr_remove_keymap_data(&keymap_list, 456);
-    devicemgr_remove_keymap_data(&keymap_list, 457);
-    devicemgr_remove_keymap_data(&keymap_list, 458);
+    devicemgr_cleanup_keymap_list(&keymap_list);
 }
 
 static void
@@ -783,6 +779,7 @@ init_server(struct tinyds_server *server, struct wl_display *display)
     server->devicemgr = ds_tizen_input_devicemgr_create(
             server->input_backend, server->seat);
     if (!server->devicemgr) {
+        ds_err("Could not create ds_tizen_input_devicemgr");
         goto err;
     }