diff options
author | Lennart Poettering <lennart@poettering.net> | 2012-03-15 20:49:25 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2012-03-15 20:49:25 +0100 |
commit | 34a35eced40860181757abe5ec00ac0e5d8d0225 (patch) | |
tree | d9ed02c41135deb476878aadb72f97f8a898534b /src/journal | |
parent | 490e567dbb12928528d395d2c759b80960312e8f (diff) |
a couple of fixes to make llvm-analyze quiet
Diffstat (limited to 'src/journal')
-rw-r--r-- | src/journal/journalctl.c | 2 | ||||
-rw-r--r-- | src/journal/journald.c | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 089086eb98..d5560723bc 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -284,7 +284,7 @@ int main(int argc, char *argv[]) { line ++; - r = output_journal(j, arg_output, line, arg_show_all); + r = output_journal(j, arg_output, line, 0, arg_show_all); if (r < 0) goto finish; diff --git a/src/journal/journald.c b/src/journal/journald.c index 74a58b0462..baad3ab1ad 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -154,13 +154,10 @@ static uint64_t available_space(Server *s) { for (;;) { struct stat st; struct dirent buf, *de; - int k; - k = readdir_r(d, &buf, &de); - if (k != 0) { - r = -k; - goto finish; - } + r = readdir_r(d, &buf, &de); + if (r != 0) + break; if (!de) break; |