SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18243 from ssahani/ensure-put-use

Browse Source 
tree-wide: introduce hashmap_ensure_put() and use it
This commit is contained in:
Yu Watanabe
2021-01-17 15:39:41 +09:00
committed by GitHub
parent 95dd454edc a307a7dd38
commit 16ed53658a
19 changed files with 38 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/netdev/netdev.c
+3 -5
View File
@@ -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);
src/network/netdev/wireguard.c
+1 -5
View File
@@ -91,11 +91,7 @@ static int wireguard_peer_new_static(Wireguard *w, const char *filename, unsigne
LIST_PREPEND(peers, w->peers, peer);
r = hashmap_ensure_allocated(&w->peers_by_section, &network_config_hash_ops);
if (r < 0)
return r;
r = hashmap_put(w->peers_by_section, peer->section, peer);
r = hashmap_ensure_put(&w->peers_by_section, &network_config_hash_ops, peer->section, peer);
if (r < 0)
return r;