From 1655dcd108b24380c19069e529a1654383870282 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Tue, 13 Nov 2012 10:05:15 +1100 Subject: [PATCH] vpatch: remove CHANGED The 'CHANGED' flag is unused, so discard it to avoid confusion. Signed-off-by: NeilBrown --- vpatch.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/vpatch.c b/vpatch.c index fa3a3f3..b6377cf 100644 --- a/vpatch.c +++ b/vpatch.c @@ -255,10 +255,9 @@ static char *typenames[] = { #define AFTER 2 #define ORIG 4 #define RESULT 8 -#define CHANGED 16 /* The RESULT is different to ORIG */ -#define CHANGES 32 /* AFTER is different to BEFORE */ -#define WIGGLED 64 /* a conflict that was successfully resolved */ -#define CONFLICTED 128 /* a conflict that was not successfully resolved */ +#define CHANGES 16 /* AFTER is different to BEFORE */ +#define WIGGLED 32 /* a conflict that was successfully resolved */ +#define CONFLICTED 64 /* a conflict that was not successfully resolved */ /* Displaying a Merge. * The first step is to linearise the merge. The merge in inherently @@ -552,7 +551,6 @@ static int visible(int mode, enum mergetype type, int stream) /* checkline creates a summary of the sort of changes that * are in a line, returning an "or" of - * CHANGED * CHANGES * WIGGLED * CONFLICTED @@ -567,7 +565,7 @@ static int check_line(struct mpos pos, struct file fm, struct file fb, do { if (m[pos.p.m].type == Changed) - rv |= CHANGED | CHANGES; + rv |= CHANGES; else if ((m[pos.p.m].type == AlreadyApplied || m[pos.p.m].type == Conflict)) rv |= CONFLICTED | CHANGES; @@ -638,7 +636,7 @@ static void next_mline(struct mpos *pos, struct file fm, struct file fb, break; } } - mask = ORIG|RESULT|BEFORE|AFTER|CHANGES|CHANGED; + mask = ORIG|RESULT|BEFORE|AFTER|CHANGES; switch (pos->state) { case 1: mask &= ~(RESULT|AFTER); @@ -694,7 +692,7 @@ static void prev_mline(struct mpos *pos, struct file fm, struct file fb, break; } } - mask = ORIG|RESULT|BEFORE|AFTER|CHANGES|CHANGED; + mask = ORIG|RESULT|BEFORE|AFTER|CHANGES; switch (pos->state) { case 1: mask &= ~(RESULT|AFTER); -- 2.39.5