shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

systemctl: make use of strv_skip() where appropriate

Browse Source
This commit is contained in:
Lennart Poettering 2015-09-29 13:36:07 +02:00
parent 691395d84c
commit 14b316ebf8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/systemctl/systemctl.c
View File

@ -3207,7 +3207,7 @@ static int kill_unit(char **args) {
if (streq(arg_job_mode, "fail")) if (streq(arg_job_mode, "fail"))
kill_who = strjoina(arg_kill_who, "-fail", NULL); kill_who = strjoina(arg_kill_who, "-fail", NULL);
r = expand_names(bus, args + 1, NULL, &names); r = expand_names(bus, strv_skip(args, 1), NULL, &names);
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to expand names: %m"); return log_error_errno(r, "Failed to expand names: %m");
@ -4648,7 +4648,7 @@ static int show(char **args) {
_cleanup_free_ char **patterns = NULL; _cleanup_free_ char **patterns = NULL;
char **name; char **name;
STRV_FOREACH(name, args + 1) { STRV_FOREACH(name, strv_skip(args, 1)) {
_cleanup_free_ char *unit = NULL; _cleanup_free_ char *unit = NULL;
uint32_t id; uint32_t id;
@ -5211,7 +5211,7 @@ static int set_environment(char **args) {
if (r < 0) if (r < 0)
return bus_log_create_error(r); return bus_log_create_error(r);
r = sd_bus_message_append_strv(m, args + 1); r = sd_bus_message_append_strv(m, strv_skip(args, 1));
if (r < 0) if (r < 0)
return bus_log_create_error(r); return bus_log_create_error(r);
@ -5246,7 +5246,7 @@ static int import_environment(char **args) {
if (r < 0) if (r < 0)
return bus_log_create_error(r); return bus_log_create_error(r);
if (strv_isempty(args + 1)) if (strv_isempty(strv_skip(args, 1)))
r = sd_bus_message_append_strv(m, environ); r = sd_bus_message_append_strv(m, environ);
else { else {
char **a, **b; char **a, **b;
@ -5255,7 +5255,7 @@ static int import_environment(char **args) {
if (r < 0) if (r < 0)
return bus_log_create_error(r); return bus_log_create_error(r);
STRV_FOREACH(a, args + 1) { STRV_FOREACH(a, strv_skip(args, 1)) {
if (!env_name_is_valid(*a)) { if (!env_name_is_valid(*a)) {
log_error("Not a valid environment variable name: %s", *a); log_error("Not a valid environment variable name: %s", *a);