From cbf09dac75a4021ce81464e579f381bef8e86b2f Mon Sep 17 00:00:00 2001 From: Yaroslav Chvanov Date: Sat, 25 Feb 2023 13:57:53 +0300 Subject: [PATCH] libratbag-data: don't parse LedTypes from device files --- src/libratbag-data.c | 46 -------------------------------------------- 1 file changed, 46 deletions(-) diff --git a/src/libratbag-data.c b/src/libratbag-data.c index c33abecb..cdb0019a 100644 --- a/src/libratbag-data.c +++ b/src/libratbag-data.c @@ -124,7 +124,6 @@ struct ratbag_device_data { }; enum ratbag_led_type led_types[20]; - size_t nled_types; }; static void @@ -530,44 +529,6 @@ ratbag_device_data_unref(struct ratbag_device_data *data) DEFINE_TRIVIAL_CLEANUP_FUNC(struct ratbag_device_data *, ratbag_device_data_unref); -static int -parse_ledtypes(char **strv, enum ratbag_led_type *types, size_t ntypes) -{ - unsigned int i; - int count = 0; - - for (i = 0; i < ntypes; i++) - types[i] = RATBAG_LED_TYPE_UNKNOWN; - - if (!strv) - return count; - - i = 0; - while(strv[i]) { - const char *s = strv[i]; - - if (streq(s, "logo")) - types[i] = RATBAG_LED_TYPE_LOGO; - else if (streq(s, "side")) - types[i] = RATBAG_LED_TYPE_SIDE; - else if (streq(s, "dpi")) - types[i] = RATBAG_LED_TYPE_SIDE; - else if (streq(s, "battery")) - types[i] = RATBAG_LED_TYPE_SIDE; - else if (streq(s, "wheel")) - types[i] = RATBAG_LED_TYPE_WHEEL; - else if (streq(s, "switches")) - types[i] = RATBAG_LED_TYPE_SWITCHES; - else - return -1; - - count++; - i++; - } - - return count; -} - static bool match(const struct input_id *id, char **strv) { @@ -601,7 +562,6 @@ file_data_matches(struct ratbag *ratbag, _cleanup_(g_key_file_freep) GKeyFile *keyfile = NULL; _cleanup_(g_error_freep) GError *error = NULL; _cleanup_(g_strfreevp) char **match_strv = NULL; - _cleanup_(g_strfreevp) char **ledtypes_strv = NULL; _cleanup_(ratbag_device_data_unrefp) struct ratbag_device_data *data = NULL; _cleanup_free_ char *devicetype = NULL; int rc; @@ -671,12 +631,6 @@ file_data_matches(struct ratbag *ratbag, return false; } - ledtypes_strv = g_key_file_get_string_list(keyfile, GROUP_DEVICE, "LedTypes", NULL, NULL); - if (parse_ledtypes(ledtypes_strv, data->led_types, ARRAY_LENGTH(data->led_types)) < 0) { - log_error(ratbag, "Invalid LedTypes string in '%s'\n", basename(path)); - return false; - } - *data_out = data; data = NULL;