From 6796073e330f49923c5134652ee085e29fc88002 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 9 Sep 2015 23:05:10 +0200 Subject: tree-wide: make use of the fact that strv_free() returns NULL Another Coccinelle patch. --- src/core/dbus.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/core/dbus.c') 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; } -- cgit v1.2.3-54-g00ecf