X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=progs%2Ftic.c;fp=progs%2Ftic.c;h=dd9d4e027454097dcf24887905000ee46124d8d1;hp=ae172ece9fc93f4f17617f3a381cbb5f8e818592;hb=5c90fc94a5ac426a5e51732720767d5f0041830d;hpb=349761f30e7fc0b4bf2718f7fc3da34e09ea6735 diff --git a/progs/tic.c b/progs/tic.c index ae172ece..dd9d4e02 100644 --- a/progs/tic.c +++ b/progs/tic.c @@ -49,7 +49,7 @@ #include #include -MODULE_ID("$Id: tic.c,v 1.286 2020/05/31 21:05:44 tom Exp $") +MODULE_ID("$Id: tic.c,v 1.287 2020/10/10 21:25:24 tom Exp $") #define STDIN_NAME "" @@ -2530,6 +2530,13 @@ similar_sgr(int num, char *a, char *b) return ((num != 0) || (*a == 0)); } +static void +check_tparm_err(int num) +{ + if (_nc_tparm_err) + _nc_warning("tparam error in sgr(%d): %s", num, sgr_names[num]); +} + static char * check_sgr(TERMTYPE2 *tp, char *zero, int num, char *cap, const char *name) { @@ -2560,8 +2567,7 @@ check_sgr(TERMTYPE2 *tp, char *zero, int num, char *cap, const char *name) } else if (PRESENT(cap)) { _nc_warning("sgr(%d) missing, but %s present", num, name); } - if (_nc_tparm_err) - _nc_warning("stack error in sgr(%d) string", num); + check_tparm_err(num); return test; } @@ -2995,8 +3001,7 @@ check_termtype(TERMTYPE2 *tp, bool literal) } else { zero = strdup(TIPARM_9(set_attributes, 0, 0, 0, 0, 0, 0, 0, 0, 0)); } - if (_nc_tparm_err) - _nc_warning("stack error in sgr(0) string"); + check_tparm_err(0); if (zero != 0) { CHECK_SGR(1, enter_standout_mode);