picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

network: make routing_policy_rule_free() returns NULL

Browse source
This commit is contained in:
Yu Watanabe 2020-09-29 15:36:53 +09:00
parent 816ef8d1da
commit b0815fa499
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/network/networkd-routing-policy-rule.c
View file

@ -84,10 +84,9 @@ static int routing_policy_rule_new_static(Network *network, const char *filename
return 0; return 0;
} }
void routing_policy_rule_free(RoutingPolicyRule *rule) { RoutingPolicyRule *routing_policy_rule_free(RoutingPolicyRule *rule) {
if (!rule) if (!rule)
return; return NULL;
if (rule->network) { if (rule->network) {
LIST_REMOVE(rules, rule->network->rules, rule); LIST_REMOVE(rules, rule->network->rules, rule);
@ -108,7 +107,8 @@ void routing_policy_rule_free(RoutingPolicyRule *rule) {
network_config_section_free(rule->section); network_config_section_free(rule->section);
free(rule->iif); free(rule->iif);
free(rule->oif); free(rule->oif);
free(rule);
return mfree(rule);
} }
static int routing_policy_rule_copy(RoutingPolicyRule *dest, RoutingPolicyRule *src) { static int routing_policy_rule_copy(RoutingPolicyRule *dest, RoutingPolicyRule *src) {

2
src/network/networkd-routing-policy-rule.h
View file

@ -57,7 +57,7 @@ struct RoutingPolicyRule {
}; };
int routing_policy_rule_new(RoutingPolicyRule **ret); int routing_policy_rule_new(RoutingPolicyRule **ret);
void routing_policy_rule_free(RoutingPolicyRule *rule); RoutingPolicyRule *routing_policy_rule_free(RoutingPolicyRule *rule);
DEFINE_NETWORK_SECTION_FUNCTIONS(RoutingPolicyRule, routing_policy_rule_free); DEFINE_NETWORK_SECTION_FUNCTIONS(RoutingPolicyRule, routing_policy_rule_free);
int routing_policy_rule_section_verify(RoutingPolicyRule *rule); int routing_policy_rule_section_verify(RoutingPolicyRule *rule);