ncurses 6.2 - patch 20210327

[ncurses.git] / test / view.c

diff --git a/test/view.c b/test/view.c
index 6beadc265a8f1bae896e7f7a54e85414cff8c4f0..30a9c7ffddc8fb2fede6bc5803aaead2baee0766 100644 (file)
--- a/test/view.c
+++ b/test/view.c
@@ -52,7 +52,7 @@
  * scroll operation worked, and the refresh() code only had to do a
  * partial repaint.
  *
- * $Id: view.c,v 1.139 2021/03/20 16:04:20 tom Exp $
+ * $Id: view.c,v 1.140 2021/03/27 22:42:22 tom Exp $
  */
 
 #include <test.priv.h>
@@ -92,12 +92,10 @@ static int
 ch_len(NCURSES_CH_T *src)
 {
     int result = 0;
-#if USE_WIDEC_SUPPORT
-    int count;
-#endif
 
 #if USE_WIDEC_SUPPORT
     for (;;) {
+       int count;
        TEST_CCHAR(src, count, {
            int len = wcwidth(test_wch[0]);
            result += (len > 0) ? len : 1;
@@ -136,7 +134,6 @@ show_all(const char *tag)
     int i;
     int digits;
     char temp[BUFSIZ];
-    NCURSES_CH_T *s;
     time_t this_time;
 
     for (digits = 1, i = num_lines; i > 0; i /= 10) {
@@ -161,8 +158,10 @@ show_all(const char *tag)
 
     scrollok(stdscr, FALSE);   /* prevent screen from moving */
     for (i = 1; i < LINES; i++) {
+       NCURSES_CH_T *s;
        int len;
        int actual = (int) (lptr + i - vec_lines);
+
        if (actual > num_lines) {
            if (i < LINES - 1) {
                int y, x;
@@ -189,8 +188,11 @@ show_all(const char *tag)
             */
            {
                int j;
-               int width = 1, count;
+               int width = 1;
+
                for (j = actual = 0; j < shift; ++j) {
+                   int count;
+
                    TEST_CCHAR(s + j, count, {
                        width = wcwidth(test_wch[0]);
                    }