journal: simplify match_free_if_empty

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index cf60ebcee2756e4fe096c31c565d3cdb336fbc8c..2bad243ea115dc08919af662f49cc47b45488911 100644 (file)
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -197,9 +197,7 @@ static void match_free(Match *m) {
 }
 
 static void match_free_if_empty(Match *m) {
 }
 
 static void match_free_if_empty(Match *m) {

-        assert(m);
-
-        if (m->matches)
+        if (!m || m->matches)

                 return;
 
         match_free(m);
                 return;
 
         match_free(m);


@@ -296,17 +294,10 @@ _public_ int sd_journal_add_match(sd_journal *j, const void *data, size_t size)
         return 0;
 
 fail:
         return 0;
 
 fail:

-        if (add_here)
-                match_free_if_empty(add_here);
-
-        if (j->level2)
-                match_free_if_empty(j->level2);
-
-        if (j->level1)
-                match_free_if_empty(j->level1);
-
-        if (j->level0)
-                match_free_if_empty(j->level0);
+        match_free_if_empty(add_here);
+        match_free_if_empty(j->level2);
+        match_free_if_empty(j->level1);
+        match_free_if_empty(j->level0);

 
         return -ENOMEM;
 }
 
         return -ENOMEM;
 }