From f0213e3796b4dd66e546e2de4d677db319f9171b Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Mon, 21 Sep 2015 15:53:40 +0200 Subject: networkd: route/address - simplify and unify creators Rename new_dynamic() to simply _new() and reuse that from new_static(). --- src/network/networkd-ipv4ll.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/network/networkd-ipv4ll.c') diff --git a/src/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c index 1902b3d23a..f55b00d36c 100644 --- a/src/network/networkd-ipv4ll.c +++ b/src/network/networkd-ipv4ll.c @@ -42,7 +42,7 @@ static int ipv4ll_address_lost(Link *link) { log_link_debug(link, "IPv4 link-local release %u.%u.%u.%u", ADDRESS_FMT_VAL(addr)); - r = address_new_dynamic(&address); + r = address_new(&address); if (r < 0) { log_link_error_errno(link, r, "Could not allocate address: %m"); return r; @@ -55,7 +55,7 @@ static int ipv4ll_address_lost(Link *link) { address_drop(address, link, &link_address_drop_handler); - r = route_new_dynamic(&route, RTPROT_UNSPEC); + r = route_new(&route, RTPROT_UNSPEC); if (r < 0) { log_link_error_errno(link, r, "Could not allocate route: %m"); return r; @@ -133,7 +133,7 @@ static int ipv4ll_address_claimed(sd_ipv4ll *ll, Link *link) { log_link_debug(link, "IPv4 link-local claim %u.%u.%u.%u", ADDRESS_FMT_VAL(address)); - r = address_new_dynamic(&ll_addr); + r = address_new(&ll_addr); if (r < 0) return r; @@ -149,7 +149,7 @@ static int ipv4ll_address_claimed(sd_ipv4ll *ll, Link *link) { link->ipv4ll_address = false; - r = route_new_dynamic(&route, RTPROT_STATIC); + r = route_new(&route, RTPROT_STATIC); if (r < 0) return r; -- cgit v1.2.3-54-g00ecf