Pass -Wstrict-overflow.

[bsdgames-darwin.git] / trek / computer.c

diff --git a/trek/computer.c b/trek/computer.c
index 62a6c73d1b9a36141dbb346c9a53eea84ce241b0..2b3e0522bfc661d24c1db49b52faf573e16b2cd8 100644 (file)
--- a/trek/computer.c
+++ b/trek/computer.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: computer.c,v 1.12 2009/05/24 19:18:44 dholland Exp $   */
+/*     $NetBSD: computer.c,v 1.16 2009/08/12 08:54:54 dholland Exp $   */
 
 /*
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)computer.c 8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: computer.c,v 1.12 2009/05/24 19:18:44 dholland Exp $");
+__RCSID("$NetBSD: computer.c,v 1.16 2009/08/12 08:54:54 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -90,8 +90,7 @@ __RCSID("$NetBSD: computer.c,v 1.12 2009/05/24 19:18:44 dholland Exp $");
 **     command processor.
 */
 
-struct cvntab  Cputab[] =
-{
+static struct cvntab Cputab[] = {
        { "ch",         "art",                  (cmdfun)1,              0 },
        { "t",          "rajectory",            (cmdfun)2,              0 },
        { "c",          "ourse",                (cmdfun)3,              0 },
@@ -124,26 +123,23 @@ computer(int v __unused)
 
        if (check_out(COMPUTER))
                return;
-       while (1)
-       {
+       while (1) {
                r = getcodpar("\nRequest", Cputab);
-               switch ((long)r->value)
-               {
+               switch ((long)r->value) {
 
                  case 1:                       /* star chart */
-                       printf("Computer record of galaxy for all long range sensor scans\n\n");
+                       printf("Computer record of galaxy for all long range "
+                              "sensor scans\n\n");
                        printf("  ");
                        /* print top header */
                        for (i = 0; i < NQUADS; i++)
                                printf("-%d- ", i);
                        printf("\n");
-                       for (i = 0; i < NQUADS; i++)
-                       {
+                       for (i = 0; i < NQUADS; i++) {
                                printf("%d ", i);
-                               for (j = 0; j < NQUADS; j++)
-                               {
-                                       if (i == Ship.quadx && j == Ship.quady)
-                                       {
+                               for (j = 0; j < NQUADS; j++) {
+                                       if (i == Ship.quadx &&
+                                           j == Ship.quady) {
                                                printf("$$$ ");
                                                continue;
                                        }
@@ -158,7 +154,8 @@ computer(int v __unused)
                                                if (q->scanned < 0)
                                                        printf("... ");
                                                else
-                                                       printf("%3d ", q->scanned);
+                                                       printf("%3d ",
+                                                               q->scanned);
                                }
                                printf("%d\n", i);
                        }
@@ -170,32 +167,29 @@ computer(int v __unused)
                        break;
 
                  case 2:                       /* trajectory */
-                       if (check_out(SRSCAN))
-                       {
+                       if (check_out(SRSCAN)) {
                                break;
                        }
-                       if (Etc.nkling <= 0)
-                       {
+                       if (Etc.nkling <= 0) {
                                printf("No Klingons in this quadrant\n");
                                break;
                        }
                        /* for each Klingon, give the course & distance */
-                       for (i = 0; i < Etc.nkling; i++)
-                       {
-                               printf("Klingon at %d,%d", Etc.klingon[i].x, Etc.klingon[i].y);
-                               course = kalc(Ship.quadx, Ship.quady, Etc.klingon[i].x, Etc.klingon[i].y, &dist);
+                       for (i = 0; i < Etc.nkling; i++) {
+                               printf("Klingon at %d,%d",
+                                       Etc.klingon[i].x, Etc.klingon[i].y);
+                               course = kalc(Ship.quadx, Ship.quady,
+                                             Etc.klingon[i].x,
+                                             Etc.klingon[i].y, &dist);
                                prkalc(course, dist);
                        }
                        break;
 
                  case 3:                       /* course calculation */
-                       if (readdelim('/'))
-                       {
+                       if (readdelim('/')) {
                                tqx = Ship.quadx;
                                tqy = Ship.quady;
-                       }
-                       else
-                       {
+                       } else {
                                ix = getintpar("Quadrant");
                                if (ix < 0 || ix >= NSECTS)
                                        break;
@@ -212,13 +206,13 @@ computer(int v __unused)
                        if (iy < 0 || iy >= NSECTS)
                                break;
                        course = kalc(tqx, tqy, ix, iy, &dist);
-                       if (r->value2)
-                       {
+                       if (r->value2) {
                                warp(-1, course, dist);
                                break;
                        }
                        printf("%d,%d/%d,%d to %d,%d/%d,%d",
-                               Ship.quadx, Ship.quady, Ship.sectx, Ship.secty, tqx, tqy, ix, iy);
+                               Ship.quadx, Ship.quady, Ship.sectx, Ship.secty,
+                               tqx, tqy, ix, iy);
                        prkalc(course, dist);
                        break;
 
@@ -232,7 +226,8 @@ computer(int v __unused)
                                break;
                        dist *= 10.0;
                        cost = pow(0.90, dist) * 98.0 + 0.5;
-                       printf("Phasers are %d%% effective at that range\n", cost);
+                       printf("Phasers are %d%% effective at that range\n",
+                               cost);
                        break;
 
                  case 6:                       /* warp cost (time/energy) */
@@ -244,7 +239,8 @@ computer(int v __unused)
                                warpfact = Ship.warp;
                        cost = (dist + 0.05) * warpfact * warpfact * warpfact;
                        time = Param.warptime * dist / (warpfact * warpfact);
-                       printf("Warp %.2f distance %.2f cost %.2f stardates %d (%d w/ shlds up) units\n",
+                       printf("Warp %.2f distance %.2f cost %.2f "
+                              "stardates %d (%d w/ shlds up) units\n",
                                warpfact, dist, time, cost, cost + cost);
                        break;
 
@@ -262,25 +258,26 @@ computer(int v __unused)
                        j = 1;
                        printf("\n");
                        /* scan the event list */
-                       for (i = 0; i < MAXEVENTS; i++)
-                       {
+                       for (i = 0; i < MAXEVENTS; i++) {
                                e = &Event[i];
                                /* ignore hidden entries */
                                if (e->evcode & E_HIDDEN)
                                        continue;
-                               switch (e->evcode & E_EVENT)
-                               {
+                               switch (e->evcode & E_EVENT) {
 
                                  case E_KDESB:
-                                       printf("Klingon is attacking starbase in quadrant %d,%d\n",
+                                       printf("Klingon is attacking starbase "
+                                              "in quadrant %d,%d\n",
                                                e->x, e->y);
                                        j = 0;
                                        break;
 
                                  case E_ENSLV:
                                  case E_REPRO:
-                                       printf("Starsystem %s in quadrant %d,%d is distressed\n",
-                                               Systemname[e->systemname], e->x, e->y);
+                                       printf("Starsystem %s in quadrant "
+                                              "%d,%d is distressed\n",
+                                               Systemname[e->systemname],
+                                               e->x, e->y);
                                        j = 0;
                                        break;
                                }
@@ -291,15 +288,15 @@ computer(int v __unused)
 
                }
 
-               /* skip to next semicolon or newline.  Semicolon
+               /*
+                * Skip to next semicolon or newline.  Semicolon
                 * means get new computer request; newline means
-                * exit computer mode. */
-               while ((i = cgetc(0)) != ';')
-               {
-                       if (i == '\0')
+                * exit computer mode.
+                */
+               while ((i = getchar()) != ';') {
+                       if (i == EOF)
                                exit(1);
-                       if (i == '\n')
-                       {
+                       if (i == '\n') {
                                ungetc(i, stdin);
                                return;
                        }