ncurses 6.0 - patch 20170930

[ncurses.git] / test / dots.c

diff --git a/test/dots.c b/test/dots.c
index 22d81713854f0d29b5dab64ea8f518f4f27cc809..f9d2ef693fc0aec70b67ecdbc58b14bf6709b23c 100644 (file)
--- a/test/dots.c
+++ b/test/dots.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1999-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright (c) 1999-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            *
@@ -29,7 +29,7 @@
 /*
  * Author: Thomas E. Dickey <dickey@clark.net> 1999
  *
- * $Id: dots.c,v 1.23 2011/04/23 19:15:04 tom Exp $
+ * $Id: dots.c,v 1.26 2017/09/30 17:55:22 tom Exp $
  *
  * A simple demo of the terminfo interface.
  */
@@ -53,7 +53,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);
@@ -62,7 +62,7 @@ TPUTS_PROTO(outc, c)
 }
 
 static bool
-outs(char *s)
+outs(const char *s)
 {
     if (valid(s)) {
        tputs(s, 1, outc);
@@ -105,18 +105,18 @@ main(int argc GCC_UNUSED,
     int x, y, z, p;
     double r;
     double c;
-
-    CATCHALL(onsig);
+    int my_colors;
 
     srand((unsigned) time(0));
-    setupterm((char *) 0, 1, (int *) 0);
+    InitAndCatch(setupterm((char *) 0, 1, (int *) 0), onsig);
     outs(clear_screen);
     outs(cursor_invisible);
-    if (max_colors > 1) {
+    my_colors = max_colors;
+    if (my_colors > 1) {
        if (!valid(set_a_foreground)
            || !valid(set_a_background)
            || (!valid(orig_colors) && !valid(orig_pair)))
-           max_colors = -1;
+           my_colors = -1;
     }
 
     r = (double) (lines - 4);
@@ -129,8 +129,8 @@ main(int argc GCC_UNUSED,
        p = (ranf() > 0.9) ? '*' : ' ';
 
        tputs(tparm3(cursor_address, y, x), 1, outc);
-       if (max_colors > 0) {
-           z = (int) (ranf() * max_colors);
+       if (my_colors > 0) {
+           z = (int) (ranf() * my_colors);
            if (ranf() > 0.01) {
                tputs(tparm2(set_a_foreground, z), 1, outc);
            } else {