X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fdots_curses.c;h=930f522d17623da096854f968fa77f6c311786c3;hp=215351815e03d11d1217ba95d76b326d1e6e8afe;hb=3e91848cbe3dad23fdb60962fa9b678592591c34;hpb=eccca377f55c70b12e3e92621d94d1e1c1fcfb7d;ds=sidebyside

diff --git a/test/dots_curses.c b/test/dots_curses.c
index 21535181..930f522d 100644
--- a/test/dots_curses.c
+++ b/test/dots_curses.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2014-2018,2019 Free Software Foundation, Inc.              *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 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 +30,7 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: dots_curses.c,v 1.14 2019/01/21 14:20:18 tom Exp $
+ * $Id: dots_curses.c,v 1.16 2020/02/02 23:34:34 tom Exp $
  *
  * A simple demo of the curses interface used for comparison with termcap.
  */
@@ -113,7 +114,7 @@ usage(void)
 int
 main(int argc, char *argv[])
 {
-    int x, y, z, p;
+    int ch;
     int fg, bg;
     double r;
     double c;
@@ -125,8 +126,8 @@ main(int argc, char *argv[])
     size_t need;
     char *my_env;
 
-    while ((x = getopt(argc, argv, "T:dem:s:")) != -1) {
-	switch (x) {
+    while ((ch = getopt(argc, argv, "T:dem:s:")) != -1) {
+	switch (ch) {
 	case 'T':
 	    need = 6 + strlen(optarg);
 	    my_env = malloc(need);
@@ -185,13 +186,13 @@ main(int argc, char *argv[])
     fg = COLOR_WHITE;
     bg = COLOR_BLACK;
     while (!interrupted) {
-	x = (int) (c * ranf()) + m_option;
-	y = (int) (r * ranf()) + m_option;
-	p = (ranf() > 0.9) ? '*' : ' ';
+	int x = (int) (c * ranf()) + m_option;
+	int y = (int) (r * ranf()) + m_option;
+	int p = (ranf() > 0.9) ? '*' : ' ';
 
 	move(y, x);
 	if (has_colors()) {
-	    z = (int) (ranf() * COLORS);
+	    int z = (int) (ranf() * COLORS);
 	    if (ranf() > 0.01) {
 		set_colors(fg = z, bg);
 		attron(COLOR_PAIR(mypair(fg, bg)));