ncurses 6.2 - patch 20210710

[ncurses.git] / test / ditto.c

diff --git a/test/ditto.c b/test/ditto.c
index bf14946ff384a3450206bbd4ed426ec30cb87ad2..aecd342ca8334681c34637448595f8cb05ae870d 100644 (file)
--- a/test/ditto.c
+++ b/test/ditto.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.              *
+ * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 1998-2016,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            *
@@ -29,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey (1998-on)
  *
- * $Id: ditto.c,v 1.46 2017/09/06 09:19:14 tom Exp $
+ * $Id: ditto.c,v 1.51 2021/04/17 17:39:43 tom Exp $
  *
  * The program illustrates how to set up multiple screens from a single
  * program.
@@ -101,8 +102,8 @@ typedef struct {
     DITTO *ditto;              /* data for all screens */
 } DDATA;
 
-static void failed(const char *) GCC_NORETURN;
-static void usage(void) GCC_NORETURN;
+static GCC_NORETURN void failed(const char *);
+static GCC_NORETURN void usage(void);
 
 static void
 failed(const char *s)
@@ -114,7 +115,7 @@ failed(const char *s)
 static void
 usage(void)
 {
-    fprintf(stderr, "usage: ditto [terminal1 ...]\n");
+    fprintf(stderr, "Usage: ditto [terminal1 ...]\n");
     ExitProgram(EXIT_FAILURE);
 }
 
@@ -196,7 +197,7 @@ open_tty(char *path)
     return fp;
 }
 
-static void
+static int
 init_screen(
 #if HAVE_USE_WINDOW
               SCREEN *sp GCC_UNUSED,
@@ -236,6 +237,7 @@ init_screen(
        target->windows[k] = inner;
     }
     doupdate();
+    return TRUE;
 }
 
 static void
@@ -351,7 +353,6 @@ static void *
 handle_screen(void *arg)
 {
     DDATA ddata;
-    int ch;
 
     memset(&ddata, 0, sizeof(ddata));
     ddata.ditto = (DITTO *) arg;
@@ -359,7 +360,7 @@ handle_screen(void *arg)
     ddata.ditto -= ddata.source;       /* -> base of array */
 
     for (;;) {
-       ch = read_screen(ddata.ditto->screen, &ddata);
+       int ch = read_screen(ddata.ditto->screen, &ddata);
        if (ch == CTRL('D')) {
            int later = (ddata.source ? ddata.source : -1);
            int j;