diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-10-07 22:00:05 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-10-07 22:02:06 +0200 |
| commit | 260a2be45522f03ce8d8aca38e471d7b0882ff05 (patch) | |
| tree | 99010f64fe17dbbd9e25a5583673876bb0e2b549 /src/journal/journald.c | |
| parent | dad503169b2665ecfd3f5bfb3c936897e44ecca7 (diff) | |
journal: replace linked list by hashmap when merging files
Diffstat (limited to 'src/journal/journald.c')
| -rw-r--r-- | src/journal/journald.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/journal/journald.c b/src/journal/journald.c index 9297ca6fb7..818e146f94 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -257,11 +257,11 @@ static int process_event(Server *s, struct epoll_event *ev) { static int open_system_journal(JournalFile **f) { int r; - r = journal_file_open(NULL, "/var/log/journal/system.journal", O_RDWR|O_CREAT, 0644, f); + r = journal_file_open("/var/log/journal/system.journal", O_RDWR|O_CREAT, 0644, f); if (r == -ENOENT) { mkdir_p("/run/log/journal", 0755); - r = journal_file_open(NULL, "/run/log/journal/system.journal", O_RDWR|O_CREAT, 0644, f); + r = journal_file_open("/run/log/journal/system.journal", O_RDWR|O_CREAT, 0644, f); } return r; |