mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-09 03:16:13 +02:00
Code

Match ofs/cnt types in diff interface. 

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-04-06 22:29:55 -07:00
parent f2f880f537
commit a0fd31463b
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
combine-diff.c
View File

@ -151,7 +151,8 @@ static void append_lost(struct sline *sline, int n, const char *line, int len)
struct combine_diff_state {
struct xdiff_emit_state xm;
unsigned int lno, ob, on, nb, nn;
unsigned int lno;
int ob, on, nb, nn;
unsigned long nmask;
int num_parent;
int n;

8
xdiff-interface.c
View File

@ -1,10 +1,10 @@
#include "cache.h"
#include "xdiff-interface.h"
static int parse_num(char **cp_p, unsigned int *num_p)
static int parse_num(char **cp_p, int *num_p)
{
char *cp = *cp_p;
unsigned int num = 0;
int num = 0;
int read_some;
while ('0' <= *cp && *cp <= '9')
@ -17,8 +17,8 @@ static int parse_num(char **cp_p, unsigned int *num_p)
}
int parse_hunk_header(char *line, int len,
unsigned int *ob, unsigned int *on,
unsigned int *nb, unsigned int *nn)
int *ob, int *on,
int *nb, int *nn)
{
char *cp;
cp = line + 4;

4
xdiff-interface.h
View File

@ -15,7 +15,7 @@ struct xdiff_emit_state {
int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf);
int parse_hunk_header(char *line, int len,
unsigned int *ob, unsigned int *on,
unsigned int *nb, unsigned int *nn);
int *ob, int *on,
int *nb, int *nn);
#endif