diff options
Diffstat (limited to 'test/test_addchstr.c')
| -rw-r--r-- | test/test_addchstr.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/test/test_addchstr.c b/test/test_addchstr.c index 2aae844e7651..2158d147982e 100644 --- a/test/test_addchstr.c +++ b/test/test_addchstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 2009-2010,2012 Free Software Foundation, Inc. * + * Copyright (c) 2009-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 * @@ -26,16 +26,18 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_addchstr.c,v 1.18 2012/12/16 00:36:27 tom Exp $ + * $Id: test_addchstr.c,v 1.24 2017/09/28 23:10:29 tom Exp $ * * Demonstrate the waddchstr() and waddch functions. * Thomas Dickey - 2009/9/12 */ #include <test.priv.h> - #include <linedata.h> +/* + * redefinitions to simplify comparison between test_*str programs + */ #undef MvAddStr #undef MvWAddStr @@ -48,9 +50,6 @@ #define WAddNStr waddchnstr #define WAddStr waddchstr -#define AddCh addch -#define WAddCh waddch - #define MY_TABSIZE 8 typedef enum { @@ -65,7 +64,7 @@ static bool pass_ctls = FALSE; static bool w_opt = FALSE; static int n_opt = -1; -static attr_t show_attr; +static chtype show_attr; static chtype *temp_buffer; static size_t temp_length; @@ -207,7 +206,7 @@ ColOf(char *buffer, int length, int margin) #define LEN(n) ((length - (n) > n_opt) ? n_opt : (length - (n))) static void -test_adds(int level) +recursive_test(int level) { static bool first = TRUE; @@ -233,7 +232,8 @@ test_adds(int level) static char cmd[80]; setlocale(LC_ALL, ""); - putenv(strcpy(cmd, "TABSIZE=8")); + _nc_STRCPY(cmd, "TABSIZE=8", sizeof(cmd)); + putenv(cmd); initscr(); (void) cbreak(); /* take input chars one at a time, no wait for \n */ @@ -282,7 +282,7 @@ test_adds(int level) doupdate(); if (has_colors()) { - show_attr = (attr_t) COLOR_PAIR(1); + show_attr = (chtype) COLOR_PAIR(1); wbkgdset(work, show_attr | ' '); } else { show_attr = A_STANDOUT; @@ -292,7 +292,7 @@ test_adds(int level) wmove(work, row, margin + 1); switch (ch) { case key_RECUR: - test_adds(level + 1); + recursive_test(level + 1); if (look) touchwin(look); @@ -512,7 +512,10 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) if (optind < argc) usage(); - test_adds(0); + recursive_test(0); endwin(); +#if NO_LEAKS + free(temp_buffer); +#endif ExitProgram(EXIT_SUCCESS); } |