ncurses 6.1 - patch 20191214

[ncurses.git] / test / worm.c

diff --git a/test/worm.c b/test/worm.c
index c7eba10d604a4b9ea4c0085eae7ce42647462814..c7b04aa814451d0253b79fcb6a61a4dd0b638414 100644 (file)
--- a/test/worm.c
+++ b/test/worm.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2018,2019 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            *


@@ -52,7 +52,7 @@
   traces will be dumped.  The program stops and waits for one character of
   input at the beginning and end of the interval.
 
   traces will be dumped.  The program stops and waits for one character of
   input at the beginning and end of the interval.
 

-  $Id: worm.c,v 1.78 2018/06/17 01:40:17 tom Exp $
+  $Id: worm.c,v 1.81 2019/12/14 23:25:29 tom Exp $

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


@@ -215,7 +215,7 @@ static void
 failed(const char *s)
 {
     perror(s);
 failed(const char *s)
 {
     perror(s);

-    exit_curses();
+    stop_curses();

     ExitProgram(EXIT_FAILURE);
 }
 #endif
     ExitProgram(EXIT_FAILURE);
 }
 #endif


@@ -224,7 +224,7 @@ static void
 cleanup(void)
 {
     USING_WINDOW1(stdscr, wrefresh, safe_wrefresh);
 cleanup(void)
 {
     USING_WINDOW1(stdscr, wrefresh, safe_wrefresh);

-    exit_curses();
+    stop_curses();

 }
 
 static void
 }
 
 static void


@@ -401,11 +401,12 @@ get_input(void)
 
 #ifdef KEY_RESIZE
 static int
 
 #ifdef KEY_RESIZE
 static int

-update_refs(WINDOW *win)
+update_refs(WINDOW *win, void *data)

 {
     int x, y;
 
     (void) win;
 {
     int x, y;
 
     (void) win;

+    (void) data;

     if (last_x != COLS - 1) {
        for (y = 0; y <= last_y; y++) {
            refs[y] = typeRealloc(int, (size_t) COLS, refs[y]);
     if (last_x != COLS - 1) {
        for (y = 0; y <= last_y; y++) {
            refs[y] = typeRealloc(int, (size_t) COLS, refs[y]);


@@ -607,10 +608,10 @@ main(int argc, char *argv[])
 #ifdef TRACE
            if (trace_start || trace_end) {
                if (generation == trace_start) {
 #ifdef TRACE
            if (trace_start || trace_end) {
                if (generation == trace_start) {

-                   trace(TRACE_CALLS);
+                   curses_trace(TRACE_CALLS);

                    get_input();
                } else if (generation == trace_end) {
                    get_input();
                } else if (generation == trace_end) {

-                   trace(0);
+                   curses_trace(0);

                    get_input();
                }
 
                    get_input();
                }