cgram: fix assertion when substituting at the end of the longest line

[bsdgames-darwin.git] / mille / comp.c

diff --git a/mille/comp.c b/mille/comp.c
index ef42f102bc62fee27feb88a0c97892210afa1bfe..2b59bbd7305af49a0c192ed6d5ad3f0500e2c11b 100644 (file)
--- a/mille/comp.c
+++ b/mille/comp.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: comp.c,v 1.10 2006/03/19 00:29:27 christos Exp $       */
+/*     $NetBSD: comp.c,v 1.14 2019/02/04 03:29:41 mrg Exp $    */
 
 /*
  * Copyright (c) 1982, 1993
@@ -34,26 +34,27 @@
 #if 0
 static char sccsid[] = "@(#)comp.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: comp.c,v 1.10 2006/03/19 00:29:27 christos Exp $");
+__RCSID("$NetBSD: comp.c,v 1.14 2019/02/04 03:29:41 mrg Exp $");
 #endif
 #endif /* not lint */
 
-# include      "mille.h"
+#include "mille.h"
 
 /*
  * @(#)comp.c  1.1 (Berkeley) 4/1/82
  */
 
-# define       V_VALUABLE      40
+#define V_VALUABLE     40
 
 void
-calcmove()
+calcmove(void)
 {
        CARD            card;
        int             *value;
        PLAY            *pp, *op;
-       bool            foundend, cango, canstop, foundlow;
-       unsgn int       i, count200, badcount, nummin, nummax, diff;
+       bool            foundend, canstop, foundlow;
+       int             cango;
+       unsigned int    i, count200, badcount, nummin, nummax, diff;
        int             curmin, curmax;
        CARD            safe, oppos;
        int             valbuf[HAND_SZ], count[NUM_CARDS];
@@ -217,6 +218,7 @@ okay:
                                        *value = 0;
                                        break;
                                }
+                               /* FALLTHROUGH */
                          case C_75:    case C_100:
                                *value = (Value[card] >> 3);
                                if (pp->speed == C_LIMIT)
@@ -401,8 +403,7 @@ play_it:
  * Return true if the given player could conceivably win with his next card.
  */
 int
-onecard(pp)
-       const PLAY      *pp;
+onecard(const PLAY *pp)
 {
        CARD    bat, spd, card;
 
@@ -424,6 +425,7 @@ onecard(pp)
                                card = (End - pp->mileage == 75 ? C_75 : C_100);
                        if (spd == C_LIMIT)
                                return Numseen[S_RIGHT_WAY] == 0;
+                       /* FALLTHROUGH */
                  case 50:
                  case 25:
                        if (card == -1)
@@ -434,9 +436,7 @@ onecard(pp)
 }
 
 int
-canplay(pp, op, card)
-       const PLAY      *pp, *op;
-       CARD    card;
+canplay(const PLAY *pp, const PLAY *op, CARD card)
 {
        switch (card) {
          case C_200: