diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-11-03 13:59:20 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-03 13:59:20 -0600 |
| commit | 493fd52f1ada36bfe63301d4bb50f7fd2b38c670 (patch) | |
| tree | 19864f5568a2fe48181c1b3f33c46b4db36dd768 /src/systemctl | |
| parent | a1e2ef7ec912902d8142e7cb5830cbfb47dba86c (diff) | |
| parent | 9aa2169eaeb20994fb2b0196c051cff52f57a93d (diff) | |
Merge pull request #4510 from keszybz/tree-wide-cleanups
Tree wide cleanups
Diffstat (limited to 'src/systemctl')
| -rw-r--r-- | src/systemctl/systemctl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index dd3b931cd6..9e723b0261 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -527,7 +527,7 @@ static int output_units_list(const UnitInfo *unit_infos, unsigned c) { } if (u->machine) { - j = strjoin(u->machine, ":", u->id, NULL); + j = strjoin(u->machine, ":", u->id); if (!j) return log_oom(); @@ -939,7 +939,7 @@ static int output_sockets_list(struct socket_info *socket_infos, unsigned cs) { char **a; if (s->machine) { - j = strjoin(s->machine, ":", s->path, NULL); + j = strjoin(s->machine, ":", s->path); if (!j) return log_oom(); path = j; @@ -1223,7 +1223,7 @@ static int output_timers_list(struct timer_info *timer_infos, unsigned n) { format_timestamp_relative(trel2, sizeof(trel2), t->last_trigger); if (t->machine) { - j = strjoin(t->machine, ":", t->id, NULL); + j = strjoin(t->machine, ":", t->id); if (!j) return log_oom(); unit = j; @@ -6519,12 +6519,12 @@ static int get_file_to_edit( assert(name); assert(ret_path); - path = strjoin(paths->persistent_config, "/", name, NULL); + path = strjoin(paths->persistent_config, "/", name); if (!path) return log_oom(); if (arg_runtime) { - run = strjoin(paths->runtime_config, "/", name, NULL); + run = strjoin(paths->runtime_config, "/", name); if (!run) return log_oom(); } |