summaryrefslogtreecommitdiff
path: root/src/journal/journald.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-07-13 13:41:01 +0200
committerLennart Poettering <lennart@poettering.net>2012-07-13 13:41:01 +0200
commitb7def684941808600c344f0be7a2b9fcdda97e0f (patch)
treed28516d55a035ae9f754cb21e6d97eb3d0e21e27 /src/journal/journald.c
parent184850e8a741beb795f6ea66091f3fb176fce880 (diff)
util: rename join() to strjoin()
This is to match strappend() and the other string related functions.
Diffstat (limited to 'src/journal/journald.c')
-rw-r--r--src/journal/journald.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/journal/journald.c b/src/journal/journald.c
index 2402f7f6d0..fd292f019e 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -1976,7 +1976,7 @@ static int system_journal_open(Server *s) {
(void) mkdir(fn, 0755);
free(fn);
- fn = join("/var/log/journal/", ids, "/system.journal", NULL);
+ fn = strjoin("/var/log/journal/", ids, "/system.journal", NULL);
if (!fn)
return -ENOMEM;
@@ -2002,7 +2002,7 @@ static int system_journal_open(Server *s) {
if (!s->runtime_journal &&
(s->storage != STORAGE_NONE)) {
- fn = join("/run/log/journal/", ids, "/system.journal", NULL);
+ fn = strjoin("/run/log/journal/", ids, "/system.journal", NULL);
if (!fn)
return -ENOMEM;