]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
systemctl: properly initialize return params in all success cases
authorLennart Poettering <lennart@poettering.net>
Thu, 14 Jan 2021 14:01:55 +0000 (15:01 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 14 Jan 2021 14:01:55 +0000 (15:01 +0100)
src/systemctl/systemctl-util.c

index 9713fce7af0c995a5c11882174549f200dbec28e..aff247a881b0e70adf84a2f7053008f91fa585d9 100644 (file)
@@ -477,7 +477,7 @@ int unit_find_paths(
                         return -ERFKILL;
                 if (streq(load_state, "not-found")) {
                         r = 0;
-                        goto not_found;
+                        goto finish;
                 }
                 if (!STR_IN_SET(load_state, "loaded", "bad-setting"))
                         return -EKEYREJECTED;
@@ -534,6 +534,7 @@ int unit_find_paths(
                 }
         }
 
+ finish:
         if (isempty(path)) {
                 *ret_fragment_path = NULL;
                 r = 0;
@@ -550,7 +551,6 @@ int unit_find_paths(
                         *ret_dropin_paths = NULL;
         }
 
- not_found:
         if (r == 0 && !arg_force)
                 log_error("No files found for %s.", unit_name);