From 275e28ad8575814dcb1749559423a55a82960cfe Mon Sep 17 00:00:00 2001 From: dholland Date: Mon, 20 Jul 2009 05:33:35 +0000 Subject: ANSIfy. Also, we now have RANDOM_MAX; use it. Object diffs checked... --- random/random.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'random') diff --git a/random/random.c b/random/random.c index 4400e97f..1515ec71 100644 --- a/random/random.c +++ b/random/random.c @@ -1,4 +1,4 @@ -/* $NetBSD: random.c,v 1.12 2008/07/20 01:03:22 lukem Exp $ */ +/* $NetBSD: random.c,v 1.13 2009/07/20 05:33:35 dholland Exp $ */ /* * Copyright (c) 1994 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1994\ #if 0 static char sccsid[] = "@(#)random.c 8.6 (Berkeley) 6/1/94"; #else -__RCSID("$NetBSD: random.c,v 1.12 2008/07/20 01:03:22 lukem Exp $"); +__RCSID("$NetBSD: random.c,v 1.13 2009/07/20 05:33:35 dholland Exp $"); #endif #endif /* not lint */ @@ -57,15 +57,10 @@ __RCSID("$NetBSD: random.c,v 1.12 2008/07/20 01:03:22 lukem Exp $"); #include #include -#define MAXRANDOM 2147483647 - -int main(int, char **); void usage(void) __dead; int -main(argc, argv) - int argc; - char *argv[]; +main(int argc, char *argv[]) { struct timeval tp; double denom; @@ -113,7 +108,7 @@ main(argc, argv) /* Compute a random exit status between 0 and denom - 1. */ if (random_exit) - return ((denom * random()) / MAXRANDOM); + return ((denom * random()) / RANDOM_MAX); /* * Act as a filter, randomly choosing lines of the standard input @@ -128,7 +123,7 @@ main(argc, argv) * 0 (which has a 1 / denom chance of being true), we select the * line. */ - selected = (int)(denom * random() / MAXRANDOM) == 0; + selected = (int)(denom * random() / RANDOM_MAX) == 0; while ((ch = getchar()) != EOF) { if (selected) (void)putchar(ch); @@ -138,7 +133,7 @@ main(argc, argv) err(2, "stdout"); /* Now see if the next line is to be printed. */ - selected = (int)(denom * random() / MAXRANDOM) == 0; + selected = (int)(denom * random() / RANDOM_MAX) == 0; } } if (ferror(stdin)) @@ -149,7 +144,7 @@ main(argc, argv) } void -usage() +usage(void) { (void)fprintf(stderr, "usage: random [-er] [denominator]\n"); -- cgit v1.2.3-56-ge451