From b8f5eaff0bfb531692bcdb4cb9757d4965cfda7b Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@pond.sub.org>
Date: Sat, 16 Jan 2010 17:40:28 +0100
Subject: [PATCH] Clean up dead stores

Does not change optimized code (gcc -O).

Spotted by the Clang Static Analyzer.
---
 src/lib/commands/bomb.c   |   3 -
 src/lib/commands/comm.c   |   1 -
 src/lib/commands/cuto.c   |   1 -
 src/lib/commands/dump.c   |   1 -
 src/lib/commands/head.c   |   2 +-
 src/lib/commands/mfir.c   |   3 +-
 src/lib/commands/newe.c   |   3 -
 src/lib/commands/orde.c   | 129 ++++++++++++++++++--------------------
 src/lib/commands/sell.c   |   2 -
 src/lib/commands/work.c   |   1 -
 src/lib/common/bestpath.c |   1 -
 src/lib/subs/aircombat.c  |   6 --
 src/lib/subs/aswplnsubs.c |   2 -
 src/lib/subs/border.c     |   2 +-
 src/lib/subs/lndsub.c     |   6 +-
 src/lib/subs/maps.c       |   1 -
 src/lib/subs/mission.c    |   1 -
 src/lib/subs/mslsub.c     |   4 --
 src/lib/subs/retreat.c    |   2 -
 src/lib/subs/takeover.c   |   1 -
 src/lib/update/deliver.c  |   2 -
 src/lib/update/nav_ship.c |   2 -
 src/lib/update/revolt.c   |   2 -
 src/lib/update/ship.c     |   1 -
 src/util/fairland.c       |   1 -
 25 files changed, 65 insertions(+), 115 deletions(-)

diff --git a/src/lib/commands/bomb.c b/src/lib/commands/bomb.c
index 087c8bda6..257d17abc 100644
--- a/src/lib/commands/bomb.c
+++ b/src/lib/commands/bomb.c
@@ -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 {
diff --git a/src/lib/commands/comm.c b/src/lib/commands/comm.c
index 4239a449c..ec972f1b3 100644
--- a/src/lib/commands/comm.c
+++ b/src/lib/commands/comm.c
@@ -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;
diff --git a/src/lib/commands/cuto.c b/src/lib/commands/cuto.c
index bcd07286d..f71d3d481 100644
--- a/src/lib/commands/cuto.c
+++ b/src/lib/commands/cuto.c
@@ -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;
diff --git a/src/lib/commands/dump.c b/src/lib/commands/dump.c
index 0155ec37d..8ce03a5c4 100644
--- a/src/lib/commands/dump.c
+++ b/src/lib/commands/dump.c
@@ -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;
diff --git a/src/lib/commands/head.c b/src/lib/commands/head.c
index b75bac1ed..5f7ab0310 100644
--- a/src/lib/commands/head.c
+++ b/src/lib/commands/head.c
@@ -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) {
diff --git a/src/lib/commands/mfir.c b/src/lib/commands/mfir.c
index 37e3ad1ff..7d38da78c 100644
--- a/src/lib/commands/mfir.c
+++ b/src/lib/commands/mfir.c
@@ -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;
 	    }
diff --git a/src/lib/commands/newe.c b/src/lib/commands/newe.c
index 43c0eedac..53ceba7e7 100644
--- a/src/lib/commands/newe.c
+++ b/src/lib/commands/newe.c
@@ -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 {
diff --git a/src/lib/commands/orde.c b/src/lib/commands/orde.c
index 058f96953..9f7fb96af 100644
--- a/src/lib/commands/orde.c
+++ b/src/lib/commands/orde.c
@@ -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");
diff --git a/src/lib/commands/sell.c b/src/lib/commands/sell.c
index b5fddc98c..1e88bc0a8 100644
--- a/src/lib/commands/sell.c
+++ b/src/lib/commands/sell.c
@@ -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;
diff --git a/src/lib/commands/work.c b/src/lib/commands/work.c
index 9e297a24c..218e62c25 100644
--- a/src/lib/commands/work.c
+++ b/src/lib/commands/work.c
@@ -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.
diff --git a/src/lib/common/bestpath.c b/src/lib/common/bestpath.c
index 30383fcb6..bb42ad61e 100644
--- a/src/lib/common/bestpath.c
+++ b/src/lib/common/bestpath.c
@@ -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    */
diff --git a/src/lib/subs/aircombat.c b/src/lib/subs/aircombat.c
index bcb8dcfeb..d23265fb9 100644
--- a/src/lib/subs/aircombat.c
+++ b/src/lib/subs/aircombat.c
@@ -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;
diff --git a/src/lib/subs/aswplnsubs.c b/src/lib/subs/aswplnsubs.c
index df52a3554..ce3ed15b0 100644
--- a/src/lib/subs/aswplnsubs.c
+++ b/src/lib/subs/aswplnsubs.c
@@ -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;
diff --git a/src/lib/subs/border.c b/src/lib/subs/border.c
index b8598f8d8..afb028c3a 100644
--- a/src/lib/subs/border.c
+++ b/src/lib/subs/border.c
@@ -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);
     }
 }
diff --git a/src/lib/subs/lndsub.c b/src/lib/subs/lndsub.c
index 43e56ad56..a19e53dc2 100644
--- a/src/lib/subs/lndsub.c
+++ b/src/lib/subs/lndsub.c
@@ -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);
 	}
diff --git a/src/lib/subs/maps.c b/src/lib/subs/maps.c
index 5249393e6..4a8f585be 100644
--- a/src/lib/subs/maps.c
+++ b/src/lib/subs/maps.c
@@ -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) {
diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c
index 517826ff3..c13f5b53e 100644
--- a/src/lib/subs/mission.c
+++ b/src/lib/subs/mission.c
@@ -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,
diff --git a/src/lib/subs/mslsub.c b/src/lib/subs/mslsub.c
index bb5400e77..fb5a3f721 100644
--- a/src/lib/subs/mslsub.c
+++ b/src/lib/subs/mslsub.c
@@ -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);
diff --git a/src/lib/subs/retreat.c b/src/lib/subs/retreat.c
index 8b33b35e5..75c6d984c 100644
--- a/src/lib/subs/retreat.c
+++ b/src/lib/subs/retreat.c
@@ -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",
diff --git a/src/lib/subs/takeover.c b/src/lib/subs/takeover.c
index a5e0149eb..bce16cc62 100644
--- a/src/lib/subs/takeover.c
+++ b/src/lib/subs/takeover.c
@@ -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)
diff --git a/src/lib/update/deliver.c b/src/lib/update/deliver.c
index d5057d25d..908cd29a9 100644
--- a/src/lib/update/deliver.c
+++ b/src/lib/update/deliver.c
@@ -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) {
diff --git a/src/lib/update/nav_ship.c b/src/lib/update/nav_ship.c
index 84dcfab15..c2c2605b3 100644
--- a/src/lib/update/nav_ship.c
+++ b/src/lib/update/nav_ship.c
@@ -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))) {
diff --git a/src/lib/update/revolt.c b/src/lib/update/revolt.c
index 23305d87e..da8b22849 100644
--- a/src/lib/update/revolt.c
+++ b/src/lib/update/revolt.c
@@ -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;
diff --git a/src/lib/update/ship.c b/src/lib/update/ship.c
index 782433f1e..7cf9b284a 100644
--- a/src/lib/update/ship.c
+++ b/src/lib/update/ship.c
@@ -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;
diff --git a/src/util/fairland.c b/src/util/fairland.c
index aa8748fdd..2628f9d73 100644
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -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;
 }
-- 
2.43.0