From 81fd92809db30498308912dc09fa6b1c6cadc686 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 13 Oct 2024 15:17:07 +0900 Subject: [PATCH] network/address: use config_parse_in_addr_non_null() at one more place No functional change, just refactoring. --- src/network/networkd-address.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index 228cb93fc82..0e06149f33c 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -2030,7 +2030,6 @@ static int config_parse_broadcast( void *userdata) { Address *address = ASSERT_PTR(userdata); - union in_addr_union u; int r; /* Do not check or set address->family here. It will be checked later in @@ -2052,16 +2051,13 @@ static int config_parse_broadcast( return 1; } - r = in_addr_from_string(AF_INET, rvalue, &u); - if (r < 0) - return log_syntax_parse_error(unit, filename, line, r, lvalue, rvalue); - if (in4_addr_is_null(&u.in)) { - log_syntax(unit, LOG_WARNING, filename, line, 0, - "Broadcast cannot be ANY address, ignoring assignment: %s", rvalue); - return 0; - } + r = config_parse_in_addr_non_null( + unit, filename, line, section, section_line, + lvalue, /* ltype = */ AF_INET, rvalue, + &address->broadcast, /* userdata = */ NULL); + if (r <= 0) + return r; - address->broadcast = u.in; address->set_broadcast = true; return 1; } -- 2.47.3