Match ofs/cnt types in diff interface.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Apr 6, 2006 at 22:29 UTC
a0fd31463b8b391ff940e97706ba064608feb1e1
3 files changed
+8
-7
combine-diff.c
+2
-1
@@ -151,7 +151,8 @@ static void append_lost(struct sline *sline, int n, const char *line, int len)
151
struct combine_diff_state {
152
struct xdiff_emit_state xm;
153
154
- unsigned int lno, ob, on, nb, nn;
154
+ unsigned int lno;
155
+ int ob, on, nb, nn;
156
unsigned long nmask;
157
int num_parent;
158
int n;
xdiff-interface.c
+4
-4
@@ -1,10 +1,10 @@
1
#include "cache.h"
2
#include "xdiff-interface.h"
3
4
-static int parse_num(char **cp_p, unsigned int *num_p)
4
+static int parse_num(char **cp_p, int *num_p)
5
{
6
char *cp = *cp_p;
7
- unsigned int num = 0;
7
+ int num = 0;
8
int read_some;
9
10
while ('0' <= *cp && *cp <= '9')
@@ -17,8 +17,8 @@ static int parse_num(char **cp_p, unsigned int *num_p)
17
}
18
19
int parse_hunk_header(char *line, int len,
20
- unsigned int *ob, unsigned int *on,
21
- unsigned int *nb, unsigned int *nn)
20
+ int *ob, int *on,
21
+ int *nb, int *nn)
22
{
23
char *cp;
24
cp = line + 4;
xdiff-interface.h
+2
-2
@@ -15,7 +15,7 @@ struct xdiff_emit_state {
15
16
int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf);
17
int parse_hunk_header(char *line, int len,
18
- unsigned int *ob, unsigned int *on,
19
- unsigned int *nb, unsigned int *nn);
18
+ int *ob, int *on,
19
+ int *nb, int *nn);
20
21
#endif