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/journalctl.c | |
parent | dad503169b2665ecfd3f5bfb3c936897e44ecca7 (diff) |
journal: replace linked list by hashmap when merging files
Diffstat (limited to 'src/journal/journalctl.c')
-rw-r--r-- | src/journal/journalctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 838e8436e4..7bcd842f6d 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -33,9 +33,9 @@ int main(int argc, char *argv[]) { log_parse_environment(); log_open(); - r = journal_file_open(NULL, "/var/log/journal/system.journal", O_RDONLY, 0644, &f); + r = journal_file_open("/var/log/journal/system.journal", O_RDONLY, 0644, &f); if (r == -ENOENT) - r = journal_file_open(NULL, "/run/log/journal/system.journal", O_RDONLY, 0644, &f); + r = journal_file_open("/run/log/journal/system.journal", O_RDONLY, 0644, &f); if (r < 0) { log_error("Failed to open journal: %s", strerror(-r)); |