ncurses 6.1 - patch 20191123

[ncurses.git] / test / hashtest.c

diff --git a/test/hashtest.c b/test/hashtest.c
index 46a4f42331ff89f8cabc7b7be0f2f955c52613e3..9a3300b26b9b64fda5d90e6212f07ef7deafcd62 100644 (file)
--- a/test/hashtest.c
+++ b/test/hashtest.c
@@ -1,19 +1,38 @@
+/****************************************************************************
+ * Copyright (c) 1998-2013,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            *
+ * "Software"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
 /*
  * hashtest.c -- test hash mapping
  *
  * Generate timing statistics for vertical-motion optimization.
  *
- * $Id: hashtest.c,v 1.23 2002/10/19 22:11:24 tom Exp $
+ * $Id: hashtest.c,v 1.34 2017/09/30 15:42:53 tom Exp $
  */
 
-#ifdef TRACE
-#define Trace(p) _tracef p
-#define USE_TRACE 1
-#else
-#define Trace(p)               /* nothing */
-#define USE_TRACE 0
-#endif
-
 #include <test.priv.h>
 
 #define LO_CHAR ' '
@@ -35,7 +54,7 @@ cleanup(void)
     endwin();
 }
 
-static RETSIGTYPE
+static void
 finish(int sig GCC_UNUSED)
 {
     cleanup();
@@ -63,20 +82,21 @@ genlines(int base)
     move(0, 0);
     for (i = 0; i < head_lines; i++)
        for (j = 0; j < COLS; j++)
-           addch((j % 8 == 0) ? ('A' + j / 8) : '-');
+           AddCh(UChar((j % 8 == 0) ? ('A' + j / 8) : '-'));
 
     move(head_lines, 0);
     for (i = head_lines; i < LINES - foot_lines; i++) {
-       int c = (base - LO_CHAR + i) % (HI_CHAR - LO_CHAR + 1) + LO_CHAR;
+       chtype c = (chtype) ((base - LO_CHAR + i) % (HI_CHAR - LO_CHAR + 1)
+                            + LO_CHAR);
        int hi = (extend_corner || (i < LINES - 1)) ? COLS : COLS - 1;
        for (j = 0; j < hi; j++)
-           addch(c);
+           AddCh(c);
     }
 
     for (i = LINES - foot_lines; i < LINES; i++) {
        move(i, 0);
        for (j = 0; j < (extend_corner ? COLS : COLS - 1); j++)
-           addch((j % 8 == 0) ? ('A' + j / 8) : '-');
+           AddCh(UChar((j % 8 == 0) ? ('A' + j / 8) : '-'));
     }
 
     scrollok(stdscr, TRUE);
@@ -121,10 +141,10 @@ run_test(bool optimized GCC_UNUSED)
 #endif
 
     if (reverse_loops)
-       for (ch = hi; ch >= lo; ch--)
+       for (ch = (char) hi; ch >= lo; ch--)
            one_cycle(ch);
     else
-       for (ch = lo; ch <= hi; ch++)
+       for (ch = (char) lo; ch <= hi; ch++)
            one_cycle(ch);
 }
 
@@ -163,7 +183,7 @@ main(int argc, char *argv[])
 
     setlocale(LC_ALL, "");
 
-    while ((c = getopt(argc, argv, "cf:h:l:norsx")) != EOF) {
+    while ((c = getopt(argc, argv, "cf:h:l:norsx")) != -1) {
        switch (c) {
        case 'c':
            continuous = TRUE;
@@ -176,6 +196,7 @@ main(int argc, char *argv[])
            break;
        case 'l':
            test_loops = atoi(optarg);
+           assert(test_loops >= 0);
            break;
        case 'n':
            test_normal = TRUE;
@@ -204,9 +225,7 @@ main(int argc, char *argv[])
     trace(TRACE_TIMES);
 #endif
 
-    (void) signal(SIGINT, finish);     /* arrange interrupts to terminate */
-
-    (void) initscr();          /* initialize the curses library */
+    InitAndCatch(initscr(), finish);
     keypad(stdscr, TRUE);      /* enable keyboard mapping */
     (void) nonl();             /* tell curses not to do NL->CR/NL on output */
     (void) cbreak();           /* take input chars one at a time, no wait for \n */