From: Susant Sahani <ssahani@vmware.com>
Date: Thu, 14 Jan 2021 05:21:09 +0000 (+0100)
Subject: generator: Use hashmap_ensure_put
X-Git-Tag: v248-rc1~323^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c6194e88255150958713394f81f99fb7f16523e8;p=thirdparty%2Fsystemd.git

generator: Use hashmap_ensure_put
---

diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
index f9b51d8b7bf..940a718d207 100644
--- a/src/network/generator/network-generator.c
+++ b/src/network/generator/network-generator.c
@@ -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;