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

Merge pull request #18299 from ssahani/ensure-put

Browse Source 
More use of hashmap_ensure_put and ordered_hashmap_ensure_put
This commit is contained in:
Yu Watanabe
2021-01-19 08:42:26 +09:00
committed by GitHub
parent 4db4792a93 df24a407a5
commit ceed428305
15 changed files with 44 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resolve/resolved-link.c
+2 -6
View File
@@ -27,10 +27,6 @@ int link_new(Manager *m, Link **ret, int ifindex) {
assert(m);
assert(ifindex > 0);
r = hashmap_ensure_allocated(&m->links, NULL);
if (r < 0)
return r;
l = new(Link, 1);
if (!l)
return -ENOMEM;
@@ -48,7 +44,7 @@ int link_new(Manager *m, Link **ret, int ifindex) {
if (asprintf(&l->state_file, "/run/systemd/resolve/netif/%i", ifindex) < 0)
return -ENOMEM;
r = hashmap_put(m->links, INT_TO_PTR(ifindex), l);
r = hashmap_ensure_put(&m->links, NULL, INT_TO_PTR(ifindex), l);
if (r < 0)
return r;
@@ -56,7 +52,7 @@ int link_new(Manager *m, Link **ret, int ifindex) {
if (ret)
*ret = l;
l = NULL;
TAKE_PTR(l);
return 0;
}