From: Susant Sahani <ssahani@vmware.com>
Date: Wed, 20 Jan 2021 11:59:03 +0000 (+0100)
Subject: network: Use hashmap_ensure_put
X-Git-Tag: v248-rc1~286^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6de530f2b89295e000807f9decc46d8e0ebd99b4;p=thirdparty%2Fsystemd.git

network: Use hashmap_ensure_put
---

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 97a5f1b0d1b..cb60dfee8da 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -805,11 +805,9 @@ int config_parse_stacked_netdev(const char *unit,
         if (!name)
                 return log_oom();
 
-        r = hashmap_ensure_allocated(h, &string_hash_ops);
-        if (r < 0)
+        r = hashmap_ensure_put(h, &string_hash_ops, name, INT_TO_PTR(kind));
+        if (r == -ENOMEM)
                 return log_oom();
-
-        r = hashmap_put(*h, name, INT_TO_PTR(kind));
         if (r < 0)
                 log_syntax(unit, LOG_WARNING, filename, line, r,
                            "Cannot add NetDev '%s' to network, ignoring assignment: %m", name);