Replaced one instance of err() with errx(), as the value of errno might not

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

diff --git a/cribbage/cards.c b/cribbage/cards.c
index a81bdf65e643480bcb7f67a839ca5a77c0a11833..dba3bc7bef855aaf6815ebb8961831910ea9eafc 100644 (file)
--- a/cribbage/cards.c
+++ b/cribbage/cards.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: cards.c,v 1.3 1995/03/21 15:08:41 cgd Exp $    */
+/*     $NetBSD: cards.c,v 1.8 2005/07/02 08:32:32 jmc Exp $    */
 
 /*-
  * Copyright (c) 1980, 1993
@@ -12,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -33,8 +29,13 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)cards.c    8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: cards.c,v 1.8 2005/07/02 08:32:32 jmc Exp $");
+#endif
 #endif /* not lint */
 
 #include <curses.h>
@@ -50,10 +51,9 @@ static char sccsid[] = "@(#)cards.c  8.1 (Berkeley) 5/31/93";
  * Initialize a deck of cards to contain one of each type.
  */
 void
-makedeck(d)
-       CARD    d[];
+makedeck(CARD d[])
 {
-       register int i, j, k;
+       int i, j, k;
 
        i = time(NULL);
        i = ((i & 0xff) << 8) | ((i >> 8) & 0xff) | 1;
@@ -71,10 +71,9 @@ makedeck(d)
  * see Knuth, vol. 2, page 125.
  */
 void
-shuffle(d)
-       CARD d[];
+shuffle(CARD d[])
 {
-       register int j, k;
+       int j, k;
        CARD c;
 
        for (j = CARDS; j > 0; --j) {
@@ -89,21 +88,18 @@ shuffle(d)
  * return true if the two cards are equal...
  */
 int
-eq(a, b)
-       CARD a, b;
+eq(CARD a, CARD b)
 {
        return ((a.rank == b.rank) && (a.suit == b.suit));
 }
 
 /*
- * isone returns TRUE if a is in the set of cards b
+ * is_one returns TRUE if a is in the set of cards b
  */
 int
-isone(a, b, n)
-       CARD a, b[];
-       int n;
+is_one(CARD a, const CARD b[], int n)
 {
-       register int i;
+       int i;
 
        for (i = 0; i < n; i++)
                if (eq(a, b[i]))
@@ -115,11 +111,9 @@ isone(a, b, n)
  * remove the card a from the deck d of n cards
  */
 void
-cremove(a, d, n)
-       CARD a, d[];
-       int n;
+cremove(CARD a, CARD d[], int n)
 {
-       register int i, j;
+       int i, j;
 
        for (i = j = 0; i < n; i++)
                if (!eq(a, d[i]))
@@ -133,11 +127,9 @@ cremove(a, d, n)
  *     Sort a hand of n cards
  */
 void
-sorthand(h, n)
-       register CARD h[];
-       int n;
+sorthand(CARD h[], int n)
 {
-       register CARD *cp, *endp;
+       CARD *cp, *endp;
        CARD c;
 
        for (endp = &h[n]; h < endp - 1; h++)