mention hex numbers

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

diff --git a/quiz/quiz.c b/quiz/quiz.c
index e6c90a69d9ac2e25345a978517ad9e8a89819bc9..74b41e8ff5f99ce900c322d651dfaf3de92ad322 100644 (file)
--- a/quiz/quiz.c
+++ b/quiz/quiz.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: quiz.c,v 1.24 2009/08/12 08:26:49 dholland Exp $       */
+/*     $NetBSD: quiz.c,v 1.28 2019/02/03 03:19:25 mrg Exp $    */
 
 /*-
  * Copyright (c) 1991, 1993
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 1993\
 #if 0
 static char sccsid[] = "@(#)quiz.c     8.3 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: quiz.c,v 1.24 2009/08/12 08:26:49 dholland Exp $");
+__RCSID("$NetBSD: quiz.c,v 1.28 2019/02/03 03:19:25 mrg Exp $");
 #endif
 #endif /* not lint */
 
@@ -62,23 +62,20 @@ __RCSID("$NetBSD: quiz.c,v 1.24 2009/08/12 08:26:49 dholland Exp $");
 
 static QE qlist;
 static int catone, cattwo, tflag;
-static u_int qsize;
+static unsigned qsize;
 
-int     main(int, char *[]);
 static char *appdstr(char *, const char *, size_t);
 static void downcase(char *);
 static void get_cats(char *, char *);
 static void get_file(const char *);
 static const char *next_cat(const char *);
 static void quiz(void);
-static void score(u_int, u_int, u_int);
+static void score(unsigned, unsigned, unsigned);
 static void show_index(void);
 static void usage(void) __dead;
 
 int
-main(argc, argv)
-       int argc;
-       char *argv[];
+main(int argc, char *argv[])
 {
        int ch;
        const char *indexfile;
@@ -119,8 +116,7 @@ main(argc, argv)
 }
 
 static void
-get_file(file)
-       const char *file;
+get_file(const char *file)
 {
        FILE *fp;
        QE *qp;
@@ -159,7 +155,7 @@ get_file(file)
 }
 
 static void
-show_index()
+show_index(void)
 {
        QE *qp;
        const char *p, *s;
@@ -192,8 +188,7 @@ show_index()
 }
 
 static void
-get_cats(cat1, cat2)
-       char *cat1, *cat2;
+get_cats(char *cat1, char *cat2)
 {
        QE *qp;
        int i;
@@ -225,13 +220,13 @@ get_cats(cat1, cat2)
 }
 
 static void
-quiz()
+quiz(void)
 {
        QE *qp;
        int i;
        size_t len;
-       u_int guesses, rights, wrongs;
-       int next;
+       unsigned guesses, rights, wrongs;
+       unsigned next, j;
        char *answer, *t, question[LINE_SZ];
        const char *s;
 
@@ -242,7 +237,7 @@ quiz()
                        break;
                next = random() % qsize;
                qp = qlist.q_next;
-               for (i = 0; i < next; i++)
+               for (j = 0; j < next; j++)
                        qp = qp->q_next;
                while (qp && qp->q_answered)
                        qp = qp->q_next;
@@ -308,8 +303,7 @@ quiz()
 }
 
 static const char *
-next_cat(s)
-       const char *    s;
+next_cat(const char *s)
 {
        int esc;
 
@@ -324,6 +318,7 @@ next_cat(s)
                case ':':
                        if (!esc)
                                return (s);
+                       /* FALLTHROUGH */
                default:
                        esc = 0;
                        break;
@@ -332,10 +327,7 @@ next_cat(s)
 }
 
 static char *
-appdstr(s, tp, len)
-       char *s;
-       const char *tp;
-       size_t len;
+appdstr(char *s, const char *tp, size_t len)
 {
        char *mp;
        const char *sp;
@@ -359,8 +351,7 @@ appdstr(s, tp, len)
 }
 
 static void
-score(r, w, g)
-       u_int r, w, g;
+score(unsigned r, unsigned w, unsigned g)
 {
        (void)printf("Rights %d, wrongs %d,", r, w);
        if (g)
@@ -369,8 +360,7 @@ score(r, w, g)
 }
 
 static void
-downcase(p)
-       char *p;
+downcase(char *p)
 {
        int ch;
 
@@ -380,7 +370,7 @@ downcase(p)
 }
 
 static void
-usage()
+usage(void)
 {
        (void)fprintf(stderr, "quiz [-t] [-i file] category1 category2\n");
        exit(1);