From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 15 Jul 2021 09:56:09 +0000 (+0900)
Subject: network: slightly simplify log_address_debug()
X-Git-Tag: v250-rc1~948^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa3f917a25a015b55087307321fac6bbcc7811f8;p=thirdparty%2Fsystemd.git

network: slightly simplify log_address_debug()
---

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index c244175088f..2d3f8ece2d2 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -638,7 +638,6 @@ char *format_lifetime(char *buf, size_t l, uint32_t lifetime) {
 
 static void log_address_debug(const Address *address, const char *str, const Link *link) {
         _cleanup_free_ char *addr = NULL, *peer = NULL, *flags_str = NULL;
-        bool has_peer;
 
         assert(address);
         assert(str);
@@ -648,15 +647,13 @@ static void log_address_debug(const Address *address, const char *str, const Lin
                 return;
 
         (void) in_addr_to_string(address->family, &address->in_addr, &addr);
-        has_peer = in_addr_is_set(address->family, &address->in_addr_peer);
-        if (has_peer)
+        if (in_addr_is_set(address->family, &address->in_addr_peer))
                 (void) in_addr_to_string(address->family, &address->in_addr_peer, &peer);
 
         (void) address_flags_to_string_alloc(address->flags, address->family, &flags_str);
 
         log_link_debug(link, "%s address: %s%s%s/%u (valid %s, preferred %s), flags: %s",
-                       str, strnull(addr), has_peer ? " peer " : "",
-                       has_peer ? strnull(peer) : "", address->prefixlen,
+                       str, strnull(addr), peer ? " peer " : "", strempty(peer), address->prefixlen,
                        FORMAT_LIFETIME(address->cinfo.ifa_valid),
                        FORMAT_LIFETIME(address->cinfo.ifa_prefered),
                        strna(flags_str));