diff options
author | Michal Schmidt <mschmidt@redhat.com> | 2014-08-19 13:38:53 +0200 |
---|---|---|
committer | Michal Schmidt <mschmidt@redhat.com> | 2014-10-23 17:38:02 +0200 |
commit | c1f906bd91c388fd84a006a56e1e6692e23f8ae3 (patch) | |
tree | a7a587ada295261a4b92ea69ca80adf0b7e5a7b7 /src/journal/journalctl.c | |
parent | 43cf8388ea4ffed1801468d4b650d6e48eefce9e (diff) |
journal: make sd_journal::files a OrderedHashmap
Anything that uses hashmap_next() almost certainly cares about the order
and needs to be an OrderedHashmap.
Diffstat (limited to 'src/journal/journalctl.c')
-rw-r--r-- | src/journal/journalctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index c32028268a..dfde0a9355 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -1508,7 +1508,7 @@ static int verify(sd_journal *j) { log_show_color(true); - HASHMAP_FOREACH(f, j->files, i) { + ORDERED_HASHMAP_FOREACH(f, j->files, i) { int k; usec_t first, validated, last; @@ -1603,7 +1603,7 @@ static int access_check(sd_journal *j) { assert(j); if (set_isempty(j->errors)) { - if (hashmap_isempty(j->files)) + if (ordered_hashmap_isempty(j->files)) log_notice("No journal files were found."); return 0; } @@ -1635,7 +1635,7 @@ static int access_check(sd_journal *j) { } #endif - if (hashmap_isempty(j->files)) { + if (ordered_hashmap_isempty(j->files)) { log_error("No journal files were opened due to insufficient permissions."); r = -EACCES; } |