ncurses 6.4 - patch 20240414

[ncurses.git] / test / hashtest.c

diff --git a/test/hashtest.c b/test/hashtest.c
index 658681540fd19c7075e3d368e6ece49978920bd2..be79c0e10372de14c74e53e0c5729fc8f979533b 100644 (file)
--- a/test/hashtest.c
+++ b/test/hashtest.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2013,2017 Free Software Foundation, Inc.              *
+ * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 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            *
@@ -30,7 +31,7 @@
  *
  * Generate timing statistics for vertical-motion optimization.
  *
- * $Id: hashtest.c,v 1.33 2017/04/15 14:13:40 tom Exp $
+ * $Id: hashtest.c,v 1.39 2022/12/04 00:40:11 tom Exp $
  */
 
 #include <test.priv.h>
@@ -149,49 +150,53 @@ run_test(bool optimized GCC_UNUSED)
 }
 
 static void
-usage(void)
+usage(int ok)
 {
     static const char *const tbl[] =
     {
        "Usage: hashtest [options]"
        ,""
+       ,USAGE_COMMON
        ,"Options:"
-       ,"  -c      continuous (don't reset between refresh's)"
-       ,"  -f num  leave 'num' lines constant for footer"
-       ,"  -h num  leave 'num' lines constant for header"
-       ,"  -l num  repeat test 'num' times"
-       ,"  -n      test the normal optimizer"
-       ,"  -o      test the hashed optimizer"
-       ,"  -r      reverse the loops"
-       ,"  -s      single-step"
-       ,"  -x      assume lower-right corner extension"
+       ," -c       continuous (don't reset between refresh's)"
+       ," -F num   leave 'num' lines constant for footer"
+       ," -H num   leave 'num' lines constant for header"
+       ," -l num   repeat test 'num' times"
+       ," -n       test the normal optimizer"
+       ," -o       test the hashed optimizer"
+       ," -r       reverse the loops"
+       ," -s       single-step"
+       ," -x       assume lower-right corner extension"
     };
     size_t n;
 
     for (n = 0; n < SIZEOF(tbl); n++)
        fprintf(stderr, "%s\n", tbl[n]);
-    ExitProgram(EXIT_FAILURE);
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
 }
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
 
 int
 main(int argc, char *argv[])
 {
-    int c;
+    int ch;
     int test_loops = 1;
     int test_normal = FALSE;
     int test_optimize = FALSE;
 
     setlocale(LC_ALL, "");
 
-    while ((c = getopt(argc, argv, "cf:h:l:norsx")) != -1) {
-       switch (c) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "cF:H:l:norsx")) != -1) {
+       switch (ch) {
        case 'c':
            continuous = TRUE;
            break;
-       case 'f':
+       case 'F':
            foot_lines = atoi(optarg);
            break;
-       case 'h':
+       case 'H':
            head_lines = atoi(optarg);
            break;
        case 'l':
@@ -213,8 +218,12 @@ main(int argc, char *argv[])
        case 'x':
            extend_corner = TRUE;
            break;
+       case OPTS_VERSION:
+           show_version(argv);
+           ExitProgram(EXIT_SUCCESS);
        default:
-           usage();
+           usage(ch == OPTS_USAGE);
+           /* NOTREACHED */
        }
     }
     if (!test_normal && !test_optimize) {
@@ -222,12 +231,10 @@ main(int argc, char *argv[])
        test_optimize = TRUE;
     }
 #if USE_TRACE
-    trace(TRACE_TIMES);
+    curses_trace(TRACE_TIMES);
 #endif
 
-    CATCHALL(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 */