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 4657eb4c33b2711dffe99fe1e8a4e19608761ce3..eb0d757f47b74161c4bfc1212f4510a6790ff92a 100644 (file)
--- 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;
 
 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;
        unsigned long nmask;
        int num_parent;
        int n;

diff --git a/xdiff-interface.c b/xdiff-interface.c
index f7d6f988298e3906a1a525fed484dc093404e4f9..6a82da73b6d3b6b8cca23c3183cddc36c5cafb4b 100644 (file)
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -1,10 +1,10 @@
 #include "cache.h"
 #include "xdiff-interface.h"
 
 #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;
 {
        char *cp = *cp_p;

-       unsigned int num = 0;
+       int num = 0;

        int read_some;
 
        while ('0' <= *cp && *cp <= '9')
        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,
 }
 
 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;
 {
        char *cp;
        cp = line + 4;

diff --git a/xdiff-interface.h b/xdiff-interface.h
index ec682a297108dc0a58203019693c1a1c4b0a91e1..1346908bea31319aabeabdfd955e2ea9aab37456 100644 (file)
--- 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,
 
 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
 
 #endif