[PATCH 1/1 (variant 1)] remap-log: fix map generator

[Artem Bityutskiy]

From: Artem Bityutskiy <artem.bityutskiy@xxxxxxxxxxxxxxx>

This patch fixes a bug in the 'parse_diff()' function. This function iterates
over every changed file and every hunk in this file and at each iteration it
prints the hunk's map for the _previous_ iteration. This is taken into account
when it switches to the next file - just before starting processing hunks in
this file, it prints the map for the last hunk of the _previous_ file.

However, if we are at the very last file or we have a diff which changes only
one single file, and the last hunk is processed - we do not print the map of
this last hunk and just exit. The result is a buggy map - because the map of
the very last hunk is not printed.

Here is a short example to demonstrate the bug. The diff is:

|||diff --git a/sound/soc/codecs/sn95031.c b/sound/soc/codecs/sn95031.c
|||index 920e7bb..8c43fdd 100644
|||--- a/sound/soc/codecs/sn95031.c
|||+++ b/sound/soc/codecs/sn95031.c
|||@@ -811,0 +812 @@ static int sn95031_pcm_hs_mute(struct snd_soc_dai *dai, int mute)
|||+       int tmp = !mute;
|||@@ -813 +814 @@ static int sn95031_pcm_hs_mute(struct snd_soc_dai *dai, int mute)
|||-                       SN95031_HSLVOLCTRL, BIT(7), (!mute << 7));
|||+                       SN95031_HSLVOLCTRL, BIT(7), tmp << 7);
|||@@ -815 +816,3 @@ static int sn95031_pcm_hs_mute(struct snd_soc_dai *dai, int mute)
|||-                       SN95031_HSRVOLCTRL, BIT(7), (!mute << 7));
|||+                       SN95031_HSRVOLCTRL, BIT(7), tmp << 7);
|||+       snd_soc_update_bits(dai->codec,
|||+                       SN95031_DRIVEREN, BIT(0) | BIT(1), tmp | tmp << 1);

And remap-log generates an incorrect map:

M sound/soc/codecs/sn95031.c sound/soc/codecs/sn95031.c
1 1
812 813
813 0
814 815
815 0

Notice that the last map entry basically says that all lines in the old file
starting from line 815 have been deleted, which is not true - only one line
number 815 has been deleted.

The correct map should look like this:

M sound/soc/codecs/sn95031.c sound/soc/codecs/sn95031.c
1 1
812 813
813 0
814 815
815 0
816 819

To fix the bug this patch re-works the 'parse_diff()' function a little and
makes it print the map of the current hunk at each iteration, not the previous
hunk.

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@xxxxxxxxxxxxxxx>
---
 tools/remap-log.c |   14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/tools/remap-log.c b/tools/remap-log.c
index 327b870..011a7cb 100644
--- a/tools/remap-log.c
+++ b/tools/remap-log.c
@@ -331,7 +331,6 @@ void parse_diff(void)
 {
 	int skipping = -1, suppress = 1;
 	char *name1 = NULL, *name2 = NULL;
-	int from = 1, to = 1;
 	int l1, l2, n1, n2;
 	enum cmd {
 		Diff, Hunk, New, Del, Copy, Rename, Junk
@@ -367,21 +366,15 @@ void parse_diff(void)
 					printf("M %s %s\n", name1, name2);
 				if (!parse_hunk(&l1, &l2, &n1, &n2))
 					goto Ediff;
-				if (l1 > from)
-					printf("%d %d\n", from, to);
+				if (!skipping && l1 > 1)
+					printf("1 1\n");
 				if (n1)
 					printf("%d 0\n", l1);
-				from = l1 + n1;
-				to = l2 + n2;
+				printf("%d %d\n", l1 + n1, l2 + n2);
 			}
 			skipping = 1;
 			break;
 		case Diff:
-			if (!suppress) {
-				if (!skipping)
-					printf("M %s %s\n", name1, name2);
-				printf("%d %d\n", from, to);
-			}
 			free(name1);
 			free(name2);
 			name2 = strrchr(line, ' ');
@@ -401,7 +394,6 @@ void parse_diff(void)
 				goto Ediff;
 			skipping = 0;
 			suppress = 0;
-			from = to = 1;
 			break;
 		case New:
 			if (skipping)
-- 
1.7.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/