Merge branch 'jk/apply-binary-hunk-parsing-fix'

[thirdparty/git.git] / range-diff.c

diff --git a/range-diff.c b/range-diff.c
index 1a4471fe4ccabf7cf8f6179955895c2d2387cfb9..e9479794b46a51fd08b8ed287a50f35b7c92a4d5 100644 (file)
--- a/range-diff.c
+++ b/range-diff.c
@@ -274,9 +274,10 @@ static void find_exact_matches(struct string_list *a, struct string_list *b)
        hashmap_clear(&map);
 }
 
-static void diffsize_consume(void *data, char *line, unsigned long len)
+static int diffsize_consume(void *data, char *line, unsigned long len)
 {
        (*(int *)data)++;
+       return 0;
 }
 
 static void diffsize_hunk(void *data, long ob, long on, long nb, long nn,