summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-12-10 11:25:14 +0100
committerLennart Poettering <lennart@poettering.net>2015-12-10 11:35:52 +0100
commitf649045c10ace1b49cb6fbefdc33747a1aab28bc (patch)
tree19ffd9fbf0e0d187f5c3f425d2285e849a536155
parent9eae2bf3189c07e30a752e38b2ad3856450f1d06 (diff)
journal: make mmap_cache_unref() a NOP when NULL is passed, like all other destructors
-rw-r--r--src/journal/journal-file.c3
-rw-r--r--src/journal/mmap-cache.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index f9ff9545dd..6f09301521 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -169,8 +169,7 @@ JournalFile* journal_file_close(JournalFile *f) {
safe_close(f->fd);
free(f->path);
- if (f->mmap)
- mmap_cache_unref(f->mmap);
+ mmap_cache_unref(f->mmap);
ordered_hashmap_free_free(f->chain_cache);
diff --git a/src/journal/mmap-cache.c b/src/journal/mmap-cache.c
index 5a07ddda76..eb4b092e80 100644
--- a/src/journal/mmap-cache.c
+++ b/src/journal/mmap-cache.c
@@ -348,7 +348,10 @@ static void mmap_cache_free(MMapCache *m) {
}
MMapCache* mmap_cache_unref(MMapCache *m) {
- assert(m);
+
+ if (!m)
+ return NULL;
+
assert(m->n_ref > 0);
m->n_ref --;