X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fechochar.c;h=19ba9acd07e34a20f710d5dd034945af506810ff;hp=b2cf99bbef78f73accb2f7e0fb8f62c1607b1bbd;hb=22a4b929f47f85588dc07fddf98b09776cec658f;hpb=a924c24b2535cccdc0f5f991cd8ddcadcfa1f0d2

diff --git a/test/echochar.c b/test/echochar.c
index b2cf99bb..19ba9acd 100644
--- a/test/echochar.c
+++ b/test/echochar.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: echochar.c,v 1.11 2017/04/08 21:53:51 tom Exp $
+ * $Id: echochar.c,v 1.18 2017/10/18 23:04:52 tom Exp $
  *
  * Demonstrate the echochar function (compare to dots.c).
  * Thomas Dickey - 2006/11/4
@@ -36,8 +36,6 @@
 
 #include <time.h>
 
-#define valid(s) ((s != 0) && s != (char *)-1)
-
 static bool interrupted = FALSE;
 static long total_chars = 0;
 static time_t started;
@@ -45,9 +43,9 @@ static time_t started;
 static void
 cleanup(void)
 {
-    endwin();
+    exit_curses();
 
-    printf("\n\n%ld total chars, rate %.2f/sec\n",
+    printf("\n\n%ld total cells, rate %.2f/sec\n",
 	   total_chars,
 	   ((double) (total_chars) / (double) (time((time_t *) 0) - started)));
 }
@@ -98,13 +96,12 @@ main(int argc GCC_UNUSED,
 	    opt_r = TRUE;
 	    break;
 	default:
-	    fprintf(stderr, "usage: echochar [-r]\n");
+	    fprintf(stderr, "Usage: echochar [-r]\n");
 	    ExitProgram(EXIT_FAILURE);
 	}
     }
 
-    CATCHALL(onsig);
-    initscr();
+    InitAndCatch(initscr(), onsig);
 
     use_colors = has_colors();
     if (use_colors) {
@@ -149,7 +146,7 @@ main(int argc GCC_UNUSED,
 	    }
 	}
 	if (opt_r) {
-	    addch(UChar(p));
+	    AddCh(UChar(p));
 	    refresh();
 	} else {
 	    echochar(UChar(p));
@@ -157,5 +154,6 @@ main(int argc GCC_UNUSED,
 	++total_chars;
     }
     cleanup();
+    free(my_pairs);
     ExitProgram(EXIT_SUCCESS);
 }