fingerprint-strings: Make the finger_str_to_msg loop clearer

Just continue earlier instead of using a long if check
This commit is contained in:
Marco Trevisan (Treviño)
2020-12-07 18:24:57 +01:00
parent 52058c1ea0
commit 4a80bfacec

View File

@ -113,25 +113,25 @@ GNUC_UNUSED static char *finger_str_to_msg(const char *finger_name, const char *
return NULL; return NULL;
for (i = 0; fingers[i].dbus_name != NULL; i++) { for (i = 0; fingers[i].dbus_name != NULL; i++) {
if (str_equal (fingers[i].dbus_name, finger_name)) { if (!str_equal (fingers[i].dbus_name, finger_name))
if (is_swipe == false) { continue;
if (driver_name) { if (is_swipe == false) {
char *s; if (driver_name) {
int ret; char *s;
ret = asprintf (&s, TR (fingers[i].place_str_specific), driver_name); int ret;
return ret >= 0 ? s : NULL; ret = asprintf (&s, TR (fingers[i].place_str_specific), driver_name);
} else { return ret >= 0 ? s : NULL;
return strdup (TR (fingers[i].place_str_generic));
}
} else { } else {
if (driver_name) { return strdup (TR (fingers[i].place_str_generic));
char *s; }
int ret; } else {
ret = asprintf (&s, TR (fingers[i].swipe_str_specific), driver_name); if (driver_name) {
return ret >= 0 ? s : NULL; char *s;
} else { int ret;
return strdup (TR (fingers[i].swipe_str_generic)); ret = asprintf (&s, TR (fingers[i].swipe_str_specific), driver_name);
} return ret >= 0 ? s : NULL;
} else {
return strdup (TR (fingers[i].swipe_str_generic));
} }
} }
} }