summaryrefslogtreecommitdiff
path: root/src/network/wait-online
diff options
context:
space:
mode:
Diffstat (limited to 'src/network/wait-online')
-rw-r--r--src/network/wait-online/manager.c9
-rw-r--r--src/network/wait-online/manager.h2
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);