Commit 8b75f7f3ea91b3efc4e58a7bf737aedfd19671e7
2012-01-24T14:08:20
Eliminate xdiff compiler warnings This cleans up the various GCC compiler warnings with the xdiff code that was copied in.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115
diff --git a/src/xdiff/xdiff.h b/src/xdiff/xdiff.h
index 00d36c3..e18b4d2 100644
--- a/src/xdiff/xdiff.h
+++ b/src/xdiff/xdiff.h
@@ -94,7 +94,7 @@ typedef struct s_xdemitconf {
unsigned long flags;
find_func_t find_func;
void *find_func_priv;
- void (*emit_func)();
+ void (*emit_func)(void);
} xdemitconf_t;
typedef struct s_bdiffparam {
diff --git a/src/xdiff/xemit.c b/src/xdiff/xemit.c
index d11dbf9..8b7d417 100644
--- a/src/xdiff/xemit.c
+++ b/src/xdiff/xemit.c
@@ -71,6 +71,8 @@ xdchange_t *xdl_get_hunk(xdchange_t *xscr, xdemitconf_t const *xecfg) {
static long def_ff(const char *rec, long len, char *buf, long sz, void *priv)
{
+ (void)priv;
+
if (len > 0 &&
(isalpha((unsigned char)*rec) || /* identifier? */
*rec == '_' || /* also identifier? */
@@ -91,6 +93,9 @@ static int xdl_emit_common(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
const char *rchg = xdf->rchg;
long ix;
+ (void)xscr;
+ (void)xecfg;
+
for (ix = 0; ix < xdf->nrec; ix++) {
if (rchg[ix])
continue;
diff --git a/src/xdiff/xhistogram.c b/src/xdiff/xhistogram.c
index 18f6f99..5d10175 100644
--- a/src/xdiff/xhistogram.c
+++ b/src/xdiff/xhistogram.c
@@ -107,9 +107,10 @@ static int cmp_recs(xpparam_t const *xpp,
#define TABLE_HASH(index, side, line) \
XDL_HASHLONG((REC(index->env, side, line))->ha, index->table_bits)
-static int scanA(struct histindex *index, int line1, int count1)
+static int scanA(struct histindex *index, unsigned int line1, unsigned int count1)
{
- unsigned int ptr, tbl_idx;
+ unsigned int ptr;
+ unsigned int tbl_idx;
unsigned int chain_len;
struct record **rec_chain, *rec;
@@ -160,8 +161,10 @@ continue_scan:
return 0;
}
-static int try_lcs(struct histindex *index, struct region *lcs, int b_ptr,
- int line1, int count1, int line2, int count2)
+static int try_lcs(
+ struct histindex *index, struct region *lcs, unsigned int b_ptr,
+ unsigned int line1, unsigned int count1,
+ unsigned int line2, unsigned int count2)
{
unsigned int b_next = b_ptr + 1;
struct record *rec = index->records[TABLE_HASH(index, 2, b_ptr)];
@@ -233,9 +236,12 @@ static int try_lcs(struct histindex *index, struct region *lcs, int b_ptr,
return b_next;
}
-static int find_lcs(struct histindex *index, struct region *lcs,
- int line1, int count1, int line2, int count2) {
- int b_ptr;
+static int find_lcs(
+ struct histindex *index, struct region *lcs,
+ unsigned int line1, unsigned int count1,
+ unsigned int line2, unsigned int count2)
+{
+ unsigned int b_ptr;
if (scanA(index, line1, count1))
return -1;
@@ -258,12 +264,14 @@ static int fall_back_to_classic_diff(struct histindex *index,
line1, count1, line2, count2);
}
-static int histogram_diff(xpparam_t const *xpp, xdfenv_t *env,
- int line1, int count1, int line2, int count2)
+static int histogram_diff(
+ xpparam_t const *xpp, xdfenv_t *env,
+ unsigned int line1, unsigned int count1,
+ unsigned int line2, unsigned int count2)
{
struct histindex index;
struct region lcs;
- int sz;
+ unsigned int sz;
int result = -1;
if (count1 <= 0 && count2 <= 0)
diff --git a/src/xdiff/xutils.c b/src/xdiff/xutils.c
index 0de084e..9dea04b 100644
--- a/src/xdiff/xutils.c
+++ b/src/xdiff/xutils.c
@@ -372,8 +372,8 @@ int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,
nb += 3;
if (func && funclen) {
buf[nb++] = ' ';
- if (funclen > sizeof(buf) - nb - 1)
- funclen = sizeof(buf) - nb - 1;
+ if (funclen > (long)sizeof(buf) - nb - 1)
+ funclen = (long)sizeof(buf) - nb - 1;
memcpy(buf + nb, func, funclen);
nb += funclen;
}