diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-02-16 13:48:04 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-02-16 17:15:10 +0100 |
commit | 75db809ae583ef7287e39738195c0825c3070843 (patch) | |
tree | 9793b944d340516003c0fc10ccb9322a4e126721 /src/network/wait-online | |
parent | 5d160a23041254f58acfd35584103df57dc347ae (diff) | |
download | systemd-75db809ae583ef7287e39738195c0825c3070843.tar.gz |
tree-wide: return NULL from freeing functions
I started working on this because I wanted to change how
DEFINE_TRIVIAL_CLEANUP_FUNC is defined. Even independently of that change, it's
nice to make make things more consistent and predictable.
Diffstat (limited to 'src/network/wait-online')
-rw-r--r-- | src/network/wait-online/manager.c | 9 | ||||
-rw-r--r-- | src/network/wait-online/manager.h | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/network/wait-online/manager.c b/src/network/wait-online/manager.c index 8321395550..f6c8cf909f 100644 --- a/src/network/wait-online/manager.c +++ b/src/network/wait-online/manager.c @@ -347,21 +347,18 @@ int manager_new(Manager **ret, Hashmap *interfaces, char **ignore, return 0; } -void manager_free(Manager *m) { +Manager* manager_free(Manager *m) { if (!m) - return; + return NULL; hashmap_free_with_destructor(m->links, link_free); hashmap_free(m->links_by_name); sd_event_source_unref(m->network_monitor_event_source); sd_network_monitor_unref(m->network_monitor); - sd_event_source_unref(m->rtnl_event_source); sd_netlink_unref(m->rtnl); - sd_event_unref(m->event); - free(m); - return; + return mfree(m); } diff --git a/src/network/wait-online/manager.h b/src/network/wait-online/manager.h index f5e83532ae..9892a43dc9 100644 --- a/src/network/wait-online/manager.h +++ b/src/network/wait-online/manager.h @@ -32,7 +32,7 @@ struct Manager { sd_event *event; }; -void manager_free(Manager *m); +Manager* manager_free(Manager *m); int manager_new(Manager **ret, Hashmap *interfaces, char **ignore, LinkOperationalStateRange required_operstate, bool any, usec_t timeout); |