ncurses 6.0 - patch 20170513

[ncurses.git] / test / testcurs.c

diff --git a/test/testcurs.c b/test/testcurs.c
index c1268981e051203c0b930011d31a92c753905402..7a44a2c642cdb80e4229322411449b63f863a6ff 100644 (file)
--- a/test/testcurs.c
+++ b/test/testcurs.c
@@ -6,7 +6,7 @@
  *  wrs(5/28/93) -- modified to be consistent (perform identically) with either
  *                  PDCurses or under Unix System V, R4
  *
  *  wrs(5/28/93) -- modified to be consistent (perform identically) with either
  *                  PDCurses or under Unix System V, R4
  *

- * $Id: testcurs.c,v 1.48 2013/05/18 22:05:06 tom Exp $
+ * $Id: testcurs.c,v 1.50 2015/07/05 00:11:10 tom Exp $

  */
 
 #include <test.priv.h>
  */
 
 #include <test.priv.h>


@@ -286,7 +286,7 @@ inputTest(WINDOW *win)
 #ifdef A_COLOR
     if (has_colors()) {
        init_pair(2, COLOR_WHITE, COLOR_RED);
 #ifdef A_COLOR
     if (has_colors()) {
        init_pair(2, COLOR_WHITE, COLOR_RED);

-       wbkgd(subWin, COLOR_PAIR(2) | A_BOLD);
+       wbkgd(subWin, (chtype) COLOR_PAIR(2) | A_BOLD);

     } else
        wbkgd(subWin, A_BOLD);
 #else
     } else
        wbkgd(subWin, A_BOLD);
 #else


@@ -437,7 +437,7 @@ inputTest(WINDOW *win)
            "%d %[][a-zA-Z]s",
            "%d %[^0-9]"
        };
            "%d %[][a-zA-Z]s",
            "%d %[^0-9]"
        };

-       const char *format = fmt[(unsigned) repeat % SIZEOF(fmt)];
+       char *format = strdup(fmt[(unsigned) repeat % SIZEOF(fmt)]);

 
        wclear(win);
        MvWAddStr(win, 3, 2, "The window should have moved");
 
        wclear(win);
        MvWAddStr(win, 3, 2, "The window should have moved");


@@ -453,12 +453,13 @@ inputTest(WINDOW *win)
        noraw();
        num = 0;
        *buffer = 0;
        noraw();
        num = 0;
        *buffer = 0;

-       answered = mvwscanw(win, 7, 6, strdup(format), &num, buffer);
+       answered = mvwscanw(win, 7, 6, format, &num, buffer);

        MvWPrintw(win, 8, 6,
                  "String: %s Number: %d (%d values read)",
                  buffer, num, answered);
        Continue(win);
        ++repeat;
        MvWPrintw(win, 8, 6,
                  "String: %s Number: %d (%d values read)",
                  buffer, num, answered);
        Continue(win);
        ++repeat;

+       free(format);

     } while (answered > 0);
 }
 
     } while (answered > 0);
 }