tetris: Use arc4random_uniform instead of modulo for better randomness

[bsdgames-darwin.git] / pig / pig.c

diff --git a/pig/pig.c b/pig/pig.c
index 95935351698dd7181f68bcdbd956ec531d39c5b0..a127ac74c2f478b1304b60ad617f595a2d87cf88 100644 (file)
--- a/pig/pig.c
+++ b/pig/pig.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: pig.c,v 1.10 2004/01/27 20:30:30 jsm Exp $     */
+/*     $NetBSD: pig.c,v 1.15 2012/06/19 05:46:09 dholland Exp $        */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -31,15 +31,15 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
-       The Regents of the University of California.  All rights reserved.\n");
+__COPYRIGHT("@(#) Copyright (c) 1992, 1993\
+ The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)pig.c      8.2 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: pig.c,v 1.10 2004/01/27 20:30:30 jsm Exp $");
+__RCSID("$NetBSD: pig.c,v 1.15 2012/06/19 05:46:09 dholland Exp $");
 #endif
 #endif /* not lint */
 
@@ -53,13 +53,11 @@ __RCSID("$NetBSD: pig.c,v 1.10 2004/01/27 20:30:30 jsm Exp $");
 #include <unistd.h>
 
 int main(int, char *[]);
-void pigout(char *, int);
-void usage(void) __attribute__((__noreturn__));
+static void pigout(char *, int);
+static void usage(void) __dead;
 
 int
-main(argc, argv)
-       int argc;
-       char *argv[];
+main(int argc, char *argv[])
 {
        int len;
        int ch;
@@ -90,18 +88,16 @@ main(argc, argv)
        exit(0);
 }
 
-void
-pigout(buf, len)
-       char *buf;
-       int len;
+static void
+pigout(char *buf, int len)
 {
        int ch, start, i;
        int olen, allupper, firstupper;
 
        /* See if the word is all upper case */
-       allupper = firstupper = isupper(buf[0]);
+       allupper = firstupper = isupper((unsigned char)buf[0]);
        for (i = 1; i < len && allupper; i++)
-               allupper = allupper && isupper(buf[i]);
+               allupper = allupper && isupper((unsigned char)buf[i]);
 
        /*
         * If the word starts with a vowel, append "way".  Don't treat 'y'
@@ -118,7 +114,7 @@ pigout(buf, len)
         * isn't treated as a vowel.
         */
        if (!allupper)
-               buf[0] = tolower(buf[0]);
+               buf[0] = tolower((unsigned char)buf[0]);
        for (start = 0, olen = len;
            !strchr("aeiouyAEIOUY", buf[start]) && start < olen;) {
                ch = buf[len++] = buf[start++];
@@ -127,12 +123,12 @@ pigout(buf, len)
                        buf[len++] = buf[start++];
        }
        if (firstupper)
-               buf[start] = toupper(buf[start]);
+               buf[start] = toupper((unsigned char)buf[start]);
        (void)printf("%.*s%s", olen, buf + start, allupper ? "AY" : "ay");
 }
 
-void
-usage()
+static void
+usage(void)
 {
        (void)fprintf(stderr, "usage: pig\n");
        exit(1);