From fd2de366e12373b1baf3217e42e75274b144ac5c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 23 Jun 2023 22:50:55 +0200 Subject: [PATCH] getty-generator: minor modernizations --- src/getty-generator/getty-generator.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c index e327b375cdf..24c35ae9871 100644 --- a/src/getty-generator/getty-generator.c +++ b/src/getty-generator/getty-generator.c @@ -25,8 +25,7 @@ static const char *arg_dest = NULL; static bool arg_enabled = true; static int add_symlink(const char *fservice, const char *tservice) { - char *from, *to; - int r; + const char *from, *to; assert(fservice); assert(tservice); @@ -36,8 +35,7 @@ static int add_symlink(const char *fservice, const char *tservice) { (void) mkdir_parents_label(to, 0755); - r = symlink(from, to); - if (r < 0) { + if (symlink(from, to) < 0) { /* In case console=hvc0 is passed this will very likely result in EEXIST */ if (errno == EEXIST) return 0; @@ -281,7 +279,7 @@ static int run(const char *dest, const char *dest_early, const char *dest_late) p = path_join("/sys/class/tty", j); if (!p) - return -ENOMEM; + return log_oom(); if (access(p, F_OK) < 0) continue; -- 2.47.3