summaryrefslogtreecommitdiff
path: root/src/shared/conf-parser.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2021-11-05 01:33:25 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2021-11-09 21:39:09 +0900
commitc6df73ca72ecbe5c9a41ff19b49f7187fa326a58 (patch)
treedc1ff2d6620425d6a08d6d28ae0850a90eecbd3c /src/shared/conf-parser.c
parentaa4f765326aa75622f1ab50068ca824ed33ecf8e (diff)
downloadsystemd-c6df73ca72ecbe5c9a41ff19b49f7187fa326a58.tar.gz
ether-addr-util: introduce {hw,ether}_addr_hash_ops_free
Diffstat (limited to 'src/shared/conf-parser.c')
-rw-r--r--src/shared/conf-parser.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index f0633a71d1..35027b8dfa 100644
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -1384,7 +1384,7 @@ int config_parse_ether_addrs(
if (isempty(rvalue)) {
/* Empty assignment resets the list */
- *hwaddrs = set_free_free(*hwaddrs);
+ *hwaddrs = set_free(*hwaddrs);
return 0;
}
@@ -1414,11 +1414,9 @@ int config_parse_ether_addrs(
continue;
}
- r = set_ensure_put(hwaddrs, &ether_addr_hash_ops, n);
+ r = set_ensure_consume(hwaddrs, &ether_addr_hash_ops_free, TAKE_PTR(n));
if (r < 0)
return log_oom();
- if (r > 0)
- TAKE_PTR(n); /* avoid cleanup */
}
}