From: Antonio Quartulli <a@unstable.cc>
Date: Thu, 24 Aug 2017 07:55:47 +0000 (+0800)
Subject: fragment.c: simplify boolean expression
X-Git-Tag: v2.4.4~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14e4c58b6f903c562475379bb806e26c42d6a52e;p=thirdparty%2Fopenvpn.git

fragment.c: simplify boolean expression

!A || (A && B) is equivalent to the simpler !A || B
therefore it is preferable to use the second version as
it is simpler to parse while reading the code.

Signed-off-by: Antonio Quartulli <a@unstable.cc>
Acked-by: David Sommerseth <davids@openvpn.net>
Message-Id: <20170824075547.29844-1-a@unstable.cc>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15313.html
Signed-off-by: David Sommerseth <davids@openvpn.net>
(cherry picked from commit 10ae9ed5fe7f09c7edb5af266149a9b5e9bcbaa4)
---

diff --git a/src/openvpn/fragment.c b/src/openvpn/fragment.c
index 38de62f12..84f012144 100644
--- a/src/openvpn/fragment.c
+++ b/src/openvpn/fragment.c
@@ -208,7 +208,7 @@ fragment_incoming(struct fragment_master *f, struct buffer *buf,
             }
 
             /* is this the first fragment for our sequence number? */
-            if (!frag->defined || (frag->defined && frag->max_frag_size != size))
+            if (!frag->defined || frag->max_frag_size != size)
             {
                 frag->defined = true;
                 frag->max_frag_size = size;