ncurses 6.4 - patch 20240420

[ncurses.git] / test / blue.c

diff --git a/test/blue.c b/test/blue.c
index 9c4108a41a6a6d51717bc4ab8c747bfc136914b1..90f240b6263403f188a80d8ae1efaeb2f53b847c 100644 (file)
--- a/test/blue.c
+++ b/test/blue.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ * Copyright 2019-2021,2022 Thomas E. Dickey                                *
+ * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -36,7 +37,7 @@
  *****************************************************************************/
 
 /*
- * $Id: blue.c,v 1.51 2017/09/30 17:43:18 tom Exp $
+ * $Id: blue.c,v 1.55 2022/12/10 23:31:31 tom Exp $
  */
 
 #include <test.priv.h>
@@ -70,7 +71,7 @@
 #define BLACK_ON_WHITE  2
 #define BLUE_ON_WHITE   3
 
-static void die(int onsig) GCC_NORETURN;
+static GCC_NORETURN void die(int onsig);
 
 static int deck_size = PACK_SIZE;      /* initial deck */
 static int deck[PACK_SIZE];
@@ -153,14 +154,14 @@ init_vars(void)
 static void
 shuffle(int size)
 {
-    int i, j, numswaps, swapnum, temp;
+    int numswaps, swapnum;
 
     numswaps = size * 10;      /* an arbitrary figure */
 
     for (swapnum = 0; swapnum < numswaps; swapnum++) {
-       i = rand() % size;
-       j = rand() % size;
-       temp = deck[i];
+       int i = rand() % size;
+       int j = rand() % size;
+       int temp = deck[i];
        deck[i] = deck[j];
        deck[j] = temp;
     }
@@ -169,11 +170,11 @@ shuffle(int size)
 static void
 deal_cards(void)
 {
-    int ptr, card = 0, value, csuit, crank, suit, aces[4];
+    int card = 0, value, csuit, crank, suit, aces[4];
 
     memset(aces, 0, sizeof(aces));
     for (suit = HEARTS; suit <= CLUBS; suit++) {
-       ptr = freeptr[suit];
+       int ptr = freeptr[suit];
        grid[ptr++] = NOCARD;   /* 1st card space is blank */
        while ((ptr % GRID_WIDTH) != 0) {
            value = deck[card++];
@@ -388,10 +389,10 @@ play_game(void)
 static int
 collect_discards(void)
 {
-    int row, col, cardno = 0, finish, gridno;
+    int row, col, cardno = 0, gridno;
 
     for (row = HEARTS; row <= CLUBS; row++) {
-       finish = 0;
+       int finish = 0;
        for (col = 1; col < GRID_WIDTH; col++) {
            gridno = row * GRID_WIDTH + col;
 
@@ -464,9 +465,44 @@ use_pc_display(void)
 #define use_pc_display()       /* nothing */
 #endif /* HAVE_LANGINFO_CODESET */
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+       "Usage: blue [options]"
+       ,""
+       ,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+       fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
 main(int argc, char *argv[])
 {
+    int ch;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+       switch (ch) {
+       case OPTS_VERSION:
+           show_version(argv);
+           ExitProgram(EXIT_SUCCESS);
+       default:
+           usage(ch == OPTS_USAGE);
+           /* NOTREACHED */
+       }
+    }
+    if (optind < argc)
+       usage(FALSE);
+
     setlocale(LC_ALL, "");
 
     use_pc_display();