From: Junio C Hamano <junkio@cox.net>
Date: Fri, 7 Apr 2006 05:29:55 +0000 (-0700)
Subject: Match ofs/cnt types in diff interface.
X-Git-Tag: v1.3.0-rc3~6^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a0fd31463b8b391ff940e97706ba064608feb1e1;p=git.git

Match ofs/cnt types in diff interface.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/combine-diff.c b/combine-diff.c
index 4657eb4c3..eb0d757f4 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -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;
diff --git a/xdiff-interface.c b/xdiff-interface.c
index f7d6f9882..6a82da73b 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;
diff --git a/xdiff-interface.h b/xdiff-interface.h
index ec682a297..1346908be 100644
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -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