summaryrefslogtreecommitdiff
path: root/src/network/generator
diff options
context:
space:
mode:
authorSusant Sahani <ssahani@vmware.com>2021-01-14 06:21:09 +0100
committerSusant Sahani <ssahani@gmail.com>2021-01-15 14:29:42 +0100
commitc6194e88255150958713394f81f99fb7f16523e8 (patch)
tree412e9d5056d36290bef3c6a6e6a1106ddfa46abf /src/network/generator
parent1346c36d5afa48a39b36485d80552fc1ae24ed12 (diff)
downloadsystemd-c6194e88255150958713394f81f99fb7f16523e8.tar.gz
generator: Use hashmap_ensure_put
Diffstat (limited to 'src/network/generator')
-rw-r--r--src/network/generator/network-generator.c18
1 files changed, 3 insertions, 15 deletions
diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c
index f9b51d8b7b..940a718d20 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;