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/journal/journald-server.c | |
| parent | a1e2ef7ec912902d8142e7cb5830cbfb47dba86c (diff) | |
| parent | 9aa2169eaeb20994fb2b0196c051cff52f57a93d (diff) | |
Merge pull request #4510 from keszybz/tree-wide-cleanups
Tree wide cleanups
Diffstat (limited to 'src/journal/journald-server.c')
| -rw-r--r-- | src/journal/journald-server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 908c7b8eeb..dee153a4cf 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -731,7 +731,7 @@ static int get_invocation_id(const char *cgroup_root, const char *slice, const c if (!escaped) return -ENOMEM; - p = strjoin(cgroup_root, "/", slice_path, "/", escaped, NULL); + p = strjoin(cgroup_root, "/", slice_path, "/", escaped); if (!p) return -ENOMEM; @@ -2051,8 +2051,8 @@ int server_init(Server *s) { s->runtime_storage.name = "Runtime journal"; s->system_storage.name = "System journal"; - s->runtime_storage.path = strjoin("/run/log/journal/", SERVER_MACHINE_ID(s), NULL); - s->system_storage.path = strjoin("/var/log/journal/", SERVER_MACHINE_ID(s), NULL); + s->runtime_storage.path = strjoin("/run/log/journal/", SERVER_MACHINE_ID(s)); + s->system_storage.path = strjoin("/var/log/journal/", SERVER_MACHINE_ID(s)); if (!s->runtime_storage.path || !s->system_storage.path) return -ENOMEM; |