From 0791512fb1d73ea63c98f3f68327dc543e214850 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sat, 10 Dec 2022 13:54:51 -0500 Subject: Avoid cloned conditional branches --- src/util.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/util.c') diff --git a/src/util.c b/src/util.c index ef56797..b5aed50 100644 --- a/src/util.c +++ b/src/util.c @@ -116,10 +116,9 @@ lilv_get_lang(void) lang[i] = '-'; // Convert _ to - } else if (env_lang[i] >= 'A' && env_lang[i] <= 'Z') { lang[i] = env_lang[i] + ('a' - 'A'); // Convert to lowercase - } else if (env_lang[i] >= 'a' && env_lang[i] <= 'z') { - lang[i] = env_lang[i]; // Lowercase letter, copy verbatim - } else if (env_lang[i] >= '0' && env_lang[i] <= '9') { - lang[i] = env_lang[i]; // Digit, copy verbatim + } else if ((env_lang[i] >= 'a' && env_lang[i] <= 'z') || + (env_lang[i] >= '0' && env_lang[i] <= '9')) { + lang[i] = env_lang[i]; // Lowercase letter or digit, copy verbatim } else if (env_lang[i] == '\0' || env_lang[i] == '.') { // End, or start of suffix (e.g. en_CA.utf-8), finished lang[i] = '\0'; -- cgit v1.2.1