summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-06 22:29:55 -0700
committerJunio C Hamano <junkio@cox.net>2006-04-06 22:29:55 -0700
commita0fd31463b8b391ff940e97706ba064608feb1e1 (patch)
treef51d21982f36bcdc9c4f3c93310100ec0dc885d5 /xdiff-interface.c
parentf2f880f53707f83244c4659b6440224137aa0efa (diff)
downloadgit-a0fd31463b8b391ff940e97706ba064608feb1e1.tar.gz
Match ofs/cnt types in diff interface.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'xdiff-interface.c')
-rw-r--r--xdiff-interface.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/xdiff-interface.c b/xdiff-interface.c
index f7d6f98829..6a82da73b6 100644
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -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;