pickaxe/style: consolidate declarations and assignments

Refactor contains() to do its assignments at the same time that it
does its declarations.

This code could have been refactored in ef90ab66e8e (pickaxe: use
textconv for -S counting, 2012-10-28) when a function call between the
declarations and assignments was removed.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index a9c6d60df22862e47ccb7fc1c7de9ed7cc4b1236..a278b9b71d9b58af197269cc6340050bba98acbe 100644 (file)
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -70,13 +70,9 @@ static int diff_grep(mmfile_t *one, mmfile_t *two,
 
 static unsigned int contains(mmfile_t *mf, regex_t *regexp, kwset_t kws)
 {
-       unsigned int cnt;
-       unsigned long sz;
-       const char *data;
-
-       sz = mf->size;
-       data = mf->ptr;
-       cnt = 0;
+       unsigned int cnt = 0;
+       unsigned long sz = mf->size;
+       const char *data = mf->ptr;
 
        if (regexp) {
                regmatch_t regmatch;