networkd: drop route_drop
It is just an alias for route_free which requires that route is not null, but it was only used in one place where it was checked that route is not null anyway. Let's just call route_free instead.
This commit is contained in:
parent
17fd746098
commit
b9642f4199
|
@ -457,11 +457,9 @@ int manager_rtnl_process_route(sd_netlink *rtnl, sd_netlink_message *message, vo
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case RTM_DELROUTE:
|
case RTM_DELROUTE:
|
||||||
|
route_free(route);
|
||||||
if (route)
|
|
||||||
route_drop(route);
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
assert_not_reached("Received invalid RTNL message type");
|
assert_not_reached("Received invalid RTNL message type");
|
||||||
}
|
}
|
||||||
|
|
|
@ -324,12 +324,6 @@ int route_update(Route *route,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void route_drop(Route *route) {
|
|
||||||
assert(route);
|
|
||||||
|
|
||||||
route_free(route);
|
|
||||||
}
|
|
||||||
|
|
||||||
int route_remove(Route *route, Link *link,
|
int route_remove(Route *route, Link *link,
|
||||||
sd_netlink_message_handler_t callback) {
|
sd_netlink_message_handler_t callback) {
|
||||||
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
|
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
|
||||||
|
|
|
@ -61,7 +61,6 @@ int route_get(Link *link, int family, union in_addr_union *dst, unsigned char ds
|
||||||
int route_add(Link *link, int family, union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, unsigned char table, Route **ret);
|
int route_add(Link *link, int family, union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, unsigned char table, Route **ret);
|
||||||
int route_add_foreign(Link *link, int family, union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, unsigned char table, Route **ret);
|
int route_add_foreign(Link *link, int family, union in_addr_union *dst, unsigned char dst_prefixlen, unsigned char tos, uint32_t priority, unsigned char table, Route **ret);
|
||||||
int route_update(Route *route, union in_addr_union *src, unsigned char src_prefixlen, union in_addr_union *gw, union in_addr_union *prefsrc, unsigned char scope, unsigned char protocol);
|
int route_update(Route *route, union in_addr_union *src, unsigned char src_prefixlen, union in_addr_union *gw, union in_addr_union *prefsrc, unsigned char scope, unsigned char protocol);
|
||||||
void route_drop(Route *route);
|
|
||||||
|
|
||||||
int route_expire_handler(sd_event_source *s, uint64_t usec, void *userdata);
|
int route_expire_handler(sd_event_source *s, uint64_t usec, void *userdata);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue