From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 17 Sep 2019 17:27:58 +0000 (+0200)
Subject: networkd: unbreak routing_policy_rule_compare_func()
X-Git-Tag: v244-rc1~280^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=314ed4f9948bb73300862935546a63294bba1d5c;p=thirdparty%2Fsystemd.git

networkd: unbreak routing_policy_rule_compare_func()

!r is the same r == 0, so this was short-circuiting the comparison when
streq(a->iff, b->iff) or streq(a->off, b->off). Before the parent commit which
moved those comparisons to the end, this was short-circuiting quite a bit
of the comparison function.
---

diff --git a/src/network/networkd-routing-policy-rule.c b/src/network/networkd-routing-policy-rule.c
index 1c2c28b02ac..8203f87c9fa 100644
--- a/src/network/networkd-routing-policy-rule.c
+++ b/src/network/networkd-routing-policy-rule.c
@@ -199,11 +199,11 @@ static int routing_policy_rule_compare_func(const RoutingPolicyRule *a, const Ro
                         return r;
 
                 r = strcmp_ptr(a->iif, b->iif);
-                if (!r)
+                if (r != 0)
                         return r;
 
                 r = strcmp_ptr(a->oif, b->oif);
-                if (!r)
+                if (r != 0)
                         return r;
 
                 return 0;