Clean up dead stores
authorMarkus Armbruster <armbru@pond.sub.org>
Sat, 16 Jan 2010 16:40:28 +0000 (17:40 +0100)
committerMarkus Armbruster <armbru@pond.sub.org>
Tue, 19 Jan 2010 07:40:42 +0000 (08:40 +0100)
Does not change optimized code (gcc -O).

Spotted by the Clang Static Analyzer.

25 files changed:
src/lib/commands/bomb.c
src/lib/commands/comm.c
src/lib/commands/cuto.c
src/lib/commands/dump.c
src/lib/commands/head.c
src/lib/commands/mfir.c
src/lib/commands/newe.c
src/lib/commands/orde.c
src/lib/commands/sell.c
src/lib/commands/work.c
src/lib/common/bestpath.c
src/lib/subs/aircombat.c
src/lib/subs/aswplnsubs.c
src/lib/subs/border.c
src/lib/subs/lndsub.c
src/lib/subs/maps.c
src/lib/subs/mission.c
src/lib/subs/mslsub.c
src/lib/subs/retreat.c
src/lib/subs/takeover.c
src/lib/update/deliver.c
src/lib/update/nav_ship.c
src/lib/update/revolt.c
src/lib/update/ship.c
src/util/fairland.c

index 087c8bda697bf598009d2a6f12a561f6373f18b9..257d17abc75b56af74497eb1615d5da9134b5399 100644 (file)
@@ -520,7 +520,6 @@ ship_bomb(struct emp_qelem *list, struct sctstr *target)
                continue;
        }
 
-       dam = 0;
        if (nuk_on_plane(&plp->plane) >= 0)
            hitchance = 100;
        else {
@@ -624,7 +623,6 @@ plane_bomb(struct emp_qelem *list, struct sctstr *target)
            continue;
        if (changed_plane_aborts(plp))
            continue;
-       dam = 0;
        if (nuk_on_plane(&plp->plane) >= 0)
            hitchance = 100;
        else {
@@ -735,7 +733,6 @@ land_bomb(struct emp_qelem *list, struct sctstr *target)
                continue;
        }
 
-       dam = 0;
        if (nuk_on_plane(&plp->plane) >= 0)
            hitchance = 100;
        else {
index 4239a449c3acd061995e69980f20c12afe928dfa..ec972f1b32b755629f5019789800ae24643217b4 100644 (file)
@@ -51,7 +51,6 @@ comm(void)
        return RET_SYN;
     prdate();
     (void)strcpy(dirstr, ".      $");
-    n = 1;
     for (n = 1; n <= 6; n++)
        dirstr[n] = dirch[n];
     nsect = 0;
index bcd07286dd86d3657ad2507419e08987e4743be6..f71d3d481bf77f3bf86d8cb2f539811cf00e801e 100644 (file)
@@ -49,7 +49,6 @@ cuto(void)
        return RET_SYN;
     prdate();
     (void)strcpy(dirstr, ".      $");
-    n = 1;
     for (n = 1; n <= 6; n++)
        dirstr[n] = dirch[n];
     nsect = 0;
index 0155ec37dc99890003d68cbf1bbd747faca6ce39..8ce03a5c466266cd9e61f4e622d80c4da5a0425d 100644 (file)
@@ -54,7 +54,6 @@ dump(void)
        return RET_SYN;
     prdate();
     (void)strcpy(dirstr, ".      $");
-    n = 1;
     for (n = 1; n <= 6; n++)
        dirstr[n] = dirch[n];
     nsect = 0;
index b75bac1ed5a4d2ca9016054515d74f0255e93ae2..5f7ab0310f772cdf2bb7d7a215a6394bc6087155 100644 (file)
@@ -105,7 +105,7 @@ head(void)
     for (n = 0; n < 5; n++) {
        if ((scoop = head_findscoop(hist, maxcnum, &actor, &victim)) < 10)
            break;
-       severity = head_printscoop(hist, actor, victim);
+       head_printscoop(hist, actor, victim);
        hp = &hist[actor][victim];
        severity = hp->h_recent - hp->h_past;
        if (severity <= -scoop / 2 || severity >= scoop / 2) {
index 37e3ad1ff019ecc167597a2c0bdce713967167c4..7d38da78cb59a61c185c2b0008b2f4e99fd2323b 100644 (file)
@@ -72,7 +72,6 @@ multifire(void)
     coord fy;
     coord x;
     coord y;
-    int mil;
     int dam;
     int totaldefdam = 0;
     int vshipno;
@@ -265,7 +264,7 @@ multifire(void)
                    continue;
                }
            }
-           if ((mil = fship.shp_item[I_MILIT]) < 1) {
+           if (fship.shp_item[I_MILIT] < 1) {
                pr("Not enough military for firing crew.\n");
                continue;
            }
index 43c0eedacdd8afa063f3b19fc7e19641ad7e17d3..53ceba7e747a051cc85091e403aecc938f636399 100644 (file)
@@ -79,7 +79,6 @@ newe(void)
                if (twork > bwork) {
                    twork = bwork;
                }
-               work -= twork;
                bwork -= twork;
                eff -= twork * 4;
                if (eff <= 0) {
@@ -103,7 +102,6 @@ newe(void)
                    if (twork > hcms)
                        twork = hcms;
                }
-               work -= twork;
                eff += twork;
            } else if (eff < 100) {
                twork = 100 - eff;
@@ -122,7 +120,6 @@ newe(void)
                    if (twork > hcms)
                        twork = hcms;
                }
-               work -= twork;
                eff += twork;
            }
        } else {
index 058f969539f230f945aa8a4c564b25499dab6199..9f7fb96afa60d5f602f3c4e921221f05d08b679c 100644 (file)
@@ -60,7 +60,7 @@ int
 orde(void)
 {
     int diffeachship = 0;
-    int orders, sub, level;
+    int sub, level;
     int scuttling = 0;
     struct nstr_item nb;
     struct shpstr ship;
@@ -121,7 +121,6 @@ orde(void)
            ship.shp_autonav &= ~AN_STANDBY;
            break;
        case 'd':               /* declare path */
-           orders = 0;
            scuttling = 0;
            /* Need location */
            p = getstarg(player->argp[3], "Destination? ", buf);
@@ -132,32 +131,27 @@ orde(void)
            p1x = p0x;
            p1y = p0y;
 
-
-
-           if (!orders) {
-               p = getstarg(player->argp[4], "Second dest? ", buf);
-               if (!p)
-                   return RET_FAIL;
-               if (!*p || !strcmp(p, "-")) {
-                   orders = 1;
-                   pr("A one-way order has been accepted.\n");
-               } else if (!strncmp(p, "s", 1)) {
-                   if (opt_TRADESHIPS) {
-                       if (!(mchr[(int)ship.shp_type].m_flags & M_TRADE)) {
-                           pr("You can't auto-scuttle that ship!\n");
-                           return RET_SYN;
-                       }
-                   } else {
+           p = getstarg(player->argp[4], "Second dest? ", buf);
+           if (!p)
+               return RET_FAIL;
+           if (!*p || !strcmp(p, "-")) {
+               pr("A one-way order has been accepted.\n");
+           } else if (!strncmp(p, "s", 1)) {
+               if (opt_TRADESHIPS) {
+                   if (!(mchr[(int)ship.shp_type].m_flags & M_TRADE)) {
                        pr("You can't auto-scuttle that ship!\n");
                        return RET_SYN;
                    }
-                   pr("A scuttle order has been accepted.\n");
-                   scuttling = 1;
                } else {
-                   if (!sarg_xy(p, &p1x, &p1y))
-                       return RET_SYN;
-                   pr("A circular order has been accepted.\n");
+                   pr("You can't auto-scuttle that ship!\n");
+                   return RET_SYN;
                }
+               pr("A scuttle order has been accepted.\n");
+               scuttling = 1;
+           } else {
+               if (!sarg_xy(p, &p1x, &p1y))
+                   return RET_SYN;
+               pr("A circular order has been accepted.\n");
            }
 
            /*
@@ -200,56 +194,53 @@ orde(void)
            sub = sub - 1;;
 
            if (ship.shp_autonav & AN_AUTONAV) {
-               orders = 1;
                dest = getstarg(player->argp[4], "Start or End? ", buf);
-               if (orders) {   /* before dest check */
-                   if (!dest)
-                       break;
-                   switch (*dest) {
-                   default:
-                       pr("You must enter 'start' or 'end'\n");
-                       return RET_SYN;
-                   case 'e':
-                   case 'E':
-                       i1 = whatitem(player->argp[5], "Commodity? ");
-                       if (!i1)
-                           break;
-                       else {
-                           p1 = getstarg(player->argp[6], "Amount? ",
-                                         buf);
-                           if (!p1)
-                               return RET_SYN;
-                           level = atoi(p1);
-                       }
-                       if (level < 0) {
-                           level = 0;  /* prevent negatives. */
-                           pr("You must use positive number! Level set to 0.\n");
-                       }
-                       ship.shp_tstart[sub] = i1->i_uid;
-                       ship.shp_lstart[sub] = level;
-                       pr("Order Set \n");
+               if (!dest)
+                   break;
+               switch (*dest) {
+               default:
+                   pr("You must enter 'start' or 'end'\n");
+                   return RET_SYN;
+               case 'e':
+               case 'E':
+                   i1 = whatitem(player->argp[5], "Commodity? ");
+                   if (!i1)
                        break;
-                   case 's':
-                   case 'S':
-                       i1 = whatitem(player->argp[5], "Commodity? ");
-                       if (!i1)
-                           break;
-                       else {
-                           p1 = getstarg(player->argp[6], "Amount? ",
-                                         buf);
-                           if (!p1)
-                               return RET_SYN;
-                           level = atoi(p1);
-                       }
-                       if (level < 0) {
-                           level = 0;
-                           pr("You must use positive number! Level set to 0.\n");
-                       }
-                       ship.shp_tend[sub] = i1->i_uid;
-                       ship.shp_lend[sub] = level;
-                       pr("Order Set \n");
+                   else {
+                       p1 = getstarg(player->argp[6], "Amount? ",
+                                     buf);
+                       if (!p1)
+                           return RET_SYN;
+                       level = atoi(p1);
+                   }
+                   if (level < 0) {
+                       level = 0;      /* prevent negatives. */
+                       pr("You must use positive number! Level set to 0.\n");
+                   }
+                   ship.shp_tstart[sub] = i1->i_uid;
+                   ship.shp_lstart[sub] = level;
+                   pr("Order Set \n");
+                   break;
+               case 's':
+               case 'S':
+                   i1 = whatitem(player->argp[5], "Commodity? ");
+                   if (!i1)
                        break;
+                   else {
+                       p1 = getstarg(player->argp[6], "Amount? ",
+                                     buf);
+                       if (!p1)
+                           return RET_SYN;
+                       level = atoi(p1);
+                   }
+                   if (level < 0) {
+                       level = 0;
+                       pr("You must use positive number! Level set to 0.\n");
                    }
+                   ship.shp_tend[sub] = i1->i_uid;
+                   ship.shp_lend[sub] = level;
+                   pr("Order Set \n");
+                   break;
                }
            } else
                pr("You need to 'declare' a ship path first, see 'info order'\n");
index b5fddc98cf6509049526a728ee7a238ac1f797ef..1e88bc0a85d045a5c96b819bc75a9a6e0b574f7e 100644 (file)
@@ -57,7 +57,6 @@ sell(void)
     struct ichrstr *ip;
     struct comstr comm;
     int number_set;
-    int number_sub;
     int totalcom;
     int amt;
     int com;
@@ -99,7 +98,6 @@ sell(void)
        pr("Sectors need at least 1 mobility to sell goods.\n");
        return RET_FAIL;
     }
-    number_sub = 0;
     p = getstarg(player->argp[3], "Quantity: ", buf);
     if (!p || !*p)
        return RET_SYN;
index 9e297a24cfa78534f790d328d11b444cf042b5c6..218e62c253f5df7e9c777d0318f90eb1f203dca3 100644 (file)
@@ -127,7 +127,6 @@ buildeff(struct sctstr *sp, int work, double *money)
     int n, hcms, lcms;
     int effdone = 0;
 
-    work_cost = 0;
     if (sp->sct_type != sp->sct_newtype) {
        /*
         * Tear down existing sector.
index 30383fcb6d7b9441abd090c5b01a031840057a62..bb42ad61eec58804d07e10b6acc28ef8ed4d1d3c 100644 (file)
@@ -125,7 +125,6 @@ bestownedpath(char *bpath, char *bigmap,
 
     routelen = 0;              /* path length is now 0 */
     mapindex[x][y] = 0;                /* mark starting spot   */
-    markedsectors = 1;         /* source sector marked */
     minx = x - 2;              /* set X scan bounds    */
     maxx = x + 2;
     miny = y - 1;              /* set Y scan bounds    */
index bcb8dcfeb0474252e56ca0891afb04e06a922c6c..d23265fb9e852c0e9d61fb06726e2ee3bbc97102 100644 (file)
@@ -420,7 +420,6 @@ ac_airtoair(struct emp_qelem *att_list, struct emp_qelem *int_list)
     struct plist *interceptor;
     struct emp_qelem *att;
     struct emp_qelem *in;
-    int nplanes;
     int more_att;
     int more_int;
     struct emp_qelem *att_next;
@@ -439,9 +438,6 @@ ac_airtoair(struct emp_qelem *att_list, struct emp_qelem *int_list)
        att_next = att->q_forw;
        attacker = (struct plist *)att;
        interceptor = (struct plist *)in;
-       nplanes = attacker->plane.pln_effic;
-       if (nplanes > interceptor->plane.pln_effic)
-           nplanes = interceptor->plane.pln_effic;
        ac_dog(attacker, interceptor);
        in = in_next;
        att = att_next;
@@ -751,8 +747,6 @@ ac_fireflak(struct emp_qelem *list, natid from, int guns)
     struct emp_qelem *next;
     char msg[255];
 
-    plp = (struct plist *)list->q_forw;
-
     for (qp = list->q_forw; qp != list; qp = next) {
        next = qp->q_forw;
        plp = (struct plist *)qp;
index df52a3554cfa7474c0daaa98be5362c69fa25637..ce3ed15b011cb3b76b4a9de6deb12554308e4797 100644 (file)
@@ -99,7 +99,6 @@ print_shiplist(struct shiplist *head)
 {
     struct shiplist *s;
     int first;
-    struct mchrstr *mp;
     struct shpstr ship;
 
     s = head;
@@ -107,7 +106,6 @@ print_shiplist(struct shiplist *head)
 
     while (s != NULL) {
        getship(s->uid, &ship);
-       mp = &mchr[(int)ship.shp_type];
        if (first) {
            pr(" #          player->owner           eff        type\n");
            first = 0;
index b8598f8d8d41552ab48c0a85bbdc2de6f67d7b45..afb028c3afd51fb581a1be154e19951463506fd9 100644 (file)
@@ -54,7 +54,7 @@ blankfill(char *ptr, struct range *range, int size)
        p = ptr;
        while (--col >= 0)
            *p++ = ' ';
-       *p++ = 0;
+       *p = 0;
        ptr += MAPWIDTH(size);
     }
 }
index 43e56ad56ae03531efc791396b16bf87f805d119..a19e53dc28db4363a45879de33e72dfa9f2edf9d 100644 (file)
@@ -178,10 +178,9 @@ lnd_take_casualty(int combat_mode, struct ulist *llp, int cas)
 
     taken = llp->unit.land.lnd_item[I_MILIT];
     /* Spies always die */
-    if (((struct lchrstr *)llp->chrp)->l_flags & L_SPY) {
-       eff_eq = 100;
+    if (((struct lchrstr *)llp->chrp)->l_flags & L_SPY)
        llp->unit.land.lnd_effic = 0;
-    else {
+    else {
        eff_eq = ldround(cas * 100.0 /
            ((struct lchrstr *)llp->chrp)->l_item[I_MILIT], 1);
        llp->unit.land.lnd_effic -= eff_eq;
@@ -1054,7 +1053,6 @@ lnd_mar_one_sector(struct emp_qelem *list, int dir, natid actor,
        /* move survivors to done */
        for (qp = cur.q_back; qp != &cur; qp = next) {
            next = qp->q_back;
-           llp = (struct ulist *)qp;
            emp_remque(qp);
            emp_insque(qp, &done);
        }
index 5249393e6ec1af34263b1add9216ff09ed493492..4a8f585bef28461d336275bf761dc8234ca00751 100644 (file)
@@ -175,7 +175,6 @@ draw_map(int bmap, char origin, int map_flags, struct nstr_sect *nsp)
        switch (bmap) {
        default:
            CANT_REACH();
-           bmap = 'b';
            /* fall through */
        case 'b':
            while (bmnxtsct(nsp) && !player->aborted) {
index 517826ff35ee8a0b42bd2f5748219238442721ef..c13f5b53e928bd90f21818bbf097c1a56ae61a91 100644 (file)
@@ -1075,7 +1075,6 @@ air_damage(struct emp_qelem *bombers, coord x, coord y, int mission,
        if (!plp->load)
            continue;
 
-       newdam = 0;
        if (plp->pcp->pl_flags & P_A) {
            if (roll(100) > pln_identchance(pp, hardtarget, EF_SHIP)) {
                wu(0, pp->pln_own,
index bb5400e7732a1979abb8e8ceebdb078e9b4c9e40..fb5a3f721e7425c1c921f29e8610be95217790af 100644 (file)
@@ -216,7 +216,6 @@ msl_intercept(struct plnstr *msl, struct sctstr *sp, int sublaunch,
              int news_item)
 {
     struct plnstr *pp;
-    struct plchrstr *pcp;
     struct emp_qelem *intlist;
     struct emp_qelem intfoo;
     struct emp_qelem *qp;
@@ -236,7 +235,6 @@ msl_intercept(struct plnstr *msl, struct sctstr *sp, int sublaunch,
        pp = &ip->plane;
        if (pp->pln_own != sp->sct_own)
            continue;
-       pcp = ip->pcp;
        if (mission_pln_equip(ip, NULL, 'i') < 0) {
            emp_remque(qp);
            free(qp);
@@ -255,7 +253,6 @@ msl_intercept(struct plnstr *msl, struct sctstr *sp, int sublaunch,
        next = qp->q_forw;
        ip = (struct plist *)qp;
        pp = &ip->plane;
-       pcp = ip->pcp;
        if (mission_pln_equip(ip, NULL, 'i') < 0) {
            emp_remque(qp);
            free(qp);
@@ -287,7 +284,6 @@ msl_intercept(struct plnstr *msl, struct sctstr *sp, int sublaunch,
        qp = intlist->q_forw;
        ip = (struct plist *)qp;
        pp = &ip->plane;
-       pcp = ip->pcp;
 
        mpr(msl->pln_own, "%s %s launched in defense!\n",
            cname(pp->pln_own), def_name);
index 8b33b35e53b2c0bc6987675ec3b470c0a2b0d1c8..75c6d984c4e8aeab146c1381d35e2c81e92fe93c 100644 (file)
@@ -145,7 +145,6 @@ retreat_ship1(struct shpstr *sp, char code, int orig)
     if (sp->shp_own == 0)
        return 0;
 
-    n = 0;
     if (sp->shp_effic < SHIP_MINEFF) {
        wu(0, sp->shp_own,
           "%s %s,\nbut it died in the attack, and so couldn't retreat!\n",
@@ -405,7 +404,6 @@ retreat_land1(struct lndstr *lp, char code, int orig)
     if (lp->lnd_own == 0)
        return 0;
 
-    n = 0;
     if (lp->lnd_effic < LAND_MINEFF) {
        wu(0, lp->lnd_own,
           "%s %s,\nbut it died in the attack, and so couldn't retreat!\n",
index a5e0149eb1c8dc721bd52237e35b069ac1772303..bce16cc62e03d6396605d3cae883ebe471c705ca 100644 (file)
@@ -130,7 +130,6 @@ takeover(struct sctstr *sp, natid newown)
      * n: random number from -25:75 + (50 - loyalty)
      */
     n = (50 - sp->sct_loyal) + ((random() % 100) - 25);
-    che_count = 0;
     if (n > 0 && sp->sct_own == sp->sct_oldown) {
        che_count = (civ * n / 3000) + 5;
        if (che_count * 2 > civ)
index d5057d25df8b31d3c49f2b791d4fb89c3a655ee9..908cd29a95fd2735438a1cd21a23913ef087d4b2 100644 (file)
@@ -50,7 +50,6 @@ deliver(struct sctstr *from, struct ichrstr *ip, int dir,
     int amt_dst;
     int mobility;
     double mcost;
-    struct dchrstr *dp;
     int n;
 
     if (dir <= 0 || dir > DIR_UL)
@@ -73,7 +72,6 @@ deliver(struct sctstr *from, struct ichrstr *ip, int dir,
           ip->i_name, ownxy(from));
        return 0;
     }
-    dp = &dchr[from->sct_type];
     vtype = ip->i_uid;
     mobility = from->sct_mobil / 2;
     if (vtype == I_CIVIL) {
index 84dcfab15c1db4069e69f939e85f86b89dadddeb..c2c2605b3bd54e33ecc62d68691fca0bb880a1c2 100644 (file)
@@ -272,8 +272,6 @@ nav_ship(struct shpstr *sp)
     mlp->mobil = sp->shp_mobil;
     emp_insque(&mlp->queue, &ship_list);
 
-    quit = 1;                  /* setup loop, we want to check it 1 time. */
-
     do {
        if ((sp->shp_mobil > 0) && (!(sp->shp_autonav & AN_LOADING)) &&
            (!(sp->shp_autonav & AN_STANDBY))) {
index 23305d87eafc5a1842d43bf699349ca6bc9e961a..da8b22849dc57db4645e008944171405a7657398 100644 (file)
@@ -62,7 +62,6 @@ revolt(struct sctstr *sp)
     if (che > (civ + uw) * 3)
        return;
     che_uw = 0;
-    che_civ = 0;
     /* che due to civilian unrest */
     n = 10 - (random() % 20);
     che_civ = 3 + (civ * n / 500);
@@ -254,7 +253,6 @@ guerrilla(struct sctstr *sp)
         * guerrillas have to resort to blowing things up.
         * Note this disrupts work in the sector.
         */
-       n = 0;
        n = (random() % 10) + (random() % che);
        if (n > 100)
            n = 100;
index 782433f1ebd3554d0cc56e27522bdac2da01ce63..7cf9b284adf58d0fdcb09509790eb38cd870fa02 100644 (file)
@@ -275,7 +275,6 @@ shiprepair(struct shpstr *ship, struct natstr *np, struct bp *bp, int etus)
            return;
     }
 
-    wf = 0;
     /* only military can work on a military boat */
     if (mp->m_glim != 0)
        wf = etus * ship->shp_item[I_MILIT] / 2;
index aa8748fdd5343c3013ca5cbd7d1a99dd6f46d9dd..2628f9d73450cefc92786cf8d41bc6f2a442eaab 100644 (file)
@@ -1166,7 +1166,6 @@ write_newcap_script(void)
        fprintf(script, "newcap %d %d,%d\n", c + 1, capx[c], capy[c]);
     }
     fprintf(script, "add %d visitor visitor v i\n", c + 1);
-    ++c;
     fclose(script);
     return 0;
 }