ncurses 6.2 - patch 20211009

[ncurses.git] / test / xmas.c

diff --git a/test/xmas.c b/test/xmas.c
index f66ba6f04c612b8e70dcd5f189d115804c023d7b..678c9e172e564ed3baa1a7e609e4d6456c9233d7 100644 (file)
--- a/test/xmas.c
+++ b/test/xmas.c
@@ -92,7 +92,7 @@
 /******************************************************************************/
 
 /*
- * $Id: xmas.c,v 1.33 2017/09/30 19:14:13 tom Exp $
+ * $Id: xmas.c,v 1.36 2021/03/27 22:40:53 tom Exp $
  */
 #include <test.priv.h>
 
@@ -133,7 +133,7 @@ static WINDOW *w_holiday;
 static WINDOW *w_del_msg;
 static bool *my_pairs;
 
-static void done(int sig) GCC_NORETURN;
+static GCC_NORETURN void done(int sig);
 
 static void
 set_color(WINDOW *win, chtype color)
@@ -500,9 +500,6 @@ reindeer(void)
     y_pos = 0;
 
     for (x_pos = 70; x_pos > 62; x_pos--) {
-       if (x_pos < 62) {
-           y_pos = 1;
-       }
        for (looper = 0; looper < 4; looper++) {
            MvWAddCh(dotdeer0, y_pos, x_pos, (chtype) '.');
            wrefresh(dotdeer0);
@@ -638,7 +635,7 @@ done(int sig GCC_UNUSED)
 {
     move(LINES - 1, 0);
     refresh();
-    exit_curses();
+    stop_curses();
 
 #if NO_LEAKS
     if (my_pairs != 0)
@@ -749,7 +746,7 @@ main(int argc, char *argv[])
        (w_holiday = newwin(1, 26, 3, 27)) == 0 ||
 
        (w_del_msg = newwin(1, 19, 23, 60)) == 0) {
-       exit_curses();
+       stop_curses();
        fprintf(stderr, "Cannot create windows - screen too small\n");
        ExitProgram(EXIT_FAILURE);
     }