system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-09-16 06:43:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

vconsole-setup: simplify error handling

Browse source 
no need to negate an error which we don't need negated.

also, add debug log about errors we ignore.
This commit is contained in:
Lennart Poettering 2023-08-08 14:20:17 +02:00
parent 7b218ef930
commit 6433f1f6a2
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/vconsole/vconsole-setup.c
View file

@ -512,8 +512,8 @@ static int find_source_vc(char **ret_path, unsigned *ret_idx) {
r = verify_vc_allocation(i);
if (r < 0) {
if (!err)
err = -r;
log_debug_errno(r, "VC %u existance check failed, skipping: %m", i);
RET_GATHER(err, r);
continue;
}
@ -522,14 +522,14 @@ static int find_source_vc(char **ret_path, unsigned *ret_idx) {
fd = open_terminal(path, O_RDWR|O_CLOEXEC|O_NOCTTY);
if (fd < 0) {
if (!err)
err = -fd;
log_debug_errno(fd, "Failed to open terminal %s, ignoring: %m", path);
RET_GATHER(err, r);
continue;
}
r = verify_vc_kbmode(fd);
if (r < 0) {
if (!err)
err = -r;
log_debug_errno(r, "Failed to check VC %s keyboard mode: %m", path);
RET_GATHER(err, r);
continue;
}