diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-12-25 05:48:11 -0600 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-12-25 05:48:11 -0600 |
| commit | 855bac716d6e87b113c4ea91efed989712917d97 (patch) | |
| tree | b2ab3cf4aa285baec2d54255a9e7aebdcc88ca42 /user/libwacom/fix-database.patch | |
| parent | 3b4082481339e7e4254011eb5088a2f6cdb4bace (diff) | |
| download | packages-855bac716d6e87b113c4ea91efed989712917d97.tar.gz packages-855bac716d6e87b113c4ea91efed989712917d97.tar.bz2 packages-855bac716d6e87b113c4ea91efed989712917d97.tar.xz packages-855bac716d6e87b113c4ea91efed989712917d97.zip | |
user/libwacom: bump to 1.2
Diffstat (limited to 'user/libwacom/fix-database.patch')
| -rw-r--r-- | user/libwacom/fix-database.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/user/libwacom/fix-database.patch b/user/libwacom/fix-database.patch deleted file mode 100644 index 3c43b5bbf..000000000 --- a/user/libwacom/fix-database.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c -index afb89a2..28388f5 100644 ---- a/libwacom/libwacom-database.c -+++ b/libwacom/libwacom-database.c -@@ -147,14 +147,13 @@ make_match_string (const char *name, WacomBusType bus, int vendor_id, int produc - static gboolean - match_from_string(const char *str, WacomBusType *bus, int *vendor_id, int *product_id, char **name) - { -- int rc = 1; -- char busstr[64], namestr[64]; -+ int rc = 1, len = 0; -+ char busstr[64]; - -- memset(namestr, 0, sizeof(namestr)); -- -- rc = sscanf(str, "%63[^:]:%x:%x:%63c", busstr, vendor_id, product_id, namestr); -- if (rc == 4) { -- *name = g_strdup(namestr); -+ rc = sscanf(str, "%63[^:]:%x:%x:%n", busstr, vendor_id, product_id, &len); -+ if (len > 0) { -+ /* Grumble grumble scanf handling of %n */ -+ *name = g_strdup(str+len); - } else if (rc == 3) { - *name = NULL; - } else { |