systemctl: reduce variable scope

diff --git a/src/systemctl/systemctl-add-dependency.c b/src/systemctl/systemctl-add-dependency.c
index aa3844f4d4261e8c67a47466bfe553c75c36835b..8df25b515de3f8189696ffcf6319da68d86b7cfd 100644 (file)
--- a/src/systemctl/systemctl-add-dependency.c
+++ b/src/systemctl/systemctl-add-dependency.c
@@ -11,13 +11,9 @@ int verb_add_dependency(int argc, char *argv[], void *userdata) {
         _cleanup_strv_free_ char **names = NULL;
         _cleanup_free_ char *target = NULL;
         const char *verb = argv[0];
-        InstallChange *changes = NULL;
-        size_t n_changes = 0;
         UnitDependency dep;
         int r;
 
-        CLEANUP_ARRAY(changes, n_changes, install_changes_free);
-
         if (!argv[1])
                 return 0;
 
@@ -39,6 +35,11 @@ int verb_add_dependency(int argc, char *argv[], void *userdata) {
                 assert_not_reached();
 
         if (install_client_side()) {
+                InstallChange *changes = NULL;
+                size_t n_changes = 0;
+
+                CLEANUP_ARRAY(changes, n_changes, install_changes_free);
+
                 r = unit_file_add_dependency(arg_runtime_scope, unit_file_flags_from_args(), arg_root, names, target, dep, &changes, &n_changes);
                 install_changes_dump(r, "add dependency on", changes, n_changes, arg_quiet);
                 if (r < 0)

diff --git a/src/systemctl/systemctl-enable.c b/src/systemctl/systemctl-enable.c
index 98bf30670df7d80e6439708cc2f04da0c3dc5a31..6d3709705e036fc2f12822b49f88d586d2d863a3 100644 (file)
--- a/src/systemctl/systemctl-enable.c
+++ b/src/systemctl/systemctl-enable.c
@@ -64,14 +64,10 @@ static int normalize_names(char **names) {
 int verb_enable(int argc, char *argv[], void *userdata) {
         _cleanup_strv_free_ char **names = NULL;
         const char *verb = argv[0];
-        InstallChange *changes = NULL;
-        size_t n_changes = 0;
         int carries_install_info = -1;
         bool ignore_carries_install_info = arg_quiet || arg_no_warn;
         int r;
 
-        CLEANUP_ARRAY(changes, n_changes, install_changes_free);
-
         if (!argv[1])
                 return 0;
 
@@ -106,6 +102,10 @@ int verb_enable(int argc, char *argv[], void *userdata) {
 
         if (install_client_side()) {
                 UnitFileFlags flags;
+                InstallChange *changes = NULL;
+                size_t n_changes = 0;
+
+                CLEANUP_ARRAY(changes, n_changes, install_changes_free);
 
                 flags = unit_file_flags_from_args();
                 if (streq(verb, "enable")) {

diff --git a/src/systemctl/systemctl-preset-all.c b/src/systemctl/systemctl-preset-all.c
index 5d731729888c6756dd4a8b8510025e354d3469cb..b55f8e35ca74474dcf0d38a6693857ef11be670e 100644 (file)
--- a/src/systemctl/systemctl-preset-all.c
+++ b/src/systemctl/systemctl-preset-all.c
@@ -8,13 +8,14 @@
 #include "systemctl.h"
 
 int verb_preset_all(int argc, char *argv[], void *userdata) {
-        InstallChange *changes = NULL;
-        size_t n_changes = 0;
         int r;
 
-        CLEANUP_ARRAY(changes, n_changes, install_changes_free);
-
         if (install_client_side()) {
+                InstallChange *changes = NULL;
+                size_t n_changes = 0;
+
+                CLEANUP_ARRAY(changes, n_changes, install_changes_free);
+
                 r = unit_file_preset_all(arg_runtime_scope, unit_file_flags_from_args(), arg_root, arg_preset_mode, &changes, &n_changes);
                 install_changes_dump(r, "preset", changes, n_changes, arg_quiet);
 

diff --git a/src/systemctl/systemctl-set-default.c b/src/systemctl/systemctl-set-default.c
index 3b161d7cbadf9d4a4014752f74490f5f2553f265..136a4f3b6679b9066ece6ff754bec54f4e40288f 100644 (file)
--- a/src/systemctl/systemctl-set-default.c
+++ b/src/systemctl/systemctl-set-default.c
@@ -95,15 +95,11 @@ int verb_get_default(int argc, char *argv[], void *userdata) {
 
 int verb_set_default(int argc, char *argv[], void *userdata) {
         _cleanup_free_ char *unit = NULL;
-        InstallChange *changes = NULL;
-        size_t n_changes = 0;
         int r;
 
         assert(argc >= 2);
         assert(argv);
 
-        CLEANUP_ARRAY(changes, n_changes, install_changes_free);
-
         r = unit_name_mangle_with_suffix(argv[1], "set-default",
                                          arg_quiet ? 0 : UNIT_NAME_MANGLE_WARN,
                                          ".target", &unit);
@@ -111,6 +107,11 @@ int verb_set_default(int argc, char *argv[], void *userdata) {
                 return log_error_errno(r, "Failed to mangle unit name: %m");
 
         if (install_client_side()) {
+                InstallChange *changes = NULL;
+                size_t n_changes = 0;
+
+                CLEANUP_ARRAY(changes, n_changes, install_changes_free);
+
                 r = unit_file_set_default(arg_runtime_scope, UNIT_FILE_FORCE, arg_root, unit, &changes, &n_changes);
                 install_changes_dump(r, "set default", changes, n_changes, arg_quiet);
                 if (r < 0)