ncurses 6.0 - patch 20170930

[ncurses.git] / test / dots_termcap.c

diff --git a/test/dots_termcap.c b/test/dots_termcap.c
index c8cbf7681792ebbf5713355e0e1dcd8749632416..cd88b3eb2b2ef710c81e583900e2cc8453cc5131 100644 (file)
--- a/test/dots_termcap.c
+++ b/test/dots_termcap.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2013 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2013-2014,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 +29,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: dots_termcap.c,v 1.6 2013/09/07 23:12:30 Ray.Donnelly Exp $
+ * $Id: dots_termcap.c,v 1.10 2017/09/30 17:55:22 tom Exp $
  *
  * A simple demo of the termcap interface.
  */
@@ -105,7 +105,7 @@ TPUTS_PROTO(outc, c)
 
     if (interrupted) {
        char tmp = (char) c;
-       if (write(STDOUT_FILENO, &tmp, 1) == -1)
+       if (write(STDOUT_FILENO, &tmp, (size_t) 1) == -1)
            rc = EOF;
     } else {
        rc = putc(c, stdout);
@@ -154,7 +154,7 @@ static void
 my_napms(int ms)
 {
 #if defined(__MINGW32__) || !HAVE_GETTIMEOFDAY
-    Sleep(ms);
+    Sleep((DWORD) ms);
 #else
     struct timeval data;
     data.tv_sec = 0;
@@ -177,14 +177,14 @@ main(int argc GCC_UNUSED,
     char area[1024];
     char *name;
 
-    CATCHALL(onsig);
-
     srand((unsigned) time(0));
 
     if ((name = getenv("TERM")) == 0) {
        fprintf(stderr, "TERM is not set\n");
        ExitProgram(EXIT_FAILURE);
-    } else if (tgetent(buffer, name) < 0) {
+    }
+    InitAndCatch(z = tgetent(buffer, name), onsig);
+    if (z < 0) {
        fprintf(stderr, "terminal description not found\n");
        ExitProgram(EXIT_FAILURE);
     } else {