cmd/tests: Simplify boolean expressions (PVS-Studio)

Frédéric Delanoy frederic.delanoy at gmail.com
Tue Oct 13 18:58:39 CDT 2015


Signed-off-by: Frédéric Delanoy <frederic.delanoy at gmail.com>
---
 programs/cmd/tests/batch.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c
index 9df0bc5..c1847d6 100644
--- a/programs/cmd/tests/batch.c
+++ b/programs/cmd/tests/batch.c
@@ -320,13 +320,14 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da
             /* If we rewind to the beginning of the line, don't increment line number */
             line--;
         }
-        else if (!is_exp_resync || (is_exp_resync && !err))
+        else if (!is_exp_resync || !err)
         {
             exp_ptr = exp_nl+1;
             if(exp_nl+1 < exp_data+exp_size && exp_nl[0] == '\r' && exp_nl[1] == '\n')
                 exp_ptr++;
         }
-        if (!is_out_resync || (is_out_resync && !err))
+
+        if (!is_out_resync || !err)
         {
             out_ptr = out_nl+1;
             if(out_nl+1 < out_data+out_size && out_nl[0] == '\r' && out_nl[1] == '\n')
-- 
2.6.1




More information about the wine-patches mailing list