journal: make mmap_cache_unref() a NOP when NULL is passed, like all other destructors

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index f9ff9545dddd7493e500ff32b2060ff53bfa3a7a..6f09301521bfd9f68c5cde08df121bbf56bfe8fa 100644 (file)
--- 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 5a07ddda764552df5f4275ec273d71b5e1d4a858..eb4b092e80ac08a2dbb74c683088373d4a408ba3 100644 (file)
--- 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 --;