ncurses 5.9 - patch 20140426

[ncurses.git] / progs / tic.c

diff --git a/progs/tic.c b/progs/tic.c
index 6ee1766604343a6f7b9b5e068bcc67b0622b34f4..eeb209a7f4bd0476f352848c4f45c73bb5e003dd 100644 (file)
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -46,7 +46,7 @@
 #include <hashed_db.h>
 #include <transform.h>
 
-MODULE_ID("$Id: tic.c,v 1.188 2013/08/24 21:48:21 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.190 2014/03/29 19:45:18 tom Exp $")
 
 #define STDIN_NAME "<stdin>"
 
@@ -1114,6 +1114,17 @@ check_colors(TERMTYPE *tp)
        if (!VALID_STRING(orig_pair) && !VALID_STRING(orig_colors))
            _nc_warning("expected either op/oc string for resetting colors");
     }
+    if (can_change) {
+       if (!VALID_STRING(initialize_pair) &&
+           !VALID_STRING(initialize_color)) {
+           _nc_warning("expected initc or initp because ccc is given");
+       }
+    } else {
+       if (VALID_STRING(initialize_pair) ||
+           VALID_STRING(initialize_color)) {
+           _nc_warning("expected ccc because initc is given");
+       }
+    }
 }
 
 static char
@@ -1140,7 +1151,7 @@ keypad_index(const char *string)
     long result = -1;
 
     if ((ch = keypad_final(string)) != '\0') {
-       test = strchr(list, ch);
+       test = (strchr) (list, ch);
        if (test != 0)
            result = (long) (test - list);
     }