]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
network: wait-online - use hashmap_ensure_put
authorSusant Sahani <ssahani@vmware.com>
Mon, 18 Jan 2021 12:09:23 +0000 (13:09 +0100)
committerSusant Sahani <ssahani@vmware.com>
Mon, 18 Jan 2021 20:35:20 +0000 (21:35 +0100)
src/network/wait-online/link.c

index 529fc9f22a27fc4f4fefc8bc6b74b81c5c549bd3..d0f334761738db62ad02e3aa8d7b3b000dcbd508 100644 (file)
@@ -16,14 +16,6 @@ int link_new(Manager *m, Link **ret, int ifindex, const char *ifname) {
         assert(m);
         assert(ifindex > 0);
 
-        r = hashmap_ensure_allocated(&m->links, NULL);
-        if (r < 0)
-                return r;
-
-        r = hashmap_ensure_allocated(&m->links_by_name, &string_hash_ops);
-        if (r < 0)
-                return r;
-
         n = strdup(ifname);
         if (!n)
                 return -ENOMEM;
@@ -39,11 +31,11 @@ int link_new(Manager *m, Link **ret, int ifindex, const char *ifname) {
                 .required_operstate = LINK_OPERSTATE_RANGE_DEFAULT,
         };
 
-        r = hashmap_put(m->links_by_name, l->ifname, l);
+        r = hashmap_ensure_put(&m->links, NULL, INT_TO_PTR(ifindex), l);
         if (r < 0)
                 return r;
 
-        r = hashmap_put(m->links, INT_TO_PTR(ifindex), l);
+        r = hashmap_ensure_put(&m->links_by_name, &string_hash_ops, l->ifname, l);
         if (r < 0)
                 return r;