Further fixes for cppcheck nits (and some arguably significant issues) in the PDCursesMod core library.

Author: Bill-Gray

pdcurses/getstr.c

@@ -89,7 +89,7 @@ int wgetnstr(WINDOW *win, char *str, int n)
 
     return (int)PDC_wcstombs(str, wstr, n);
 #else
-    int ch, i, num, x, chars;
+    int i, num, x, chars;
     char *p;
     bool stop, oldecho, oldcbreak;
     int old_delayms;
@@ -120,7 +120,7 @@ int wgetnstr(WINDOW *win, char *str, int n)
 
     while (!stop)
     {
-        ch = wgetch(win);
+        int ch = wgetch(win);
 
         switch (ch)
         {

pdcurses/inchstr.c

@@ -62,7 +62,7 @@ inchstr
 
 int winchnstr(WINDOW *win, chtype *ch, int n)
 {
-    chtype *src;
+    const chtype *src;
     int i;
 
     PDC_LOG(("winchnstr() - called\n"));

pdcurses/initscr.c

@@ -409,7 +409,7 @@ void delscreen(SCREEN *sp)
 
 int resize_term(int nlines, int ncols)
 {
-    PANEL *panel_ptr = NULL;
+    const PANEL *panel_ptr = NULL;
 
     PDC_LOG(("resize_term() - called: nlines %d\n", nlines));
 

pdcurses/overlay.c

@@ -55,8 +55,7 @@ static int _copy_win(const WINDOW *src_w, WINDOW *dst_w, int src_tr,
                      int src_tc, int src_br, int src_bc, int dst_tr,
                      int dst_tc, bool _overlay)
 {
-    int col, line, y1, fc;
-    chtype *w1ptr, *w2ptr;
+    int col, line, y1;
 
     int lc = 0;
     int xdiff = src_bc - src_tc;
@@ -75,10 +74,10 @@ static int _copy_win(const WINDOW *src_w, WINDOW *dst_w, int src_tr,
 
     for (line = 0; line < ydiff; line++)
     {
-        w1ptr = src_w->_y[line + src_tr] + src_tc;
-        w2ptr = dst_w->_y[line + dst_tr] + dst_tc;
+        int fc = _NO_CHANGE;
+        const chtype *w1ptr = src_w->_y[line + src_tr] + src_tc;
+        chtype *w2ptr = dst_w->_y[line + dst_tr] + dst_tc;
 
-        fc = _NO_CHANGE;
 
         for (col = 0; col < xdiff; col++)
         {

pdcurses/refresh.c

@@ -93,7 +93,7 @@ int wnoutrefresh(WINDOW *win)
     {
         if (win->_firstch[i] != _NO_CHANGE && j >= 0)
         {
-            chtype *src = win->_y[i];
+            const chtype *src = win->_y[i];
             chtype *dest = curscr->_y[j] + begx;
 
             int first = win->_firstch[i]; /* first changed */
@@ -248,7 +248,7 @@ int doupdate(void)
         {
             int first, last;
 
-            chtype *src = curscr->_y[y];
+            const chtype *src = curscr->_y[y];
             chtype *dest = SP->lastscr->_y[y];
 
             if (clearall)

pdcurses/scroll.c

@@ -44,7 +44,8 @@ scroll
 int PDC_wscrl(WINDOW *win, const int top, const int bottom, int n)
 {
     int start, end, n_lines;
-    chtype blank, *tptr, *endptr;
+    chtype blank, *tptr;
+    const chtype *endptr;
 
     /* Check if window scrolls. Valid for window AND pad */
 

pdcurses/slk.c

@@ -217,10 +217,10 @@ static void _drawone(int num)
 
 static void _redraw(void)
 {
-    int i;
-
     if( !hidden)
     {
+        int i;
+
         for (i = 0; i < labels; ++i)
             _drawone(i);
         if (label_fmt < 0)
@@ -279,7 +279,7 @@ int slk_set(int labnum, const char *label, int justify)
 
         /* Copy it */
 
-        for (i = 0; label[i] && i < MAX_LABEL_LENGTH - 1; i++)
+        for (i = 0; i < MAX_LABEL_LENGTH && label[i]; i++)
             slk[labnum].label[i] = label[i];
 
         /* Drop trailing spaces */

pdcurses/touch.c

@@ -208,15 +208,17 @@ bool is_linetouched(WINDOW *win, int line)
 
 bool is_wintouched(WINDOW *win)
 {
-    int i;
-
     PDC_LOG(("is_wintouched() - called: win=%p\n", win));
 
     assert( win);
     if (win)
+    {
+        int i;
+
         for (i = 0; i < win->_maxy; i++)
             if (win->_firstch[i] != _NO_CHANGE)
                 return TRUE;
+    }
 
     return FALSE;
 }

pdcurses/window.c

@@ -527,7 +527,6 @@ WINDOW *dupwin(WINDOW *win)
     new_win->_pary = win->_pary;
     new_win->_parent = win->_parent;
     new_win->_bkgd = win->_bkgd;
-    new_win->_flags = win->_flags;
     PDC_add_window_to_list( new_win);
 
     return new_win;