ncurses 6.0 - patch 20170408

[ncurses.git] / test / tclock.c

diff --git a/test/tclock.c b/test/tclock.c
index 24f33827b449a98692bac627214b9130fd6830aa..19a44a5fedea6b0792b57afad36349806362e463 100644 (file)
--- a/test/tclock.c
+++ b/test/tclock.c
@@ -1,4 +1,4 @@
-/* $Id: tclock.c,v 1.33 2013/09/28 21:52:34 tom Exp $ */
+/* $Id: tclock.c,v 1.35 2016/09/04 23:52:17 tom Exp $ */
 
 #include <test.priv.h>
 
@@ -69,7 +69,7 @@ dline(int pair, int from_x, int from_y, int x2, int y2, int ch)
     int d;
 
     if (has_colors())
-       (void) attrset((attr_t) COLOR_PAIR(pair));
+       (void) attrset(AttrArg(COLOR_PAIR(pair), 0));
 
     dx = x2 - from_x;
     dy = y2 - from_y;
@@ -175,7 +175,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
        sangle = (i + 1) * (2.0 * PI) / 12.0;
        sdx = A2X(sangle, sradius);
        sdy = A2Y(sangle, sradius);
-       sprintf(szChar, "%d", i + 1);
+       _nc_SPRINTF(szChar, _nc_SLIMIT(sizeof(szChar)) "%d", i + 1);
 
        MvAddStr(cy - sdy, cx + sdx, szChar);
     }
@@ -216,12 +216,12 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
        attroff(A_REVERSE);
 
        if (has_colors())
-           (void) attrset((attr_t) COLOR_PAIR(1));
+           (void) attrset(AttrArg(COLOR_PAIR(1), 0));
 
        dline(1, cx, cy, cx + sdx, cy - sdy, 'O');
 
        if (has_colors())
-           (void) attrset((attr_t) COLOR_PAIR(0));
+           (void) attrset(AttrArg(COLOR_PAIR(0), 0));
 
        text = ctime(&tim);
        MvPrintw(2, 0, "%.*s", (int) (strlen(text) - 1), text);