diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-06-05 15:12:29 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-06-22 16:32:37 +0200 |
commit | de7fef4b6eb4f5ca1cd21a309c37d0a74d4d305b (patch) | |
tree | ead57ab4a03ef723497b65d0efd79ea8973aaaed /src/network/networkd-network.c | |
parent | 0f9ccd95525c9869b6a23b71f6b7dbb2a7038674 (diff) | |
download | systemd-de7fef4b6eb4f5ca1cd21a309c37d0a74d4d305b.tar.gz |
tree-wide: use set_ensure_put()
Patch contains a coccinelle script, but it only works in some cases. Many
parts were converted by hand.
Note: I did not fix errors in return value handing. This will be done separate
to keep the patch comprehensible. No functional change is intended in this
patch.
Diffstat (limited to 'src/network/networkd-network.c')
-rw-r--r-- | src/network/networkd-network.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index f0fa5d0427..01f08a5552 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -1268,15 +1268,11 @@ int config_parse_dnssec_negative_trust_anchors( continue; } - r = set_ensure_allocated(&n->dnssec_negative_trust_anchors, &dns_name_hash_ops); - if (r < 0) - return log_oom(); - - r = set_put(n->dnssec_negative_trust_anchors, w); + r = set_ensure_put(&n->dnssec_negative_trust_anchors, &dns_name_hash_ops, w); if (r < 0) return log_oom(); if (r > 0) - w = NULL; + TAKE_PTR(w); } return 0; |