summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorBenjamin Kramer <benny.kra@googlemail.com>2009-03-15 22:01:20 +0100
committerJunio C Hamano <gitster@pobox.com>2009-03-15 18:25:24 -0700
commit8e24cbaeafc7eed709e251fda1673ffea84edfb1 (patch)
treeb555dc4e224e336abac4469f80fce106ae898c29 /xdiff
parentde7697808fd8b552479a60fa3b98440d541b42de (diff)
downloadgit-8e24cbaeafc7eed709e251fda1673ffea84edfb1.tar.gz
Fix various dead stores found by the clang static analyzer
http-push.c::finish_request(): request is initialized by the for loop index-pack.c::free_base_data(): b is initialized by the for loop merge-recursive.c::process_renames(): move compare to narrower scope, and remove unused assignments to it remove unused variable renames2 xdiff/xdiffi.c::xdl_recs_cmp(): remove unused variable ec xdiff/xemit.c::xdl_emit_diff(): xche is always overwritten Signed-off-by: Benjamin Kramer <benny.kra@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
-rw-r--r--xdiff/xdiffi.c5
-rw-r--r--xdiff/xemit.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 3e97462bdd..02184d9cde 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -293,15 +293,14 @@ int xdl_recs_cmp(diffdata_t *dd1, long off1, long lim1,
for (; off1 < lim1; off1++)
rchg1[rindex1[off1]] = 1;
} else {
- long ec;
xdpsplit_t spl;
spl.i1 = spl.i2 = 0;
/*
* Divide ...
*/
- if ((ec = xdl_split(ha1, off1, lim1, ha2, off2, lim2, kvdf, kvdb,
- need_min, &spl, xenv)) < 0) {
+ if (xdl_split(ha1, off1, lim1, ha2, off2, lim2, kvdf, kvdb,
+ need_min, &spl, xenv) < 0) {
return -1;
}
diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 05bfa41f10..c4bedf0d1c 100644
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
@@ -132,7 +132,7 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
if (xecfg->flags & XDL_EMIT_COMMON)
return xdl_emit_common(xe, xscr, ecb, xecfg);
- for (xch = xche = xscr; xch; xch = xche->next) {
+ for (xch = xscr; xch; xch = xche->next) {
xche = xdl_get_hunk(xch, xecfg);
s1 = XDL_MAX(xch->i1 - xecfg->ctxlen, 0);