Indentation fixes; suspect indent-emp is to blame.

diff --git a/src/lib/as/as_cache.c b/src/lib/as/as_cache.c
index 5d27ed27f7daaf6ae28abc49af3b63db171cc735..becf3bb12d645f22d61e21f16e4e123efea30e95 100644 (file)
--- a/src/lib/as/as_cache.c
+++ b/src/lib/as/as_cache.c
@@ -107,9 +107,7 @@ as_add_cachepath(struct as_data *adp)
        /* And set some stuff */
        from->x = adp->from.x;
        /* Here we malloc a whole bunch of tolist pointers. */
-       from->tolist = (struct as_topath **)calloc(1,
-                                                  sizeof(struct as_topath
-                                                         *) * WORLD_Y);
+       from->tolist = calloc(1, sizeof(struct as_topath *) * WORLD_Y);
        /* Now, add from to the global list */
        from->next = fromhead[adp->from.y];
        fromhead[adp->from.y] = from;

diff --git a/src/lib/commands/bomb.c b/src/lib/commands/bomb.c
index 0fc5444244f0bd0b56fba7497112a91201e40199..a569f93cb94ee0d41fede141d27d17aded4630b5 100644 (file)
--- a/src/lib/commands/bomb.c
+++ b/src/lib/commands/bomb.c
@@ -110,8 +110,8 @@ bomb(void)
     wantflags = 0;
     if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
        return RET_SYN;
-    if (!snxtitem
-       (&ni_esc, EF_PLANE, getstarg(player->argp[2], "escort(s)? ", buf)))
+    if (!snxtitem(&ni_esc, EF_PLANE,
+                 getstarg(player->argp[2], "escort(s)? ", buf)))
        pr("No escorts...\n");
     if ((p =
         getstarg(player->argp[3], "pinpoint, or strategic? ", buf)) == 0)
@@ -255,9 +255,8 @@ pin_bomb(struct emp_qelem *list, struct sctstr *target)
     nunits = unitsatxy(target->sct_x, target->sct_y, 0, 0);
     getvec(VT_ITEM, vec, (s_char *)target, EF_SECTOR);
   retry:
-    p = getstring
-       ("Bomb what? (ship, plane, land unit, efficiency, commodities) ",
-        buf);
+    p = getstring("Bomb what? (ship, plane, land unit, efficiency, commodities) ",
+                 buf);
     if (p == 0 || *p == 0) {
        if (player->aborted)
            return;
@@ -598,8 +597,7 @@ ship_bomb(struct emp_qelem *list, struct sctstr *target)
            sprintf(msg, "Flak! Firing %d guns from ship %s\n",
                    flak, prship(&ship));
            PR(ship.shp_own, msg);
-           if (pinflak_planedamage
-               (&plp->plane, plp->pcp, ship.shp_own, flak))
+           if (pinflak_planedamage(&plp->plane, plp->pcp, ship.shp_own, flak))
                continue;
        }
 
@@ -838,8 +836,7 @@ land_bomb(struct emp_qelem *list, struct sctstr *target)
                    "Flak! Firing flak guns from unit %s (aa rating %d)\n",
                    prland(&land), land.lnd_aaf);
            PR(land.lnd_own, msg);
-           if (pinflak_planedamage
-               (&plp->plane, plp->pcp, land.lnd_own, flak))
+           if (pinflak_planedamage(&plp->plane, plp->pcp, land.lnd_own, flak))
                continue;
        }
 

diff --git a/src/lib/commands/coll.c b/src/lib/commands/coll.c
index 3e99cf0aa6de818c150cafbf93a53aae31ba4046..312e33e5d484f82bce2c28d27673087f4a769b8a 100644 (file)
--- a/src/lib/commands/coll.c
+++ b/src/lib/commands/coll.c
@@ -108,10 +108,8 @@ coll(void)
        owed *= loan.l_amtdue;
 /* End overflow fix */
     pr("You are owed $%.2f on that loan.\n", owed);
-    if (!
-       (p =
-        getstarg(player->argp[2],
-                 "What sector do you wish to confiscate? ", buf)))
+    if (!(p = getstarg(player->argp[2],
+                      "What sector do you wish to confiscate? ", buf)))
        return RET_SYN;
     if (!check_loan_ok(&loan))
        return RET_FAIL;

diff --git a/src/lib/commands/decl.c b/src/lib/commands/decl.c
index 4714710661c4fa5e451e28775415031379bfe267..cc1ee20c7dc6d497f22b54ce2c50cfbec6d91df2 100644 (file)
--- a/src/lib/commands/decl.c
+++ b/src/lib/commands/decl.c
@@ -51,11 +51,9 @@ decl(void)
     s_char *p;
     s_char buf[1024];
 
-    if (!
-       (p =
-        getstarg(player->argp[1],
-                 "alliance, friendly, neutrality, hostility, or war? ",
-                 buf)))
+    if (!(p = getstarg(player->argp[1],
+                      "alliance, friendly, neutrality, hostility, or war? ",
+                      buf)))
        return RET_SYN;
     switch (*p) {
     case 'a':

diff --git a/src/lib/commands/deli.c b/src/lib/commands/deli.c
index a87c109911bc1836847eedbbd9acc1d98ccf1507..eea0772db584e858e48cb135c1a463b51b538256 100644 (file)
--- a/src/lib/commands/deli.c
+++ b/src/lib/commands/deli.c
@@ -73,7 +73,7 @@ deli(void)
     while (nxtsct(&nstr, &sect) > 0) {
        if (!player->owner)
            continue;
-       
+
        del = getvar(i_del, (s_char *)&sect, EF_SECTOR);
        thresh = del & ~0x7;
        dir = del & 0x7;
@@ -100,7 +100,7 @@ deli(void)
                if (dir < 0)
                    return RET_SYN;
            }
-           
+
            if (!check_sect_ok(&sect))
                continue;
 

diff --git a/src/lib/commands/demo.c b/src/lib/commands/demo.c
index 62af5c98a25b9400ec215fb4f97853868ea93259..72993409235169d7975a3272d1b917678bad80d2 100644 (file)
--- a/src/lib/commands/demo.c
+++ b/src/lib/commands/demo.c
@@ -64,14 +64,11 @@ demo(void)
     cash = natp->nat_money;
     if (!snxtsct(&nstr, player->argp[1]))
        return RET_SYN;
-    if ((p =
-        getstarg(player->argp[2], "Number to de-mobilize : ", buf)) == 0)
+    if (!(p = getstarg(player->argp[2], "Number to de-mobilize : ", buf)))
        return RET_SYN;
     number = atoi(p);
-    if (!
-       (p =
-        getstarg(player->argp[3],
-                 "New civilians on active reserve? (y/n) ", buf)))
+    if (!(p = getstarg(player->argp[3],
+                      "New civilians on active reserve? (y/n) ", buf)))
        return RET_SYN;
     if (*p != 'y' && *p != 'n')
        return RET_SYN;

diff --git a/src/lib/commands/drop.c b/src/lib/commands/drop.c
index 20b97dc7d5e8975a6bfe0c77f2a4b37cfb218c20..7dbadfab1bb8b9644190f3ac7394ee75f39a3a8b 100644 (file)
--- a/src/lib/commands/drop.c
+++ b/src/lib/commands/drop.c
@@ -72,8 +72,8 @@ drop(void)
     wantflags = 0;
     if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
        return RET_SYN;
-    if (!snxtitem
-       (&ni_esc, EF_PLANE, getstarg(player->argp[2], "escort(s)? ", buf)))
+    if (!snxtitem(&ni_esc, EF_PLANE,
+                 getstarg(player->argp[2], "escort(s)? ", buf)))
        pr("No escorts...\n");
     if ((p = getstarg(player->argp[3], "assembly point? ", buf)) == 0
        || *p == 0)

diff --git a/src/lib/commands/fly.c b/src/lib/commands/fly.c
index c3869ef8ad05213813791f0feac6221ee28c35a7..44132ce5a8b769d0f3be85b54cd919f4a091daea 100644 (file)
--- a/src/lib/commands/fly.c
+++ b/src/lib/commands/fly.c
@@ -76,8 +76,8 @@ fly(void)
     wantflags = 0;
     if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
        return RET_SYN;
-    if (!snxtitem
-       (&ni_esc, EF_PLANE, getstarg(player->argp[2], "escort(s)? ", buf)))
+    if (!snxtitem(&ni_esc, EF_PLANE,
+                 getstarg(player->argp[2], "escort(s)? ", buf)))
        pr("No escorts...\n");
     if ((p = getstarg(player->argp[3], "assembly point? ", buf)) == 0
        || *p == 0)

diff --git a/src/lib/commands/fuel.c b/src/lib/commands/fuel.c
index b4406f03837cb1d3181416356e84a7d332079a1d..f9a1e4c2e985702ab7dded7ef677b6c87bfd2418 100644 (file)
--- a/src/lib/commands/fuel.c
+++ b/src/lib/commands/fuel.c
@@ -225,9 +225,8 @@ fuel(void)
                if (!player->argp[4])
                    pr("%s is not in a supplied, efficient harbor\n",
                       prship(&item.ship));
-               if (!snxtitem
-                   (&tender, EF_SHIP,
-                    getstarg(player->argp[4], "Oiler? ", buf)))
+               if (!snxtitem (&tender, EF_SHIP,
+                              getstarg(player->argp[4], "Oiler? ", buf)))
                    continue;
 
                if (!check_ship_ok(&item.ship))

diff --git a/src/lib/commands/laun.c b/src/lib/commands/laun.c
index a039bbfc46111a514f41733eb215e1a8dd84c93e..f1f4d4fb0793e40c8f01b8542002aeae15fd24c3 100644 (file)
--- a/src/lib/commands/laun.c
+++ b/src/lib/commands/laun.c
@@ -217,9 +217,8 @@ launch_as(struct plnstr *pp)
        pr("No satellites there!\n");
        return -1;
     }
-    if (msl_hit
-       (pp, plane.pln_def, EF_PLANE, N_SAT_KILL, N_SAT_KILL,
-        prplane(&plane), sx, sy, plane.pln_own)) {
+    if (msl_hit(pp, plane.pln_def, EF_PLANE, N_SAT_KILL, N_SAT_KILL,
+               prplane(&plane), sx, sy, plane.pln_own)) {
        dam = pln_damage(pp, sx, sy, 'p', &nukedam, 1);
        oldown = plane.pln_own;
        planedamage(&plane, dam);

diff --git a/src/lib/commands/load.c b/src/lib/commands/load.c
index e5ce00292776f393983c48d2a5eec93fa8daa138..72ebf0020fa306eec9082f714692315ac4861076 100644 (file)
--- a/src/lib/commands/load.c
+++ b/src/lib/commands/load.c
@@ -393,8 +393,8 @@ load_plane_ship(struct sctstr *sectp, struct shpstr *sp, int noisy,
     }
     sprintf(prompt, "Plane(s) to %s %s? ",
            load_unload == LOAD ? "load onto" : "unload from", prship(sp));
-    if (!snxtitem
-       (&ni, EF_PLANE, p = getstarg(player->argp[3], prompt, buf)))
+    if (!snxtitem(&ni, EF_PLANE,
+                 p = getstarg(player->argp[3], prompt, buf)))
        return RET_SYN;
 
     if (!still_ok_ship(sectp, sp))
@@ -538,8 +538,8 @@ load_land_ship(struct sctstr *sectp, struct shpstr *sp, int noisy,
     }
     sprintf(prompt, "Land unit(s) to %s %s? ",
            load_unload == LOAD ? "load onto" : "unload from", prship(sp));
-    if (!snxtitem
-       (&ni, EF_LAND, p = getstarg(player->argp[3], prompt, buf)))
+    if (!snxtitem(&ni, EF_LAND,
+                 p = getstarg(player->argp[3], prompt, buf)))
        return RET_SYN;
 
     if (!still_ok_ship(sectp, sp))
@@ -858,8 +858,8 @@ load_plane_land(struct sctstr *sectp, struct lndstr *lp, int noisy,
     }
     sprintf(prompt, "Plane(s) to %s %s? ",
            load_unload == LOAD ? "load onto" : "unload from", prland(lp));
-    if (!snxtitem
-       (&ni, EF_PLANE, p = getstarg(player->argp[3], prompt, buf)))
+    if (!snxtitem(&ni, EF_PLANE,
+                 p = getstarg(player->argp[3], prompt, buf)))
        return RET_SYN;
 
     if (!still_ok_land(sectp, lp))
@@ -1085,8 +1085,8 @@ load_land_land(struct sctstr *sectp, struct lndstr *lp, int noisy,
     }
     sprintf(prompt, "Land unit(s) to %s %s? ",
            load_unload == LOAD ? "load onto" : "unload from", prland(lp));
-    if (!snxtitem
-       (&ni, EF_LAND, p = getstarg(player->argp[3], prompt, buf)))
+    if (!snxtitem(&ni, EF_LAND,
+                 p = getstarg(player->argp[3], prompt, buf)))
        return RET_SYN;
 
     if (!still_ok_land(sectp, lp))

diff --git a/src/lib/commands/lten.c b/src/lib/commands/lten.c
index 88ef36ac3acbaeecfba286a4f8237435af8430f6..1d6f43629d9cb59a207feebd8d1b72776c5e89cf 100644 (file)
--- a/src/lib/commands/lten.c
+++ b/src/lib/commands/lten.c
@@ -75,8 +75,8 @@ ltend(void)
     if (!(ip = whatitem(player->argp[1], "Transfer what commodity? ")))
        return RET_SYN;
 
-    if (!snxtitem
-       (&tenders, EF_SHIP, getstarg(player->argp[2], "Tender(s)? ", buf)))
+    if (!snxtitem(&tenders, EF_SHIP,
+                 getstarg(player->argp[2], "Tender(s)? ", buf)))
        return RET_SYN;
     while (nxtitem(&tenders, (s_char *)&tender)) {
        if (!player->owner)

diff --git a/src/lib/commands/mfir.c b/src/lib/commands/mfir.c
index dca043313110def30568e2b99bfc65a555045b85..93bfb13430d50b036b2d0f33ad87549abd104669 100644 (file)
--- a/src/lib/commands/mfir.c
+++ b/src/lib/commands/mfir.c
@@ -829,8 +829,7 @@ quiet_bigdef(int attacker, struct emp_qelem *list, natid own, natid aown,
            range = mapdist(ship.shp_x, ship.shp_y, ax, ay);
            if (range > erange)
                continue;
-           if (!line_of_sight
-               ((s_char **)0, ship.shp_x, ship.shp_y, ax, ay))
+           if (!line_of_sight((s_char **)0, ship.shp_x, ship.shp_y, ax, ay))
                continue;
 
            (*nfiring)++;

diff --git a/src/lib/commands/move.c b/src/lib/commands/move.c
index 679bcba49d177e19694b287cf29c60495d09bd44..3ee2b7f4bc80cfbe40b5d0037dc1ec88a0d5f772 100644 (file)
--- a/src/lib/commands/move.c
+++ b/src/lib/commands/move.c
@@ -413,10 +413,9 @@ would_abandon(struct sctstr *sp, int vtype, int amnt, struct lndstr *lp)
        loyalcivs = 0;
 
     /* If they have a military unit there, they still own it */
-    if (sp->sct_own != 0 && ((loyalcivs == 0) && (mil == 0) &&
-                            (has_units
-                             (sp->sct_x, sp->sct_y, sp->sct_own,
-                              lp) == 0)))
+    if (sp->sct_own != 0
+       && ((loyalcivs == 0) && (mil == 0)
+           && (has_units(sp->sct_x, sp->sct_y, sp->sct_own, lp) == 0)))
        return 1;
 
     return 0;

diff --git a/src/lib/commands/para.c b/src/lib/commands/para.c
index 4fcc4d767ffe88c6587d952c266582c6c9e6d3ec..27f9fa654dd1a976bc1badc21fd9f261439d0d3c 100644 (file)
--- a/src/lib/commands/para.c
+++ b/src/lib/commands/para.c
@@ -77,8 +77,8 @@ para(void)
     wantflags = P_P;
     if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
        return RET_SYN;
-    if (!snxtitem
-       (&ni_esc, EF_PLANE, getstarg(player->argp[2], "escort(s)? ", buf)))
+    if (!snxtitem(&ni_esc, EF_PLANE,
+                 getstarg(player->argp[2], "escort(s)? ", buf)))
        pr("No escorts...\n");
     if ((p = getstarg(player->argp[3], "assembly point? ", buf)) == 0
        || *p == 0)

diff --git a/src/lib/commands/real.c b/src/lib/commands/real.c
index 691d31fd30919396bdbf005241f1266d1e4c789e..5f8e2a8f311e15b100d5618e88d320fa0b2d7405 100644 (file)
--- a/src/lib/commands/real.c
+++ b/src/lib/commands/real.c
@@ -132,7 +132,7 @@ dreal()
        }
        pr("Realms for %s (#%d)\n",cname(nat),nat);
        natp = getnatp(nat);
-       abs.width = 0;          
+       abs.width = 0;
        abs.height = 0;
        while (curr <= lastr) {
                b = &natp->nat_b[curr];

diff --git a/src/lib/commands/reco.c b/src/lib/commands/reco.c
index b57830c28db4688d766c87647f383c5d7ddfa60a..25000e74e18fa0f61738df8dbbf984a5fb80f793 100644 (file)
--- a/src/lib/commands/reco.c
+++ b/src/lib/commands/reco.c
@@ -71,8 +71,8 @@ reco(void)
     wantflags = 0;
     if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
        return RET_SYN;
-    if (!snxtitem
-       (&ni_esc, EF_PLANE, getstarg(player->argp[2], "escort(s)? ", buf)))
+    if (!snxtitem(&ni_esc, EF_PLANE,
+                 getstarg(player->argp[2], "escort(s)? ", buf)))
        pr("No escorts...\n");
     if ((p = getstarg(player->argp[3], "assembly point? ", buf)) == 0
        || *p == 0)

diff --git a/src/lib/commands/repo.c b/src/lib/commands/repo.c
index 6f9c43142627b32aa2c99b87016b24a1bad16305..b6b2c8ce9ff4816e5135fb0c5e6fb2adb4a6fab0 100644 (file)
--- a/src/lib/commands/repo.c
+++ b/src/lib/commands/repo.c
@@ -204,29 +204,22 @@ printdiff(int mystat, double ours, struct natstr *natp, int what)
        if (tolerance > 2 * ours)
            tolerance = (int)(2 * ours);
        if (check(buf, theirs, 2 * ours, -1.0, shift, what, tolerance)) ;
-       else if (check
-                (buf, theirs, 1.5 * ours, 2.0 * ours, shift, what,
+       else if (check(buf, theirs, 1.5 * ours, 2.0 * ours, shift, what,
+                      tolerance)) ;
+       else if (check(buf, theirs, 1.2 * ours, 1.5 * ours, shift, what,
                  tolerance)) ;
-       else if (check
-                (buf, theirs, 1.2 * ours, 1.5 * ours, shift, what,
-                 tolerance)) ;
-       else if (check
-                (buf, theirs, 1.1 * ours, 1.2 * ours, shift, what,
-                 tolerance)) ;
-       else if (check
-                (buf, theirs, ours / 1.1, 1.1 * ours, shift, what,
-                 tolerance)) ;
-       else if (check
-                (buf, theirs, ours / 1.2, ours / 1.1, shift, what,
-                 tolerance)) ;
-       else if (check
-                (buf, theirs, ours / 1.5, ours / 1.2, shift, what,
-                 tolerance)) ;
-       else if (check
-                (buf, theirs, ours / 2.0, ours / 1.5, shift, what,
-                 tolerance)) ;
-       else if (check
-                (buf, theirs, -1.0, ours / 2.0, shift, what, tolerance)) ;
+       else if (check(buf, theirs, 1.1 * ours, 1.2 * ours, shift, what,
+                      tolerance)) ;
+       else if (check(buf, theirs, ours / 1.1, 1.1 * ours, shift, what,
+                      tolerance)) ;
+       else if (check(buf, theirs, ours / 1.2, ours / 1.1, shift, what,
+                      tolerance)) ;
+       else if (check(buf, theirs, ours / 1.5, ours / 1.2, shift, what,
+                      tolerance)) ;
+       else if (check(buf, theirs, ours / 2.0, ours / 1.5, shift, what,
+                      tolerance)) ;
+       else if (check(buf, theirs, -1.0, ours / 2.0, shift, what,
+                      tolerance)) ;
        else
            sprintf(buf, "    n/a");
     } else

diff --git a/src/lib/commands/swap.c b/src/lib/commands/swap.c
index f7920a0fde273936128bbee0ce7b05e681b74921..3dd177c9278517bb74a660d49ef9f13a4ace9e0b 100644 (file)
--- a/src/lib/commands/swap.c
+++ b/src/lib/commands/swap.c
@@ -68,8 +68,7 @@ swaps(void)
        !getsect(sectb.sct_x, sectb.sct_y, &sectb))
        return RET_SYN;
     print_res(&sectb);
-    if (!confirm
-       ("Are you sure these are the two sectors you wish to swap? "))
+    if (!confirm ("Are you sure these are the two sectors you wish to swap? "))
        return RET_FAIL;
     /* save x and y from secta */
     x = secta.sct_x;

diff --git a/src/lib/commands/tend.c b/src/lib/commands/tend.c
index 91b72caad2e15a298e6c2989e27c33466e081b80..c803d3387cf01ab5fc7927df26832c90c3921f37 100644 (file)
--- a/src/lib/commands/tend.c
+++ b/src/lib/commands/tend.c
@@ -87,8 +87,8 @@ tend(void)
        return RET_SYN;
     }
 
-    if (!snxtitem
-       (&tenders, EF_SHIP, getstarg(player->argp[2], "Tender(s)? ", buf)))
+    if (!snxtitem(&tenders, EF_SHIP,
+                 getstarg(player->argp[2], "Tender(s)? ", buf)))
        return RET_SYN;
 
     while (nxtitem(&tenders, (s_char *)&tender)) {

diff --git a/src/lib/commands/trad.c b/src/lib/commands/trad.c
index d38e4044e6d7c31a2942cea31c46938af1e48abe..e4ef961f136cf70396a068964a938b77c3c9bcaf 100644 (file)
--- a/src/lib/commands/trad.c
+++ b/src/lib/commands/trad.c
@@ -330,8 +330,7 @@ check_trade(void)
            continue;
        }
        if (tg.gen.trg_own != trade.trd_owner) {
-           logerror
-               ("SOmething weird, tg.gen.trg_own != trade.trd_owner!\n");
+           logerror("Something weird, tg.gen.trg_own != trade.trd_owner!\n");
            trade.trd_unitid = -1;
            puttrade(n, &trade);
            continue;

diff --git a/src/lib/common/bestpath.c b/src/lib/common/bestpath.c
index 74d8332b909c763204f6d8a766179b5524a810d0..fe0f3cad501ea083a07c66b1a883f8567621e11b 100644 (file)
--- a/src/lib/common/bestpath.c
+++ b/src/lib/common/bestpath.c
@@ -204,8 +204,8 @@ bestownedpath(s_char *bpath,
                            tx = XNORM(tx);
                            ty = YNORM(ty);
                            if (mapindex[tx][ty] == 0xFFFF) {
-                               if (owned_and_navigable
-                                   (bigmap, tx, ty, terrain, own)
+                               if (owned_and_navigable(bigmap, tx, ty,
+                                                       terrain, own)
                                    || (tx == ex && ty == ey && !restr2)) {
                                    mapindex[tx][ty] =
                                        ((i + 1) << 13) + routelen;

diff --git a/src/lib/common/file.c b/src/lib/common/file.c
index c0b58062150b1273a20ca06e32ebb52f5895d0ef..7d5a635486e20f6b368033dad4c0b3ea6a5a24dc 100644 (file)
--- a/src/lib/common/file.c
+++ b/src/lib/common/file.c
@@ -294,9 +294,8 @@ ef_write(int type, int id, caddr_t ptr)
     }
     if (id >= ep->fids) {
        if (ep->flags & EFF_MEM) {
-           logerror
-               ("file %s went beyond %d items; won't be able toread item w/o restart",
-                ep->name, ep->fids);
+           logerror("file %s went beyond %d items; won't be able toread item w/o restart",
+                    ep->name, ep->fids);
        } else {
            /* write expanded file; ep->fids = last id + 1 */
            ep->fids = id + 1;

diff --git a/src/lib/lwp/lwp.c b/src/lib/lwp/lwp.c
index ccc13a8a6df695034b907df7d844d6658e0a80e1..eaa29d467ac1f41ef2bf1a98e58704891e19071f 100644 (file)
--- a/src/lib/lwp/lwp.c
+++ b/src/lib/lwp/lwp.c
@@ -448,8 +448,7 @@ lwpInitSystem(int pri, char **ctxptr, int flags)
     if (pri < 1)
        pri = 1;
     /* *LwpContextPtr = 0; */
-    if (!
-       (LwpCurrent = (struct lwpProc *)calloc(1, sizeof(struct lwpProc))))
+    if (!(LwpCurrent = calloc(1, sizeof(struct lwpProc))))
        return (0);
     if (!(stack = (int *)malloc(64)))
        return (0);

diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c
index 8ffd130b106bbff15da6c1e309f9db54203896f2..6145e0ae06a2973653c3142598d45f0f0d087d6c 100644 (file)
--- a/src/lib/player/accept.c
+++ b/src/lib/player/accept.c
@@ -226,8 +226,7 @@ player_accept(void *unused)
        exit(1);
     }
 #else
-    logerror
-       ("Alpha/Linux?  You don't support SO_REUSEADDR yet, do you?\n");
+    logerror("Alpha/Linux?  You don't support SO_REUSEADDR yet, do you?\n");
 #endif
     if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
        logerror("inet socket bind");

diff --git a/src/lib/subs/attsub.c b/src/lib/subs/attsub.c
index ce7cd313f5f2761f7c33fafb71fff8171d01f33c..2ec3f9639a67ce6d5f85562cd1350b1c6b909506 100644 (file)
--- a/src/lib/subs/attsub.c
+++ b/src/lib/subs/attsub.c
@@ -578,9 +578,7 @@ att_abort(int combat_mode, struct combat *off, struct combat *def)
                && (sect.sct_oldown != player->cnum)
                && (issneak != SITZKRIEG) && (issneak != MOBILIZATION)) {
                pr("You're not at war with them!\n");
-               if (!confirm
-                   ("Do you really want to sneak attack (it will cost you $5000) [yn]? "))
-               {
+               if (!confirm("Do you really want to sneak attack (it will cost you $5000) [yn]? ")) {
                    pr("Sneak attack cancelled!\n");
                    return abort_attack();
                }
@@ -779,36 +777,29 @@ att_ask_support(int offset, int *fortp, int *shipp, int *landp,
        *fortp = *shipp = 0;
        *landp = *planep = 0;
 
-       if (!
-           (p =
-            getstarg(player->argp[offset], "Use fort support? ", buf)))
+       if (!(p = getstarg(player->argp[offset], "Use fort support? ",
+                          buf)))
            return RET_SYN;
 
        if ((*p == 'y') || (*p == 'Y'))
            *fortp = 1;
 
-       if (!
-           (p =
-            getstarg(player->argp[offset + 1], "Use ship support? ",
-                     buf)))
+       if (!(p = getstarg(player->argp[offset + 1], "Use ship support? ",
+                          buf)))
            return RET_SYN;
 
        if ((*p == 'y') || (*p == 'Y'))
            *shipp = 1;
 
-       if (!
-           (p =
-            getstarg(player->argp[offset + 2], "Use land support? ",
-                     buf)))
+       if (!(p = getstarg(player->argp[offset + 2], "Use land support? ",
+                          buf)))
            return RET_SYN;
 
        if ((*p == 'y') || (*p == 'Y'))
            *landp = 1;
 
-       if (!
-           (p =
-            getstarg(player->argp[offset + 3], "Use plane support? ",
-                     buf)))
+       if (!p = getstarg(player->argp[offset + 3], "Use plane support? ",
+                         buf)))
            return RET_SYN;
 
        if ((*p == 'y') || (*p == 'Y'))
@@ -1597,10 +1588,7 @@ att_reacting_units(struct combat *def, struct emp_qelem *list, int a_spy,
            continue;
 
        getsect(def->x, def->y, &dsect);
-       if (!
-           (p =
-            (s_char *)BestLandPath(buf, &sect, &dsect, &move_cost,
-                                   MOB_ROAD)))
+       if (!(p = BestLandPath(buf, &sect, &dsect, &move_cost, MOB_ROAD)))
            continue;
 
        mobcost = land.lnd_effic * 0.01 * lchr[(int)land.lnd_type].l_spd;

diff --git a/src/lib/subs/plnsub.c b/src/lib/subs/plnsub.c
index ac3f6abe19a101f9c21e19b1494ad06293920a9a..b67277e29a144cb4c816ebf933d3fc84933973d8 100644 (file)
--- a/src/lib/subs/plnsub.c
+++ b/src/lib/subs/plnsub.c
@@ -109,11 +109,10 @@ pln_onewaymission(struct sctstr *target, int *shipno, int *flagp)
            if (!(p = getstarg(0, "Carrier #? ", buf)) || !*p)
                break;
            n = atoi(p);
-           if (n < 0 || !getship(n, &ship) || (!player->owner &&
-                                               (getrel
-                                                (getnatp(ship.shp_own),
-                                                 player->cnum) !=
-                                                ALLIED))) {
+           if (n < 0 || !getship(n, &ship)
+               || (!player->owner
+                   && (getrel(getnatp(ship.shp_own), player->cnum)
+                       != ALLIED))) {
                pr("Not yours\n");
                continue;
            }

diff --git a/src/server/shutdown.c b/src/server/shutdown.c
index fd483ac72e282cd220ba35bc5100647b71fe68a2..dd8e4a584de87dd46d0b4a4923745f16df61e51b 100644 (file)
--- a/src/server/shutdown.c
+++ b/src/server/shutdown.c
@@ -82,13 +82,11 @@ shutdown_sequence(void *unused)
                        shutdown_pending);
            } else if (shutdown_pending <= 60
                       && shutdown_pending % 10 == 0) {
-               pr_wall
-                   ("%sThe server will be shutting down in %d minutes!\n",
-                    header, shutdown_pending);
+               pr_wall("%sThe server will be shutting down in %d minutes!\n",
+                       header, shutdown_pending);
            } else if (shutdown_pending % 60 == 0) {
-               pr_wall
-                   ("%sThe server will be shutting down %d hours from now.\n",
-                    header, (int)(shutdown_pending / 60));
+               pr_wall("%sThe server will be shutting down %d hours from now.\n",
+                       header, (int)(shutdown_pending / 60));
            }
        }
        empth_sleep(now + 60);

diff --git a/src/util/land.c b/src/util/land.c
index bfca31d4d2029b5c9e94c46df8c60442cefd01c1..5d17adfede56313fa91f222b94ac05587a8823c4 100644 (file)
--- a/src/util/land.c
+++ b/src/util/land.c
@@ -112,9 +112,8 @@ s_char **argv;
     int big;
 
     if (argc > 1 && argc != 6) {
-       printf
-           ("usage: %s sectrange mincontdist chunksize numchunks numisle\n",
-            *argv);
+       printf("usage: %s sectrange mincontdist chunksize numchunks numisle\n",
+              *argv);
        return -1;
     }
     if (argc == 6) {