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

network: netdev - Use hashmap_ensure_put
---

diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
index 755a67fea8a..81e8fd7cf14 100644
--- a/src/network/netdev/netdev.c
+++ b/src/network/netdev/netdev.c
@@ -756,11 +756,9 @@ int netdev_load_one(Manager *manager, const char *filename) {
                                                       netdev->ifname);
         }
 
-        r = hashmap_ensure_allocated(&netdev->manager->netdevs, &string_hash_ops);
-        if (r < 0)
-                return r;
-
-        r = hashmap_put(netdev->manager->netdevs, netdev->ifname, netdev);
+        r = hashmap_ensure_put(&netdev->manager->netdevs, &string_hash_ops, netdev->ifname, netdev);
+        if (r == -ENOMEM)
+                return log_oom();
         if (r == -EEXIST) {
                 NetDev *n = hashmap_get(netdev->manager->netdevs, netdev->ifname);