ncurses 6.2 - patch 20200418

[ncurses.git] / test / hashtest.c

diff --git a/test/hashtest.c b/test/hashtest.c
index 658681540fd19c7075e3d368e6ece49978920bd2..70d622874da90bc24eee5c93ed85605f054b2a29 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 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            *
  *                                                                          *
  * 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.
  *
  *
  * 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.36 2020/02/02 23:34:34 tom Exp $

  */
 
 #include <test.priv.h>
  */
 
 #include <test.priv.h>


@@ -222,12 +223,10 @@ main(int argc, char *argv[])
        test_optimize = TRUE;
     }
 #if USE_TRACE
        test_optimize = TRUE;
     }
 #if USE_TRACE

-    trace(TRACE_TIMES);
+    curses_trace(TRACE_TIMES);

 #endif
 
 #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 */
     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 */