pickaxe: rename variables in has_changes() for brevity

avar · gitster · commit 5d35a9531cc9 · 2021-05-11T12:47:31.000+09:00
Rename the {one,two}_contains variables to c{1,2}. This will make a
follow-up change easier to read.

Signed-off-by: Ævar Arnfjörð Bjarmason &lt;avarab@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
@@ -108,9 +108,9 @@ static int has_changes(mmfile_t *one, mmfile_t *two,
 		       struct diff_options *o,
 		       regex_t *regexp, kwset_t kws)
 {
-	unsigned int one_contains = one ? contains(one, regexp, kws) : 0;
-	unsigned int two_contains = two ? contains(two, regexp, kws) : 0;
-	return one_contains != two_contains;
+	unsigned int c1 = one ? contains(one, regexp, kws) : 0;
+	unsigned int c2 = two ? contains(two, regexp, kws) : 0;
+	return c1 != c2;
 }
 
 static int pickaxe_match(struct diff_filepair *p, struct diff_options *o,

Original file line number	Diff line number	Diff line change
`@@ -108,9 +108,9 @@ static int has_changes(mmfile_t one, mmfile_t two,`
`108`	`108`	`struct diff_options *o,`
`109`	`109`	`regex_t *regexp, kwset_t kws)`
`110`	`110`	`{`
`111`		`- unsigned int one_contains = one ? contains(one, regexp, kws) : 0;`
`112`		`- unsigned int two_contains = two ? contains(two, regexp, kws) : 0;`
`113`		`- return one_contains != two_contains;`
	`111`	`+ unsigned int c1 = one ? contains(one, regexp, kws) : 0;`
	`112`	`+ unsigned int c2 = two ? contains(two, regexp, kws) : 0;`
	`113`	`+ return c1 != c2;`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`static int pickaxe_match(struct diff_filepair p, struct diff_options o,`