From 10c53ed50f3bf17ff54a5bc55674e284ea934462 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 28 Sep 2017 22:25:15 +1000 Subject: [PATCH] vpatch: fix build warning This condition was a bit convoluted and while it was correct, it doesn't look it. Move the '!' into the '==' so the intention is a bit clearer and compiler doesn't complain. Fixes #7 Signed-off-by: NeilBrown --- vpatch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vpatch.c b/vpatch.c index 5aa143c..2c574c8 100644 --- a/vpatch.c +++ b/vpatch.c @@ -2068,8 +2068,8 @@ static int merge_window(struct plist *p, FILE *f, int reverse, int replace, do { pos = tpos; row++; next_mline(&tpos, fm, fb, fa, ci.merger, mmode); - } while (!(check_line(pos, fm, fb, fa, ci.merger, mmode) - & CONFLICTED) == 0 + } while ((check_line(pos, fm, fb, fa, ci.merger, mmode) + & CONFLICTED) != 0 && ci.merger[tpos.p.m].type != End); tpos = pos; row--; do { -- 2.39.5