[PATCH v2 17/22] pickaxe: rename variables in has_changes() for brevity
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Feb 16, 2021, 11:57 UTC
- Message-ID
- <20210216115801.4773-18-avarab@gmail.com>
- In-Reply-To
- <20210203032811.14979-1-avarab@gmail.com>
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 <avarab@gmail.com> --- diffcore-pickaxe.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c index 0bf50a2f595..66e34d254f1 100644 --- 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,
-- 2.30.0.284.gd98b1dd5eaa7