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.

---
 src/openvpn/fragment.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

index 25ffc4cf..36588060 100644
@@ -209,7 +209,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;

2.14.1

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

ACK. Code change is just obvious.

Your patch has been applied to the following branches

commit 10ae9ed5fe7f09c7edb5af266149a9b5e9bcbaa4 (master) commit 14e4c58b6f903c562475379bb806e26c42d6a52e (release/2.4)

Author: Antonio Quartulli
Date:   Thu Aug 24 15:55:47 2017 +0800

     fragment.c: simplify boolean expression

     Signed-off-by: Antonio Quartulli <[email protected]...>
     Acked-by: David Sommerseth <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg15313.html
     Signed-off-by: David Sommerseth <[email protected]...>

- --
kind regards,

David Sommerseth

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iQIcBAEBCgAGBQJZsIExAAoJEIbPlEyWcf3y/38P/1ut5QuaBHv0coi7HlMqC+vE wOS4Ks0MBV5zhzAzIN/geKr5NPOXP6S/atqNSf4jUwoUfFkI4qR5jStff8YnAf8C ms3PNzBxEYcHoOhXw2VT2Qs38nQOx4lRTX0xu59gHtvsV1n+sldqMwLXpdrHIDkR Gl4gaqHUUAjx+hf2FRbr7C/2MhzDgb4Ugt0AhyipRiwkTKCwIQgjynvBhsAxoO9K KUwfypm9vMO2R9rdpVjCkL62urGbPZd06ftCIlrMEqmLq4hQHwVYDtCJaG4n5g4c WHf9yi+jl8UfvUVjGJI1vCudbhyFTIdEsCdwxGBvrPmrS0nF0eoD4smppdE1oACt DFJDZu+e21EIYmiziotg4LVg3pc1jbz27bMTLe4QplrRu6o4QsoXbVGorSvlVS3A EEIMKMX40+q7yyTwsj+7tpGKdSQ58f/CuBVYgOij8nY/QrMGgbC2tzbPwfkDMoUv LVwPOzNH3vZvn3QuzzQI2NI6S5//GsZKggp3X+D4V5oKm93Xw6RA/DuZWOVFC3gT nm4rGGbrWBT/pfaF4On2LueyS5c8ZykXnuIIWpVL0jlFS3aJitlk35H4Iz+ngvIj QhNlucqtccyS33HxCN6PU65F3ZG42/2UjViWsQl60AF0b+1bM/EOgEmwS3jUtZ48 2xyv0C/wjiG1/0ACUZo2
=qnN8
-----END PGP SIGNATURE-----