diff options
| author | Daniel Mack <github@zonque.org> | 2015-09-10 13:46:14 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-09-10 13:46:14 +0200 |
| commit | f33be3119806f96898dda6ade492fbdcdf8f79b8 (patch) | |
| tree | 3c470fb770c5a19f848df0487f01af89b0aa6bea /src/core/dbus.c | |
| parent | 89921f6ed085d77225204e160ce2cee99ed0c6fa (diff) | |
| parent | 525d3cc746a037e8cc6b2e0ebaaf76a51856fa6b (diff) | |
Merge pull request #1226 from poettering/coccinelle-fixes3
Third round of Coccinelle fixes
Diffstat (limited to 'src/core/dbus.c')
| -rw-r--r-- | src/core/dbus.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/dbus.c b/src/core/dbus.c index 0a2180c6a7..2d6a1ff836 100644 --- a/src/core/dbus.c +++ b/src/core/dbus.c @@ -1055,12 +1055,10 @@ void bus_done(Manager *m) { while ((b = set_steal_first(m->private_buses))) destroy_bus(m, &b); - set_free(m->private_buses); - m->private_buses = NULL; + m->private_buses = set_free(m->private_buses); 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 +1189,7 @@ int bus_track_coldplug(Manager *m, sd_bus_track **t, char ***l) { } } - strv_free(*l); - *l = NULL; + *l = strv_free(*l); return r; } |