]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
generator: Use hashmap_ensure_put
authorSusant Sahani <ssahani@vmware.com>
Thu, 14 Jan 2021 05:21:09 +0000 (06:21 +0100)
committerSusant Sahani <ssahani@gmail.com>
Fri, 15 Jan 2021 13:29:42 +0000 (14:29 +0100)
src/network/generator/network-generator.c

index f9b51d8b7bf05ecd64f49ef55f7b758a3d0b7ff3..940a718d20741c02b7652e58e56962946a233d0e 100644 (file)
@@ -190,11 +190,7 @@ static int network_new(Context *context, const char *name, Network **ret) {
                 .dhcp_use_dns = -1,
         };
 
-        r = hashmap_ensure_allocated(&context->networks_by_name, &string_hash_ops);
-        if (r < 0)
-                return r;
-
-        r = hashmap_put(context->networks_by_name, network->ifname, network);
+        r = hashmap_ensure_put(&context->networks_by_name, &string_hash_ops, network->ifname, network);
         if (r < 0)
                 return r;
 
@@ -247,11 +243,7 @@ static int netdev_new(Context *context, const char *_kind, const char *_ifname,
                 .ifname = TAKE_PTR(ifname),
         };
 
-        r = hashmap_ensure_allocated(&context->netdevs_by_name, &string_hash_ops);
-        if (r < 0)
-                return r;
-
-        r = hashmap_put(context->netdevs_by_name, netdev->ifname, netdev);
+        r = hashmap_ensure_put(&context->netdevs_by_name, &string_hash_ops, netdev->ifname, netdev);
         if (r < 0)
                 return r;
 
@@ -299,11 +291,7 @@ static int link_new(Context *context, const char *name, struct ether_addr *mac,
                 .mac = *mac,
         };
 
-        r = hashmap_ensure_allocated(&context->links_by_name, &string_hash_ops);
-        if (r < 0)
-                return r;
-
-        r = hashmap_put(context->links_by_name, link->ifname, link);
+        r = hashmap_ensure_put(&context->links_by_name, &string_hash_ops, link->ifname, link);
         if (r < 0)
                 return r;