diff options
Diffstat (limited to 'arch/linux/common/inputdevices.h')
| -rw-r--r-- | arch/linux/common/inputdevices.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/arch/linux/common/inputdevices.h b/arch/linux/common/inputdevices.h index 1a5baff8..8d2d8427 100644 --- a/arch/linux/common/inputdevices.h +++ b/arch/linux/common/inputdevices.h @@ -21,11 +21,7 @@ static gchar *input_icons = NULL; static gboolean remove_input_devices(gpointer key, gpointer value, gpointer data) { - if (!strncmp((gchar *) key, "INP", 3)) { - return TRUE; - } - - return FALSE; + return g_str_has_prefix(key, "INP"); } static struct { @@ -91,10 +87,10 @@ __scan_input_devices(void) } tmp = g_strdup_printf("INP%d", ++n); - input_list = g_strdup_printf("%s$%s$%s=\n", + input_list = h_strdup_cprintf("$%s$%s=\n", input_list, tmp, name); - input_icons = g_strdup_printf("%sIcon$%s$%s=%s\n", + input_icons = h_strdup_cprintf("Icon$%s$%s=%s\n", input_icons, tmp, name, input_devices[d].icon); @@ -108,20 +104,17 @@ __scan_input_devices(void) const gchar *url = vendor_get_url(name); if (url) { - strhash = g_strdup_printf("%s" - "Vendor=%s (%s)\n", + strhash = h_strdup_cprintf("Vendor=%s (%s)\n", strhash, vendor_get_name(name), url); } else { - strhash = g_strdup_printf("%s" - "Vendor=%x\n", + strhash = h_strdup_cprintf("Vendor=%x\n", strhash, vendor); } - strhash = g_strdup_printf("%s" - "Product=0x%x\n" + strhash = h_strdup_cprintf("Product=0x%x\n" "Version=0x%x\n" "Connected to=%s\n", strhash, product, version, phys); |