From: Kay Sievers <kay@vrfy.org>
Date: Sun, 5 Jan 2014 14:53:39 +0000 (+0400)
Subject: Revert "bus: driverd: don't attempt to remove from empty list"
X-Git-Tag: v209~529
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=4bf7665c760bdd011cee3c5a9b03c8e109991241

Revert "bus: driverd: don't attempt to remove from empty list"

We need to find the real reason for the failure, this just
avoids the symptoms.

This reverts commit 215c7625dd510759290d45d6c46434e4338843ec.
---

diff --git a/src/bus-driverd/bus-driverd.c b/src/bus-driverd/bus-driverd.c
index f8a123d4f..44172c4ed 100644
--- a/src/bus-driverd/bus-driverd.c
+++ b/src/bus-driverd/bus-driverd.c
@@ -90,10 +90,10 @@ static void match_free(Match *m) {
                 Match *first;
 
                 first = hashmap_get(m->client->matches, m->match);
-                if (first) {
-                        LIST_REMOVE(matches, first, m);
+                LIST_REMOVE(matches, first, m);
+                if (first)
                         assert_se(hashmap_replace(m->client->matches, m->match, first) >= 0);
-                } else
+                else
                         hashmap_remove(m->client->matches, m->match);
 
                 m->client->n_matches--;