From: Junio C Hamano Date: Fri, 14 Dec 2007 20:00:42 +0000 (-0800) Subject: xdiff tail trimming: use correct type. X-Git-Tag: v1.5.4-rc1~69 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=29ab27f4b505dd6a56ded42ab2797c3e56f810b2;p=git.git xdiff tail trimming: use correct type. Inside xdiff library, the number of context lines is represented in long, not int. Noticed by Peter Baumann. Signed-off-by: Junio C Hamano --- diff --git a/xdiff-interface.c b/xdiff-interface.c index f2cd488de..700def211 100644 --- a/xdiff-interface.c +++ b/xdiff-interface.c @@ -107,11 +107,10 @@ int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf) * Trim down common substring at the end of the buffers, * but leave at least ctx lines at the end. */ -static void trim_common_tail(mmfile_t *a, mmfile_t *b, int ctx) +static void trim_common_tail(mmfile_t *a, mmfile_t *b, long ctx) { const int blk = 1024; - long trimmed = 0, recovered = 0; - int i; + long trimmed = 0, recovered = 0, i; char *ap = a->ptr + a->size; char *bp = b->ptr + b->size; long smaller = (a->size < b->size) ? a->size : b->size;