ncurses 6.0 - patch 20160910

[ncurses.git] / test / clip_printw.c

diff --git a/test/clip_printw.c b/test/clip_printw.c
index 6d6d590241ae2e5f301845eec5fe50cef6871103..7f575c9c3f3c16cb7ef79fc48d5c4816f7f328f2 100644 (file)
--- a/test/clip_printw.c
+++ b/test/clip_printw.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2008-2010,2012 Free Software Foundation, Inc.              *
+ * Copyright (c) 2008-2014,2016 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,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: clip_printw.c,v 1.9 2012/11/18 00:39:48 tom Exp $
+ * $Id: clip_printw.c,v 1.12 2016/09/10 21:21:44 tom Exp $
  *
  * demonstrate how to use printw without wrapping.
  */
@@ -331,13 +331,13 @@ test_clipping(WINDOW *win)
     do {
        switch (st.ch) {
        case '.':               /* change from current position */
-           (void) wattrset(win, (int) (st.attr | (chtype) COLOR_PAIR(st.pair)));
+           (void) wattrset(win, AttrArg(COLOR_PAIR(st.pair), st.attr));
            if (st.count > 0) {
                need = (unsigned) st.count + 1;
-               sprintf(fmt, "%%c%%%ds%%c", st.count);
+               _nc_SPRINTF(fmt, _nc_SLIMIT(sizeof(fmt)) "%%c%%%ds%%c", st.count);
            } else {
                need = (unsigned) getmaxx(win) - 1;
-               strcpy(fmt, "%c%s%c");
+               _nc_STRCPY(fmt, "%c%s%c", sizeof(fmt));
            }
            if ((buffer = typeMalloc(char, need + 1)) != 0) {
                for (j = 0; j < need; ++j) {