On Fri, 2015-03-13 at 14:57 -0400, Benjamin Tissoires wrote: > The match count (and update to the first correct) has to be done in > libwacom_parse_tablet_keyfile() now. > --- > > New in v2 (requested by Bastien) > > libwacom/libwacom-database.c | 76 +++++++++++++++++++++------------- > ---------- > 1 file changed, 36 insertions(+), 40 deletions(-) > > diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom- > database.c index f4cb82a..8a2519a 100644 > --- a/libwacom/libwacom-database.c > +++ b/libwacom/libwacom-database.c > @@ -130,45 +130,31 @@ make_match_string (WacomBusType bus, int > vendor_id, int product_id) > } > > static int
Seeing as you end up returning 0 or 1, just return a gboolean (and TRUE/FALSE) instead and... > -libwacom_matchstr_to_matches(WacomDevice *device, const char *match) > +libwacom_matchstr_to_match(WacomDevice *device, const char *match) > <snip> > + for (i = 0; string_list[i]; i++) { > + nmatches += libwacom_matchstr_to_match > (device, string_list[i]); if (libwacom_matchstr_to_match (device, string_list[i])) nmatches++; etc. Rest looks good. ------------------------------------------------------------------------------ Dive into the World of Parallel Programming The Go Parallel Website, sponsored by Intel and developed in partnership with Slashdot Media, is your hub for all things parallel software development, from weekly thought leadership blogs to news, videos, case studies, tutorials and more. Take a look and join the conversation now. http://goparallel.sourceforge.net/ _______________________________________________ Linuxwacom-devel mailing list Linuxwacom-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel