summaryrefslogtreecommitdiff
path: root/src/core/dbus.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-09-09 23:05:10 +0200
committerLennart Poettering <lennart@poettering.net>2015-09-09 23:05:58 +0200
commit6796073e330f49923c5134652ee085e29fc88002 (patch)
tree74846808a3d75996ef72fa305a54c62de6f2c5f0 /src/core/dbus.c
parent1d1423257aa7d486e1affc7495fce83438226245 (diff)
tree-wide: make use of the fact that strv_free() returns NULL
Another Coccinelle patch.
Diffstat (limited to 'src/core/dbus.c')
-rw-r--r--src/core/dbus.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/dbus.c b/src/core/dbus.c
index 0a2180c6a7..dcaf7cc835 100644
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -1059,8 +1059,7 @@ void bus_done(Manager *m) {
m->private_buses = NULL;
m->subscribed = sd_bus_track_unref(m->subscribed);
- strv_free(m->deserialized_subscribed);
- m->deserialized_subscribed = NULL;
+ m->deserialized_subscribed = strv_free(m->deserialized_subscribed);
if (m->private_listen_event_source)
m->private_listen_event_source = sd_event_source_unref(m->private_listen_event_source);
@@ -1191,8 +1190,7 @@ int bus_track_coldplug(Manager *m, sd_bus_track **t, char ***l) {
}
}
- strv_free(*l);
- *l = NULL;
+ *l = strv_free(*l);
return r;
}