From: Shawn Landden <slandden@gmail.com>
Date: Tue, 21 Nov 2017 07:24:12 +0000 (-0800)
Subject: shared: silence gcc warning (#7402)
X-Git-Tag: v236~162
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=172378e01bff23d27a1373f96913badbb30a61d8;p=thirdparty%2Fsystemd.git

shared: silence gcc warning (#7402)

[346/1860] Compiling C object 'src/shared/systemd-shared-235@sha/firewall-util.c.o'.
../src/shared/firewall-util.c: In function ‘entry_fill_basics’:
../src/shared/firewall-util.c:81:79: warning: logical ‘and’ of equal expressions [-Wlogical-op]
[543/1860] Compiling C object 'src/shared/systemd-shared-235@sta/firewall-util.c.o'.
../src/shared/firewall-util.c: In function ‘entry_fill_basics’:
../src/shared/firewall-util.c:81:79: warning: logical ‘and’ of equal expressions [-Wlogical-op]
---

diff --git a/src/shared/firewall-util.c b/src/shared/firewall-util.c
index 1c595ce2516..a6859462ac5 100644
--- a/src/shared/firewall-util.c
+++ b/src/shared/firewall-util.c
@@ -78,7 +78,8 @@ static int entry_fill_basics(
 
         if (out_interface) {
                 size_t l = strlen(out_interface);
-                assert(l < sizeof entry->ip.outiface && l < sizeof entry->ip.outiface_mask);
+                assert(l < sizeof entry->ip.outiface);
+                assert(l < sizeof entry->ip.outiface_mask);
 
                 strcpy(entry->ip.outiface, out_interface);
                 memset(entry->ip.outiface_mask, 0xFF, l + 1);