Commits

Junio C Hamano  committed a0fd314

Match ofs/cnt types in diff interface.

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

  • Participants
  • Parent commits f2f880f

Comments (0)

Files changed (3)

File combine-diff.c

 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;

File xdiff-interface.c

 #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')
 }
 
 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;

File xdiff-interface.h

 
 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