diff options
| author | Simon Quigley <tsimonq2@ubuntu.com> | 2017-06-19 14:38:43 -0500 |
|---|---|---|
| committer | Simon Quigley <tsimonq2@ubuntu.com> | 2017-06-19 14:38:43 -0500 |
| commit | 7aeb5ac87c6105bd8fcc9b1fd12e37ba1550f587 (patch) | |
| tree | cab8ef3e10d3a33a2033538b6088e107f0a86dcd /arch/linux/common/usb.h | |
| parent | a9d469b1b48a8446dc9b9fd987b6af83a60ed796 (diff) | |
Import Upstream version 0.4.2.2
Diffstat (limited to 'arch/linux/common/usb.h')
| -rw-r--r-- | arch/linux/common/usb.h | 9 |
1 files changed, 3 insertions, 6 deletions
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); |