clean up import

1 files changed, 74 insertions, 85 deletions

diff --git a/cribbage/cards.c b/cribbage/cards.c
index 16927fa9..a81bdf65 100644
--- a/cribbage/cards.c
+++ b/cribbage/cards.c
@@ -1,6 +1,8 @@
-/*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+/*	$NetBSD: cards.c,v 1.3 1995/03/21 15:08:41 cgd Exp $	*/
+
+/*-
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,131 +34,118 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)cards.c	5.5 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: cards.c,v 1.2 1993/08/01 18:55:16 mycroft Exp $";
+static char sccsid[] = "@(#)cards.c	8.1 (Berkeley) 5/31/93";
 #endif /* not lint */
 
-#include	<stdio.h>
-#include	"deck.h"
+#include <curses.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+
+#include "deck.h"
+#include "cribbage.h"
 
 
 /*
- * initialize a deck of cards to contain one of each type
+ * Initialize a deck of cards to contain one of each type.
  */
-
-makedeck( d )
-
-    CARD	d[];
+void
+makedeck(d)
+	CARD    d[];
 {
-	register  int		i, j, k;
-	long			time();
+	register int i, j, k;
 
-	i = time( (long *) 0 );
-	i = ( (i&0xff) << 8 ) | ( (i >> 8)&0xff ) | 1;
-	srand( i );
+	i = time(NULL);
+	i = ((i & 0xff) << 8) | ((i >> 8) & 0xff) | 1;
+	srand(i);
 	k = 0;
-	for( i = 0; i < RANKS; i++ )  {
-	    for( j = 0; j < SUITS; j++ )  {
-		d[k].suit = j;
-		d[k++].rank = i;
-	    }
-	}
+	for (i = 0; i < RANKS; i++)
+		for (j = 0; j < SUITS; j++) {
+			d[k].suit = j;
+			d[k++].rank = i;
+		}
 }
 
-
-
 /*
- * given a deck of cards, shuffle it -- i.e. randomize it
- * see Knuth, vol. 2, page 125
+ * Given a deck of cards, shuffle it -- i.e. randomize it
+ * see Knuth, vol. 2, page 125.
  */
-
-shuffle( d )
-
-    CARD	d[];
+void
+shuffle(d)
+	CARD d[];
 {
-	register  int		j, k;
-	CARD			c;
-
-	for( j = CARDS; j > 0; --j )  {
-	    k = ( rand() >> 4 ) % j;		/* random 0 <= k < j */
-	    c = d[j - 1];			/* exchange (j - 1) and k */
-	    d[j - 1] = d[k];
-	    d[k] = c;
+	register int j, k;
+	CARD c;
+
+	for (j = CARDS; j > 0; --j) {
+		k = (rand() >> 4) % j;		/* random 0 <= k < j */
+		c = d[j - 1];			/* exchange (j - 1) and k */
+		d[j - 1] = d[k];
+		d[k] = c;
 	}
 }
 
-
-
 /*
  * return true if the two cards are equal...
  */
-
-eq( a, b )
-
-    CARD		a, b;
+int
+eq(a, b)
+	CARD a, b;
 {
-	return(  ( a.rank == b.rank )  &&  ( a.suit == b.suit )  );
+	return ((a.rank == b.rank) && (a.suit == b.suit));
 }
 
-
-
 /*
  * isone returns TRUE if a is in the set of cards b
  */
-
-isone( a, b, n )
-
-    CARD		a, b[];
-    int			n;
+int
+isone(a, b, n)
+	CARD a, b[];
+	int n;
 {
-	register  int		i;
+	register int i;
 
-	for( i = 0; i < n; i++ )  {
-	    if(  eq( a, b[i] )   )  return( TRUE );
-	}
-	return( FALSE );
+	for (i = 0; i < n; i++)
+		if (eq(a, b[i]))
+			return (TRUE);
+	return (FALSE);
 }
 
-
-
 /*
  * remove the card a from the deck d of n cards
  */
-
-cremove( a, d, n )
-
-    CARD		a, d[];
-    int			n;
+void
+cremove(a, d, n)
+	CARD a, d[];
+	int n;
 {
-	register  int		i, j;
+	register int i, j;
 
-	j = 0;
-	for( i = 0; i < n; i++ )  {
-	    if(  !eq( a, d[i] )  )  d[j++] = d[i];
-	}
-	if(  j < n  )  d[j].suit = d[j].rank = EMPTY;
+	for (i = j = 0; i < n; i++)
+		if (!eq(a, d[i]))
+			d[j++] = d[i];
+	if (j < n)
+		d[j].suit = d[j].rank = EMPTY;
 }
 
-
-
 /*
  * sorthand:
  *	Sort a hand of n cards
  */
+void
 sorthand(h, n)
-register CARD		h[];
-int			n;
+	register CARD h[];
+	int n;
 {
-	register CARD		*cp, *endp;
-	CARD			c;
+	register CARD *cp, *endp;
+	CARD c;
 
 	for (endp = &h[n]; h < endp - 1; h++)
-	    for (cp = h + 1; cp < endp; cp++)
-		if ((cp->rank < h->rank) ||
-		     (cp->rank == h->rank && cp->suit < h->suit)) {
-		    c = *h;
-		    *h = *cp;
-		    *cp = c;
-		}
+		for (cp = h + 1; cp < endp; cp++)
+			if ((cp->rank < h->rank) ||
+			    (cp->rank == h->rank && cp->suit < h->suit)) {
+				c = *h;
+				*h = *cp;
+				*cp = c;
+			}
 }
-