dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

shared/kbd-util: simplify error handling in keymap_exists()

Browse Source 
Once we know the return value, we can just return it, no need to
exit the loop.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2023-08-10 10:02:34 +02:00
parent bb44fd0734
commit 7d01eb35dc
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/shared/kbd-util.c
View File

@@ -127,7 +127,7 @@ bool keymap_is_valid(const char *name) {
}
int keymap_exists(const char *name) {
int r = 0;
int r;
if (!keymap_is_valid(name))
return -EINVAL;
@@ -143,17 +143,13 @@ int keymap_exists(const char *name) {
&(struct recurse_dir_userdata) {
.keymap_name = name,
});
if (r < 0) {
if (r == -ENOENT)
continue;
if (ERRNO_IS_RESOURCE(r))
return r;
log_debug_errno(r, "Failed to read keymap list from %s, ignoring: %m", dir);
continue;
}
if (r > 0)
break;
return true;
if (ERRNO_IS_NEG_RESOURCE(r))
return r;
if (r < 0 && r != -ENOENT)
log_debug_errno(r, "Failed to read keymap list from %s, ignoring: %m", dir);
}
return r > 0;
return false;
}