cgram: conform to lint's strict bool mode, KNF

[bsdgames-darwin.git] / trek / ranf.c

diff --git a/trek/ranf.c b/trek/ranf.c
index 2229ca594e026f0ceceed4a490801ae16e963f0b..3c76fe9cbb8dd939b5de7181cc0914c5490fab43 100644 (file)
--- a/trek/ranf.c
+++ b/trek/ranf.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: ranf.c,v 1.3 1995/04/22 10:59:21 cgd Exp $     */
+/*     $NetBSD: ranf.c,v 1.7 2009/05/25 00:37:27 dholland 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,31 +29,32 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)ranf.c     8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: ranf.c,v 1.3 1995/04/22 10:59:21 cgd Exp $";
+__RCSID("$NetBSD: ranf.c,v 1.7 2009/05/25 00:37:27 dholland Exp $");
 #endif
 #endif /* not lint */
 
-# include      <stdio.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "trek.h"
 
-ranf(max)
-int    max;
-{
-       register int    t;
+#define        RANDOM_MAX      0x7fffffff
 
+int
+ranf(int max)
+{
        if (max <= 0)
                return (0);
-       t = rand() >> 5;
-       return (t % max);
+       return (random() % max);
 }
 
 
-double franf()
+double
+franf(void)
 {
-       double          t;
-       t = rand() & 077777;
-       return (t / 32767.0);
+       return random() / (double)RANDOM_MAX;
 }