xdiff: use size_t for xrecord_t.size

size_t is the appropriate type because size is describing the number of
elements, bytes in this case, in memory.

Signed-off-by: Ezekiel Newren <ezekielnewren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 411a8aa69f3d62c8bcda7604a7d1a6616a8b25bb..edd05466df5ca3d999fcdf5bb155e5e85c4440d2 100644 (file)
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -403,10 +403,9 @@ static int recs_match(xrecord_t *rec1, xrecord_t *rec2)
  */
 static int get_indent(xrecord_t *rec)
 {
-       long i;
        int ret = 0;
 
-       for (i = 0; i < rec->size; i++) {
+       for (size_t i = 0; i < rec->size; i++) {
                uint8_t c = rec->ptr[i];
 
                if (!XDL_ISSPACE(c))
@@ -993,11 +992,11 @@ static void xdl_mark_ignorable_lines(xdchange_t *xscr, xdfenv_t *xe, long flags)
 
                rec = &xe->xdf1.recs[xch->i1];
                for (i = 0; i < xch->chg1 && ignore; i++)
-                       ignore = xdl_blankline((const char *)rec[i].ptr, rec[i].size, flags);
+                       ignore = xdl_blankline((const char *)rec[i].ptr, (long)rec[i].size, flags);
 
                rec = &xe->xdf2.recs[xch->i2];
                for (i = 0; i < xch->chg2 && ignore; i++)
-                       ignore = xdl_blankline((const char *)rec[i].ptr, rec[i].size, flags);
+                       ignore = xdl_blankline((const char *)rec[i].ptr, (long)rec[i].size, flags);
 
                xch->ignore = ignore;
        }

diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index ead930088a560187ef4eb864f71f78d2e18a8066..2f8007753c30f2896ce9580342a410e608ea4cfb 100644 (file)
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
@@ -27,7 +27,7 @@ static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *
 {
        xrecord_t *rec = &xdf->recs[ri];
 
-       if (xdl_emit_diffrec((char const *)rec->ptr, rec->size, pre, strlen(pre), ecb) < 0)
+       if (xdl_emit_diffrec((char const *)rec->ptr, (long)rec->size, pre, strlen(pre), ecb) < 0)
                return -1;
 
        return 0;
@@ -113,8 +113,8 @@ static long match_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri,
        xrecord_t *rec = &xdf->recs[ri];
 
        if (!xecfg->find_func)
-               return def_ff((const char *)rec->ptr, rec->size, buf, sz);
-       return xecfg->find_func((const char *)rec->ptr, rec->size, buf, sz, xecfg->find_func_priv);
+               return def_ff((const char *)rec->ptr, (long)rec->size, buf, sz);
+       return xecfg->find_func((const char *)rec->ptr, (long)rec->size, buf, sz, xecfg->find_func_priv);
 }
 
 static int is_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri)
@@ -151,7 +151,7 @@ static long get_func_line(xdfenv_t *xe, xdemitconf_t const *xecfg,
 static int is_empty_rec(xdfile_t *xdf, long ri)
 {
        xrecord_t *rec = &xdf->recs[ri];
-       long i = 0;
+       size_t i = 0;
 
        for (; i < rec->size && XDL_ISSPACE(rec->ptr[i]); i++);
 

diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c
index 75cb3e76a2c8e45114988a6007539a6ee9bcf8d4..0dd4558a3280dc8b2bd503280ecaf4fae71964c3 100644 (file)
--- a/xdiff/xmerge.c
+++ b/xdiff/xmerge.c
@@ -101,8 +101,8 @@ static int xdl_merge_cmp_lines(xdfenv_t *xe1, int i1, xdfenv_t *xe2, int i2,
        xrecord_t *rec2 = xe2->xdf2.recs + i2;
 
        for (i = 0; i < line_count; i++) {
-               int result = xdl_recmatch((const char *)rec1[i].ptr, rec1[i].size,
-                       (const char *)rec2[i].ptr, rec2[i].size, flags);
+               int result = xdl_recmatch((const char *)rec1[i].ptr, (long)rec1[i].size,
+                       (const char *)rec2[i].ptr, (long)rec2[i].size, flags);
                if (!result)
                        return -1;
        }
@@ -119,11 +119,11 @@ static int xdl_recs_copy_0(int use_orig, xdfenv_t *xe, int i, int count, int nee
        if (count < 1)
                return 0;
 
-       for (i = 0; i < count; size += recs[i++].size)
+       for (i = 0; i < count; size += (int)recs[i++].size)
                if (dest)
                        memcpy(dest + size, recs[i].ptr, recs[i].size);
        if (add_nl) {
-               i = recs[count - 1].size;
+               i = (int)recs[count - 1].size;
                if (i == 0 || recs[count - 1].ptr[i - 1] != '\n') {
                        if (needs_cr) {
                                if (dest)
@@ -156,7 +156,7 @@ static int xdl_orig_copy(xdfenv_t *xe, int i, int count, int needs_cr, int add_n
  */
 static int is_eol_crlf(xdfile_t *file, int i)
 {
-       long size;
+       size_t size;
 
        if (i < file->nrec - 1)
                /* All lines before the last *must* end in LF */
@@ -324,8 +324,8 @@ static int xdl_fill_merge_buffer(xdfenv_t *xe1, const char *name1,
 
 static int recmatch(xrecord_t *rec1, xrecord_t *rec2, unsigned long flags)
 {
-       return xdl_recmatch((const char *)rec1->ptr, rec1->size,
-                           (const char *)rec2->ptr, rec2->size, flags);
+       return xdl_recmatch((const char *)rec1->ptr, (long)rec1->size,
+                           (const char *)rec2->ptr, (long)rec2->size, flags);
 }
 
 /*
@@ -441,7 +441,7 @@ static int lines_contain_alnum(xdfenv_t *xe, int i, int chg)
 {
        for (; chg; chg--, i++)
                if (line_contains_alnum((const char *)xe->xdf2.recs[i].ptr,
-                               xe->xdf2.recs[i].size))
+                               (long)xe->xdf2.recs[i].size))
                        return 1;
        return 0;
 }

diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c
index 4cb18b2b886fa6b89ef486978e64fe20c740719f..b3219aed3e87950881af5851b205838afc9b07f8 100644 (file)
--- a/xdiff/xprepare.c
+++ b/xdiff/xprepare.c
@@ -99,8 +99,8 @@ static int xdl_classify_record(unsigned int pass, xdlclassifier_t *cf, xrecord_t
        hi = (long) XDL_HASHLONG(rec->ha, cf->hbits);
        for (rcrec = cf->rchash[hi]; rcrec; rcrec = rcrec->next)
                if (rcrec->rec.ha == rec->ha &&
-                               xdl_recmatch((const char *)rcrec->rec.ptr, rcrec->rec.size,
-                                       (const char *)rec->ptr, rec->size, cf->flags))
+                               xdl_recmatch((const char *)rcrec->rec.ptr, (long)rcrec->rec.size,
+                                       (const char *)rec->ptr, (long)rec->size, cf->flags))
                        break;
 
        if (!rcrec) {
@@ -157,7 +157,7 @@ static int xdl_prepare_ctx(unsigned int pass, mmfile_t *mf, long narec, xpparam_
                                goto abort;
                        crec = &xdf->recs[xdf->nrec++];
                        crec->ptr = (uint8_t const *)prev;
-                       crec->size =(long) ( cur - prev);
+                       crec->size = cur - prev;
                        crec->ha = hav;
                        if (xdl_classify_record(pass, cf, crec) < 0)
                                goto abort;

diff --git a/xdiff/xtypes.h b/xdiff/xtypes.h
index b1c520a37809f663f96ddc6a2d51bb5daaa20d26..88b1fe464946142feef2476f91d5275458b0c6ca 100644 (file)
--- a/xdiff/xtypes.h
+++ b/xdiff/xtypes.h
@@ -40,7 +40,7 @@ typedef struct s_chastore {
 
 typedef struct s_xrecord {
        uint8_t const *ptr;
-       long size;
+       size_t size;
        unsigned long ha;
 } xrecord_t;