From ae4ad9df48dc50ad4a5d553f923e186665b7b031 Mon Sep 17 00:00:00 2001 From: Susant Sahani Date: Mon, 18 Jan 2021 19:05:05 +0100 Subject: [PATCH] resolve: link - use hashmap_ensure_put --- src/resolve/resolved-link.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/resolve/resolved-link.c b/src/resolve/resolved-link.c index 4fa4451ab75..06c2432c0a7 100644 --- a/src/resolve/resolved-link.c +++ b/src/resolve/resolved-link.c @@ -27,10 +27,6 @@ int link_new(Manager *m, Link **ret, int ifindex) { assert(m); assert(ifindex > 0); - r = hashmap_ensure_allocated(&m->links, NULL); - if (r < 0) - return r; - l = new(Link, 1); if (!l) return -ENOMEM; @@ -48,7 +44,7 @@ int link_new(Manager *m, Link **ret, int ifindex) { if (asprintf(&l->state_file, "/run/systemd/resolve/netif/%i", ifindex) < 0) return -ENOMEM; - r = hashmap_put(m->links, INT_TO_PTR(ifindex), l); + r = hashmap_ensure_put(&m->links, NULL, INT_TO_PTR(ifindex), l); if (r < 0) return r; @@ -56,7 +52,7 @@ int link_new(Manager *m, Link **ret, int ifindex) { if (ret) *ret = l; - l = NULL; + TAKE_PTR(l); return 0; } -- 2.47.3