From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 14 Apr 2021 13:13:46 +0000 (+0900)
Subject: network: shorten code a bit
X-Git-Tag: v249-rc1~415^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90afec18341cee5158473a5a1822ed3860ca7bdf;p=thirdparty%2Fsystemd.git

network: shorten code a bit
---

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index 65a6410a5a8..3cf531d7c2d 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -182,7 +182,7 @@ void link_update_operstate(Link *link, bool also_update_master) {
         LinkCarrierState carrier_state;
         LinkAddressState ipv4_address_state, ipv6_address_state, address_state;
         _cleanup_strv_free_ char **p = NULL;
-        uint8_t ipv4_scope = RT_SCOPE_NOWHERE, ipv6_scope = RT_SCOPE_NOWHERE, scope;
+        uint8_t ipv4_scope = RT_SCOPE_NOWHERE, ipv6_scope = RT_SCOPE_NOWHERE;
         bool changed = false;
         Address *address;
 
@@ -215,11 +215,11 @@ void link_update_operstate(Link *link, bool also_update_master) {
                 if (!address_is_ready(address))
                         continue;
 
-                if (address->family == AF_INET && address->scope < ipv4_scope)
-                        ipv4_scope = address->scope;
+                if (address->family == AF_INET)
+                        ipv4_scope = MIN(ipv4_scope, address->scope);
 
-                if (address->family == AF_INET6 && address->scope < ipv6_scope)
-                        ipv6_scope = address->scope;
+                if (address->family == AF_INET6)
+                        ipv6_scope = MIN(ipv6_scope, address->scope);
         }
 
         /* for operstate we also take foreign addresses into account */
@@ -227,18 +227,16 @@ void link_update_operstate(Link *link, bool also_update_master) {
                 if (!address_is_ready(address))
                         continue;
 
-                if (address->family == AF_INET && address->scope < ipv4_scope)
-                        ipv4_scope = address->scope;
+                if (address->family == AF_INET)
+                        ipv4_scope = MIN(ipv4_scope, address->scope);
 
-                if (address->family == AF_INET6 && address->scope < ipv6_scope)
-                        ipv6_scope = address->scope;
+                if (address->family == AF_INET6)
+                        ipv6_scope = MIN(ipv6_scope, address->scope);
         }
 
         ipv4_address_state = address_state_from_scope(ipv4_scope);
         ipv6_address_state = address_state_from_scope(ipv6_scope);
-
-        scope = MIN(ipv4_scope, ipv6_scope);
-        address_state = address_state_from_scope(scope);
+        address_state = address_state_from_scope(MIN(ipv4_scope, ipv6_scope));
 
         /* Mapping of address and carrier state vs operational state
          *                                                     carrier state
diff --git a/src/network/networkd-state-file.c b/src/network/networkd-state-file.c
index 34613697d68..f8243cc3eef 100644
--- a/src/network/networkd-state-file.c
+++ b/src/network/networkd-state-file.c
@@ -125,20 +125,11 @@ int manager_save(Manager *m) {
                 if (link->flags & IFF_LOOPBACK)
                         continue;
 
-                if (link->operstate > operstate)
-                        operstate = link->operstate;
-
-                if (link->carrier_state > carrier_state)
-                        carrier_state = link->carrier_state;
-
-                if (link->address_state > address_state)
-                        address_state = link->address_state;
-
-                if (link->ipv4_address_state > ipv4_address_state)
-                        ipv4_address_state = link->ipv4_address_state;
-
-                if (link->ipv6_address_state > ipv6_address_state)
-                        ipv6_address_state = link->ipv6_address_state;
+                operstate = MAX(operstate, link->operstate);
+                carrier_state = MAX(carrier_state, link->carrier_state);
+                address_state = MAX(address_state, link->address_state);
+                ipv4_address_state = MAX(ipv4_address_state, link->ipv4_address_state);
+                ipv6_address_state = MAX(ipv6_address_state, link->ipv6_address_state);
 
                 if (!link->network)
                         continue;