From 7aeb5ac87c6105bd8fcc9b1fd12e37ba1550f587 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Mon, 19 Jun 2017 14:38:43 -0500 Subject: Import Upstream version 0.4.2.2 --- arch/linux/common/usb.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'arch/linux/common/usb.h') diff --git a/arch/linux/common/usb.h b/arch/linux/common/usb.h index d59f5f01..f2592648 100644 --- a/arch/linux/common/usb.h +++ b/arch/linux/common/usb.h @@ -19,10 +19,7 @@ static gboolean remove_usb_devices(gpointer key, gpointer value, gpointer data) { - if (!strncmp((gchar *) key, "USB", 3)) { - return TRUE; - } - return FALSE; + return g_str_has_prefix(key, "USB"); } static gchar *usb_list = NULL; @@ -89,10 +86,10 @@ __scan_usb(void) if (classid == 9) { /* hub */ - usb_list = g_strdup_printf("%s[%s#%d]\n", + usb_list = h_strdup_cprintf("[%s#%d]\n", usb_list, product, n); } else { /* everything else */ - usb_list = g_strdup_printf("%s$%s$%s=\n", + usb_list = h_strdup_cprintf("$%s$%s=\n", usb_list, tmp, product); const gchar *url = vendor_get_url(manuf); -- cgit v1.2.3