From 6de77384e0ea501c43eaaa1948da8ebae5df1e3a Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 16 May 2023 07:39:32 +0200 Subject: [PATCH] system-update-generator: drop pointless goto --- .../system-update-generator.c | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/src/system-update-generator/system-update-generator.c b/src/system-update-generator/system-update-generator.c index ee5f8ec12ec..83b06902ab3 100644 --- a/src/system-update-generator/system-update-generator.c +++ b/src/system-update-generator/system-update-generator.c @@ -19,27 +19,25 @@ static const char *arg_dest = NULL; static int generate_symlink(void) { - _cleanup_free_ char *j = NULL; - FOREACH_STRING(p, "/system-update", "/etc/system-update") { - if (laccess(p, F_OK) >= 0) - goto link_found; + if (laccess(p, F_OK) >= 0) { + _cleanup_free_ char *j = NULL; + + j = path_join(arg_dest, SPECIAL_DEFAULT_TARGET); + if (!j) + return log_oom(); + + if (symlink(SYSTEM_DATA_UNIT_DIR "/system-update.target", j) < 0) + return log_error_errno(errno, "Failed to create symlink %s: %m", j); + + return 1; + } if (errno != ENOENT) log_warning_errno(errno, "Failed to check if %s symlink exists, ignoring: %m", p); } return 0; - -link_found: - j = path_join(arg_dest, SPECIAL_DEFAULT_TARGET); - if (!j) - return log_oom(); - - if (symlink(SYSTEM_DATA_UNIT_DIR "/system-update.target", j) < 0) - return log_error_errno(errno, "Failed to create symlink %s: %m", j); - - return 1; } static int parse_proc_cmdline_item(const char *key, const char *value, void *data) { -- 2.47.3