]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
resolve: link - use hashmap_ensure_put
authorSusant Sahani <ssahani@vmware.com>
Mon, 18 Jan 2021 18:05:05 +0000 (19:05 +0100)
committerSusant Sahani <ssahani@vmware.com>
Mon, 18 Jan 2021 20:53:13 +0000 (21:53 +0100)
src/resolve/resolved-link.c

index 4fa4451ab75f10a06625fdee6a10f825e0cbcbc5..06c2432c0a797ddc4e02cdc4a0934e5db2e2025d 100644 (file)
@@ -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;
 }