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>

diff --git a/http-push.c b/http-push.c
index 30d2d340418f7f40b77823b1b58b307985347bdf..671569594e3f8c08ce7727cd7a2db68aaf1de9c6 100644 (file)
--- a/http-push.c
+++ b/http-push.c
@@ -816,7 +816,7 @@ static void finish_request(struct transfer_request *request)
 #ifdef USE_CURL_MULTI
 static int fill_active_slot(void *unused)
 {
 #ifdef USE_CURL_MULTI
 static int fill_active_slot(void *unused)
 {

-       struct transfer_request *request = request_queue_head;
+       struct transfer_request *request;

 
        if (aborted)
                return 0;
 
        if (aborted)
                return 0;

diff --git a/index-pack.c b/index-pack.c
index 7fee8725333860dbbd13d8de5ae7baf1ef33976d..75468228d3933cc86c79f3595f7ff5e6b643cd7b 100644 (file)
--- a/index-pack.c
+++ b/index-pack.c
@@ -232,7 +232,7 @@ static void free_base_data(struct base_data *c)
 
 static void prune_base_data(struct base_data *retain)
 {
 
 static void prune_base_data(struct base_data *retain)
 {

-       struct base_data *b = base_cache;
+       struct base_data *b;

        for (b = base_cache;
             base_cache_used > delta_base_cache_limit && b;
             b = b->child) {
        for (b = base_cache;
             base_cache_used > delta_base_cache_limit && b;
             b = b->child) {

diff --git a/merge-recursive.c b/merge-recursive.c
index ee853b990d8bfb15e0058fefbbd267bd58ed40fc..3e1bc3e07f234089656397361b2b83b59bdc19a7 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -801,22 +801,19 @@ static int process_renames(struct merge_options *o,
        }
 
        for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {
        }
 
        for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) {

-               int compare;

                char *src;
                char *src;

-               struct string_list *renames1, *renames2, *renames2Dst;
+               struct string_list *renames1, *renames2Dst;

                struct rename *ren1 = NULL, *ren2 = NULL;
                const char *branch1, *branch2;
                const char *ren1_src, *ren1_dst;
 
                if (i >= a_renames->nr) {
                struct rename *ren1 = NULL, *ren2 = NULL;
                const char *branch1, *branch2;
                const char *ren1_src, *ren1_dst;
 
                if (i >= a_renames->nr) {

-                       compare = 1;

                        ren2 = b_renames->items[j++].util;
                } else if (j >= b_renames->nr) {
                        ren2 = b_renames->items[j++].util;
                } else if (j >= b_renames->nr) {

-                       compare = -1;

                        ren1 = a_renames->items[i++].util;
                } else {
                        ren1 = a_renames->items[i++].util;
                } else {

-                       compare = strcmp(a_renames->items[i].string,
-                                       b_renames->items[j].string);
+                       int compare = strcmp(a_renames->items[i].string,
+                                            b_renames->items[j].string);

                        if (compare <= 0)
                                ren1 = a_renames->items[i++].util;
                        if (compare >= 0)
                        if (compare <= 0)
                                ren1 = a_renames->items[i++].util;
                        if (compare >= 0)


@@ -826,14 +823,12 @@ static int process_renames(struct merge_options *o,
                /* TODO: refactor, so that 1/2 are not needed */
                if (ren1) {
                        renames1 = a_renames;
                /* TODO: refactor, so that 1/2 are not needed */
                if (ren1) {
                        renames1 = a_renames;

-                       renames2 = b_renames;

                        renames2Dst = &b_by_dst;
                        branch1 = o->branch1;
                        branch2 = o->branch2;
                } else {
                        struct rename *tmp;
                        renames1 = b_renames;
                        renames2Dst = &b_by_dst;
                        branch1 = o->branch1;
                        branch2 = o->branch2;
                } else {
                        struct rename *tmp;
                        renames1 = b_renames;

-                       renames2 = a_renames;

                        renames2Dst = &a_by_dst;
                        branch1 = o->branch2;
                        branch2 = o->branch1;
                        renames2Dst = &a_by_dst;
                        branch1 = o->branch2;
                        branch2 = o->branch1;

diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 3e97462bdd2ed72b4ec60a1eb3869e516609867b..02184d9cde2e27d14c8c2845d7e2c4eb7f0c9b09 100644 (file)
--- 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 {
                for (; off1 < lim1; off1++)
                        rchg1[rindex1[off1]] = 1;
        } else {

-               long ec;

                xdpsplit_t spl;
                spl.i1 = spl.i2 = 0;
 
                /*
                 * Divide ...
                 */
                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;
                }
 
                        return -1;
                }

diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 05bfa41f102801a5182e7fc642976f91e9ba7db6..c4bedf0d1ce1252563d7f36da7d846f5943343b0 100644 (file)
--- 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);
 
        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);
                xche = xdl_get_hunk(xch, xecfg);
 
                s1 = XDL_MAX(xch->i1 - xecfg->ctxlen, 0);