ncurses 6.1 - patch 20180929

[ncurses.git] / test / testaddch.c

diff --git a/test/testaddch.c b/test/testaddch.c
index ddc6776f9d25a4df9e50466411030abcdb99c1f0..ccadab80f4a12d40ed6167b53801ccacdf9b27c3 100644 (file)
--- a/test/testaddch.c
+++ b/test/testaddch.c
@@ -1,8 +1,35 @@
+/****************************************************************************
+ * Copyright (c) 1998-2013,2014 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            *
+ * "Software"), to deal in the Software without restriction, including      *
+ * without limitation the rights to use, copy, modify, merge, publish,      *
+ * distribute, distribute with modifications, sublicense, and/or sell       *
+ * copies of the Software, and to permit persons to whom the Software is    *
+ * furnished to do so, subject to the following conditions:                 *
+ *                                                                          *
+ * The above copyright notice and this permission notice shall be included  *
+ * in all copies or substantial portions of the Software.                   *
+ *                                                                          *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
+ *                                                                          *
+ * Except as contained in this notice, the name(s) of the above copyright   *
+ * holders shall not be used in advertising or otherwise to promote the     *
+ * sale, use or other dealings in this Software without prior written       *
+ * authorization.                                                           *
+ ****************************************************************************/
 /*
  * This is an example written by Alexander V. Lukyanov <lav@yars.free.net>,
  * to demonstrate an inconsistency between ncurses and SVr4 curses.
  *
- * $Id: testaddch.c,v 1.5 2002/06/29 23:32:18 tom Exp $
+ * $Id: testaddch.c,v 1.12 2014/08/02 23:11:20 tom Exp $
  */
 #include <test.priv.h>
 
@@ -36,21 +63,21 @@ main(
     for (i = 0; i < 8; i++) {
        back = (i & 1) ? A_BOLD | 'B' : ' ';
        set = (i & 2) ? A_REVERSE : 0;
-       attr = (i & 4) ? COLOR_PAIR(4) : 0;
+       attr = (chtype) ((i & 4) ? COLOR_PAIR(4) : 0);
 
        bkgdset(back);
-       attrset(set);
+       (void) attrset(AttrArg(set, 0));
 
        attr_addstr("Test string with spaces ->   <-\n", attr);
     }
     addch('\n');
     for (i = 0; i < 8; i++) {
-       back = (i & 1) ? A_BOLD | 'B' | COLOR_PAIR(1) : ' ';
-       set = (i & 2) ? A_REVERSE | COLOR_PAIR(2) : 0;
-       attr = (i & 4) ? COLOR_PAIR(4) : 0;
+       back = (i & 1) ? (A_BOLD | 'B' | (chtype) COLOR_PAIR(1)) : ' ';
+       set = (i & 2) ? (A_REVERSE | (chtype) COLOR_PAIR(2)) : 0;
+       attr = (chtype) ((i & 4) ? (chtype) COLOR_PAIR(4) : 0);
 
        bkgdset(back);
-       attrset(set);
+       (void) attrset(AttrArg(set, 0));
 
        attr_addstr("Test string with spaces ->   <-\n", attr);
     }