Reset CVS keywords

[bsdgames-darwin.git] / cribbage / score.c

diff --git a/cribbage/score.c b/cribbage/score.c
index 932d757d514d3ffcc214ad5fb33fc2ab9debd1d1..56c023c8e56fdc60faa8f3e1369d187bc14be474 100644 (file)
--- a/cribbage/score.c
+++ b/cribbage/score.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: score.c,v 1.14 2009/06/04 04:48:04 dholland Exp $      */
+/*     $NetBSD: score.c,v 1.17 2019/02/03 10:48:46 mrg Exp $   */
 
 /*-
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)score.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: score.c,v 1.14 2009/06/04 04:48:04 dholland Exp $");
+__RCSID("$NetBSD: score.c,v 1.17 2019/02/03 10:48:46 mrg Exp $");
 #endif
 #endif /* not lint */
 
@@ -46,13 +46,16 @@ __RCSID("$NetBSD: score.c,v 1.14 2009/06/04 04:48:04 dholland Exp $");
 #include "deck.h"
 #include "cribbage.h"
 
+static int fifteens(const CARD [], int);
+static int pairuns(const CARD [], int);
+
 /*
  * the following arrays give the sum of the scores of the (50 2)*48 = 58800
  * hands obtainable for the crib given the two cards whose ranks index the
  * array.  the two arrays are for the case where the suits are equal and
  * not equal respectively
  */
-const long crbescr[169] = {
+static const long crbescr[169] = {
     -10000, 271827, 278883, 332319, 347769, 261129, 250653, 253203, 248259,
     243435, 256275, 237435, 231051, -10000, -10000, 412815, 295707, 349497,
     267519, 262521, 259695, 254019, 250047, 262887, 244047, 237663, -10000,
@@ -74,7 +77,7 @@ const long crbescr[169] = {
     -10000, -10000, -10000, -10000, -10000, -10000, -10000
 };
 
-const long crbnescr[169] = {
+static const long crbnescr[169] = {
     325272, 260772, 267828, 321264, 336714, 250074, 239598, 242148, 237204,
     232380, 246348, 226380, 219996, -10000, 342528, 401760, 284652, 338442,
     256464, 251466, 248640, 242964, 238992, 252960, 232992, 226608, -10000,
@@ -112,7 +115,7 @@ scorehand(const CARD hand[], CARD starter, int n, BOOLEAN crb,
        int hscore;
        BOOLEAN flag;
        CARD h[(CINHAND + 1)];
-       char buf[32];
+       char buf[52];
 
        explan[0] = '\0';       /* initialize explanation */
        hscore = 0;
@@ -177,7 +180,7 @@ scorehand(const CARD hand[], CARD starter, int n, BOOLEAN crb,
  * fifteens:
  *     Return number of fifteens in hand of n cards
  */
-int
+static int
 fifteens(const CARD hand[], int n)
 {
        int *sp, *np;
@@ -218,7 +221,7 @@ fifteens(const CARD hand[], int n)
  * this routine only works if n is strictly less than 6
  * sets the globals pairpoints and runpoints appropriately
  */
-int
+static int
 pairuns(const CARD h[], int n)
 {
        int i;
@@ -286,11 +289,12 @@ pairuns(const CARD h[], int n)
  * the n cards in tbl during pegging
  */
 int
-pegscore(CARD crd, const CARD tbl[], int n, int sum)
+pegscore(CARD crd, const CARD tbl[], unsigned n, int sum)
 {
        BOOLEAN got[RANKS];
        int i, j, scr;
        int k, lo, hi;
+       unsigned ju;
 
        sum += VAL(crd.rank);
        if (sum > 31)
@@ -301,11 +305,11 @@ pegscore(CARD crd, const CARD tbl[], int n, int sum)
                scr = 0;
        if (!n)
                return (scr);
-       j = 1;
-       while ((crd.rank == tbl[n - j].rank) && (n - j >= 0))
-               ++j;
-       if (j > 1)
-               return (scr + ichoose2[j]);
+       ju = 1;
+       while (ju <= n && crd.rank == tbl[n - ju].rank)
+               ++ju;
+       if (ju > 1)
+               return (scr + ichoose2[ju]);
        if (n < 2)
                return (scr);
        lo = hi = crd.rank;