summaryrefslogtreecommitdiff
path: root/src/vconsole
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-12-19 13:07:42 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-12-19 15:00:57 +0100
commit254d1313ae5a69c08c9b93032aaaf3d6083cfc07 (patch)
tree067102a36abe6bf597c26a42d79018a1060c9007 /src/vconsole
parentcbff793ffb280d9d11e5d7b1dc3964276491bee8 (diff)
downloadsystemd-254d1313ae5a69c08c9b93032aaaf3d6083cfc07.tar.gz
tree-wide: use -EBADF for fd initialization
-1 was used everywhere, but -EBADF or -EBADFD started being used in various places. Let's make things consistent in the new style. Note that there are two candidates: EBADF 9 Bad file descriptor EBADFD 77 File descriptor in bad state Since we're initializating the fd, we're just assigning a value that means "no fd yet", so it's just a bad file descriptor, and the first errno fits better. If instead we had a valid file descriptor that became invalid because of some operation or state change, the other errno would fit better. In some places, initialization is dropped if unnecessary.
Diffstat (limited to 'src/vconsole')
-rw-r--r--src/vconsole/vconsole-setup.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 98f978df0a..ecc859a2c3 100644
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -278,7 +278,7 @@ static void setup_remaining_vcs(int src_fd, unsigned src_idx, bool utf8) {
for (i = 1; i <= 63; i++) {
char ttyname[sizeof("/dev/tty63")];
- _cleanup_close_ int fd_d = -1;
+ _cleanup_close_ int fd_d = -EBADF;
if (i == src_idx || verify_vc_allocation(i) < 0)
continue;
@@ -350,7 +350,7 @@ static int find_source_vc(char **ret_path, unsigned *ret_idx) {
return log_oom();
for (i = 1; i <= 63; i++) {
- _cleanup_close_ int fd = -1;
+ _cleanup_close_ int fd = -EBADF;
r = verify_vc_allocation(i);
if (r < 0) {
@@ -383,7 +383,7 @@ static int find_source_vc(char **ret_path, unsigned *ret_idx) {
}
static int verify_source_vc(char **ret_path, const char *src_vc) {
- _cleanup_close_ int fd = -1;
+ _cleanup_close_ int fd = -EBADF;
char *path;
int r;
@@ -416,7 +416,7 @@ int main(int argc, char **argv) {
*vc = NULL,
*vc_keymap = NULL, *vc_keymap_toggle = NULL,
*vc_font = NULL, *vc_font_map = NULL, *vc_font_unimap = NULL;
- _cleanup_close_ int fd = -1;
+ _cleanup_close_ int fd = -EBADF;
bool utf8, keyboard_ok;
unsigned idx = 0;
int r;