reinstate NULL cast by request, where the NULL was being passed as a vararg

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

diff --git a/cribbage/cards.c b/cribbage/cards.c
index 50e2f4819a11c8d4c31c74e13cb346d0e186c01c..9d5d075096e158010f333db289ef7ee3dd159a09 100644 (file)
--- a/cribbage/cards.c
+++ b/cribbage/cards.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: cards.c,v 1.7 2003/08/07 09:37:08 agc Exp $    */
+/*     $NetBSD: cards.c,v 1.9 2009/08/12 05:48:04 dholland Exp $       */
 
 /*-
  * Copyright (c) 1980, 1993
@@ -34,7 +34,7 @@
 #if 0
 static char sccsid[] = "@(#)cards.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: cards.c,v 1.7 2003/08/07 09:37:08 agc Exp $");
+__RCSID("$NetBSD: cards.c,v 1.9 2009/08/12 05:48:04 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -51,8 +51,7 @@ __RCSID("$NetBSD: cards.c,v 1.7 2003/08/07 09:37:08 agc Exp $");
  * Initialize a deck of cards to contain one of each type.
  */
 void
-makedeck(d)
-       CARD    d[];
+makedeck(CARD d[])
 {
        int i, j, k;
 
@@ -72,8 +71,7 @@ makedeck(d)
  * see Knuth, vol. 2, page 125.
  */
 void
-shuffle(d)
-       CARD d[];
+shuffle(CARD d[])
 {
        int j, k;
        CARD c;
@@ -89,9 +87,8 @@ shuffle(d)
 /*
  * return true if the two cards are equal...
  */
-int
-eq(a, b)
-       CARD a, b;
+static int
+eq(CARD a, CARD b)
 {
        return ((a.rank == b.rank) && (a.suit == b.suit));
 }
@@ -100,10 +97,7 @@ eq(a, b)
  * is_one returns TRUE if a is in the set of cards b
  */
 int
-is_one(a, b, n)
-       CARD a;
-       const CARD b[];
-       int n;
+is_one(CARD a, const CARD b[], int n)
 {
        int i;
 
@@ -117,9 +111,7 @@ is_one(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)
 {
        int i, j;
 
@@ -135,9 +127,7 @@ cremove(a, d, n)
  *     Sort a hand of n cards
  */
 void
-sorthand(h, n)
-       CARD h[];
-       int n;
+sorthand(CARD h[], int n)
 {
        CARD *cp, *endp;
        CARD c;