mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-25 13:36:10 +02:00
Code

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 <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2007-12-14 12:00:42 -08:00
parent 913b45f51b
commit 29ab27f4b5
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xdiff-interface.c
View File

@ -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;