diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-08-17 11:30:31 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-08-17 11:30:31 +0200 |
| commit | aaa2a3abf9b3f027918b60fe0d0340fcd4874291 (patch) | |
| tree | 20ffef498556100193946c2bc6c5f6da51a4166d /src/journal | |
| parent | 22175a39e8df964b26def7988b841b348de9c97a (diff) | |
| parent | 3e044c492e3ebe64f4e3175c94f9db8a62557b82 (diff) | |
Merge pull request #976 from elfring/Remove_unnecessary_checks2
Delete unnecessary checks before some function calls
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/journal-file.c | 2 | ||||
| -rw-r--r-- | src/journal/journald-server.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index f7815b2796..4f94799ce7 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -169,7 +169,7 @@ void journal_file_close(JournalFile *f) { #ifdef HAVE_GCRYPT if (f->fss_file) munmap(f->fss_file, PAGE_ALIGN(f->fss_file_size)); - else if (f->fsprg_state) + else free(f->fsprg_state); free(f->fsprg_seed); diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 28b1472ac8..fa2e9b9825 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1689,6 +1689,5 @@ void server_done(Server *s) { if (s->mmap) mmap_cache_unref(s->mmap); - if (s->udev) - udev_unref(s->udev); + udev_unref(s->udev); } |