undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Match ofs/cnt types in diff interface.

Browse Source 
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 combine_diff_state {
struct xdiff_emit_state xm; struct xdiff_emit_state xm;
unsigned int lno, ob, on, nb, nn; unsigned int lno;
int ob, on, nb, nn;
unsigned long nmask; unsigned long nmask;
int num_parent; int num_parent;
int n; int n;

8
xdiff-interface.c
View File

@ -1,10 +1,10 @@
#include "cache.h" #include "cache.h"
#include "xdiff-interface.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; char *cp = *cp_p;
unsigned int num = 0; int num = 0;
int read_some; int read_some;
while ('0' <= *cp && *cp <= '9') 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, int parse_hunk_header(char *line, int len,
unsigned int *ob, unsigned int *on, int *ob, int *on,
unsigned int *nb, unsigned int *nn) int *nb, int *nn)
{ {
char *cp; char *cp;
cp = line + 4; 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 xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf);
int parse_hunk_header(char *line, int len, int parse_hunk_header(char *line, int len,
unsigned int *ob, unsigned int *on, int *ob, int *on,
unsigned int *nb, unsigned int *nn); int *nb, int *nn);
#endif #endif