dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-05 07:30:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12052 from poettering/systemctl-fixlets

Browse Source 
systemctl refactorings
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2019-03-21 17:33:44 +01:00
committed by GitHub
parent c8c194a982 9dccc6d3ae
commit 05a8a7a0fb
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/systemctl/systemctl.c
View File

@@ -179,6 +179,12 @@ static bool arg_now = false;
static bool arg_jobs_before = false;
static bool arg_jobs_after = false;
STATIC_DESTRUCTOR_REGISTER(arg_wall, strv_freep);
STATIC_DESTRUCTOR_REGISTER(arg_root, freep);
STATIC_DESTRUCTOR_REGISTER(arg_types, strv_freep);
STATIC_DESTRUCTOR_REGISTER(arg_states, strv_freep);
STATIC_DESTRUCTOR_REGISTER(arg_properties, strv_freep);
static int daemon_reload(int argc, char *argv[], void* userdata);
static int trivial_method(int argc, char *argv[], void *userdata);
static int halt_now(enum action a);
@@ -8067,10 +8073,8 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
if (r == 0)
break;
if (strv_push(&arg_properties, prop) < 0)
if (strv_consume(&arg_properties, TAKE_PTR(prop)) < 0)
return log_oom();
prop = NULL;
}
}
@@ -8296,10 +8300,8 @@ static int systemctl_parse_argv(int argc, char *argv[]) {
return 0;
}
if (strv_push(&arg_states, s) < 0)
if (strv_consume(&arg_states, TAKE_PTR(s)) < 0)
return log_oom();
s = NULL;
}
break;
}
@@ -9245,13 +9247,6 @@ static int run(int argc, char *argv[]) {
finish:
release_busses();
strv_free(arg_types);
strv_free(arg_states);
strv_free(arg_properties);
strv_free(arg_wall);
free(arg_root);
/* Note that we return r here, not 0, so that we can implement the LSB-like return codes */
return r;
}