Variable scope reduction as recommended by cppcheck

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

4 files changed, 63 insertions, 75 deletions

diff --git a/dsimple.c b/dsimple.c
index e5cced3..8882822 100644
--- a/dsimple.c
+++ b/dsimple.c
@@ -71,9 +71,8 @@ Get_Display_Name(int *pargc,    /* MODIFIED */
     int argc = *pargc;
     char **pargv = argv + 1;
     char *displayname = NULL;
-    int i;
 
-    for (i = 1; i < argc; i++) {
+    for (int i = 1; i < argc; i++) {
         char *arg = argv[i];
 
         if (!strcmp(arg, "-display") || !strcmp(arg, "-d")) {
diff --git a/list.c b/list.c
index 3cf633e..85e4c21 100644
--- a/list.c
+++ b/list.c
@@ -172,12 +172,9 @@ delete_from_list(list_ptr lp, void *item)
 void
 delete_list(list_ptr lp, int free_items)
 {
-    list_ptr del_node;
-    void *item;
-
     while (lp->next) {
-        del_node = lp->next;
-        item = del_node->ptr.item;
+        list_ptr del_node = lp->next;
+        void *item = del_node->ptr.item;
         lp->next = del_node->next;
         free(del_node);
         if (free_items) {
@@ -189,13 +186,9 @@ delete_list(list_ptr lp, int free_items)
 void
 delete_list_destroying(list_ptr lp, void destructor(void *item))
 {
-    list_ptr del_node;
-
-    void *item;
-
     while (lp->next) {
-        del_node = lp->next;
-        item = del_node->ptr.item;
+        list_ptr del_node = lp->next;
+        void *item = del_node->ptr.item;
         lp->next = del_node->next;
         free(del_node);
         if (destructor) {
diff --git a/multiVis.c b/multiVis.c
index 5fb9fca..1aa57b3 100644
--- a/multiVis.c
+++ b/multiVis.c
@@ -160,22 +160,22 @@ static void
 QueryColorMap(Display *disp, Colormap src_cmap, Visual *src_vis,
               XColor **src_colors, int *rShift, int *gShift, int *bShift)
 {
-    unsigned int ncolors, i;
-    unsigned long redMask, greenMask, blueMask;
-    int redShift, greenShift, blueShift;
+    unsigned int ncolors;
     XColor *colors;
 
     ncolors = (unsigned) src_vis->map_entries;
     *src_colors = colors = calloc(ncolors, sizeof(XColor));
 
     if (src_vis->class != TrueColor && src_vis->class != DirectColor) {
-        for (i = 0; i < ncolors; i++) {
+        for (unsigned int i = 0; i < ncolors; i++) {
             colors[i].pixel = i;
             colors[i].pad = 0;
             colors[i].flags = DoRed | DoGreen | DoBlue;
         }
     }
     else { /** src is decomposed rgb ***/
+        unsigned long redMask, greenMask, blueMask;
+        int redShift, greenShift, blueShift;
 
         /* Get the X colormap */
         redMask = src_vis->red_mask;
@@ -199,7 +199,7 @@ QueryColorMap(Display *disp, Colormap src_cmap, Visual *src_vis,
         *rShift = redShift;
         *gShift = greenShift;
         *bShift = blueShift;
-        for (i = 0; i < ncolors; i++) {
+        for (unsigned int i = 0; i < ncolors; i++) {
             if (i <= redMask)
                 colors[i].pixel = (i << redShift);
             if (i <= greenMask)
@@ -277,7 +277,6 @@ TransferImage(Display *disp, XImage *reg_image,
               image_region_type *reg, XImage *target_image,
               int dst_x, int dst_y)
 {
-    int i, j, old_pixel, new_pixel, red_ind, green_ind, blue_ind;
     XColor *colors;
     int rShift = 0, gShift = 0, bShift = 0;
 
@@ -286,15 +285,15 @@ TransferImage(Display *disp, XImage *reg_image,
 
     switch (reg->vis->class) {
     case TrueColor:
-        for (i = 0; i < srch; i++) {
-            for (j = 0; j < srcw; j++) {
-                old_pixel = XGetPixel(reg_image, j, i);
+        for (int i = 0; i < srch; i++) {
+            for (int j = 0; j < srcw; j++) {
+                int old_pixel = XGetPixel(reg_image, j, i);
+                int new_pixel;
 
                 if (reg->vis->map_entries == 16) {
-
-                    red_ind = (old_pixel & reg->vis->red_mask) >> rShift;
-                    green_ind = (old_pixel & reg->vis->green_mask) >> gShift;
-                    blue_ind = (old_pixel & reg->vis->blue_mask) >> bShift;
+                    int red_ind = (old_pixel & reg->vis->red_mask) >> rShift;
+                    int green_ind = (old_pixel & reg->vis->green_mask) >> gShift;
+                    int blue_ind = (old_pixel & reg->vis->blue_mask) >> bShift;
 
                     new_pixel = (
                         ((colors[red_ind].red >> 8) << RED_SHIFT) |
@@ -311,15 +310,15 @@ TransferImage(Display *disp, XImage *reg_image,
         }
         break;
     case DirectColor:
-        for (i = 0; i < srch; i++) {
+        for (int i = 0; i < srch; i++) {
 
-            for (j = 0; j < srcw; j++) {
-                old_pixel = XGetPixel(reg_image, j, i);
-                red_ind = (old_pixel & reg->vis->red_mask) >> rShift;
-                green_ind = (old_pixel & reg->vis->green_mask) >> gShift;
-                blue_ind = (old_pixel & reg->vis->blue_mask) >> bShift;
+            for (int j = 0; j < srcw; j++) {
+                int old_pixel = XGetPixel(reg_image, j, i);
+                int red_ind = (old_pixel & reg->vis->red_mask) >> rShift;
+                int green_ind = (old_pixel & reg->vis->green_mask) >> gShift;
+                int blue_ind = (old_pixel & reg->vis->blue_mask) >> bShift;
 
-                new_pixel = (
+                int new_pixel = (
                     ((colors[red_ind].red >> 8) << RED_SHIFT) |
                     ((colors[green_ind].green >> 8) << GREEN_SHIFT) |
                     ((colors[blue_ind].blue >> 8) << BLUE_SHIFT)
@@ -330,11 +329,11 @@ TransferImage(Display *disp, XImage *reg_image,
         }
         break;
     default:
-        for (i = 0; i < srch; i++) {
-            for (j = 0; j < srcw; j++) {
-                old_pixel = XGetPixel(reg_image, j, i);
+        for (int i = 0; i < srch; i++) {
+            for (int j = 0; j < srcw; j++) {
+                int old_pixel = XGetPixel(reg_image, j, i);
 
-                new_pixel = (
+                int new_pixel = (
                     ((colors[old_pixel].red >> 8) << RED_SHIFT) |
                     ((colors[old_pixel].green >> 8) << GREEN_SHIFT) |
                     ((colors[old_pixel].blue >> 8) << BLUE_SHIFT)
@@ -353,12 +352,9 @@ ReadRegionsInList(Display *disp, Visual *fakeVis, int depth, int format,
                   XRectangle bbox,    /* bounding box of grabbed area */
                   list_ptr regions)   /* list of regions to read from */
 {
-    image_region_type *reg;
-    int dst_x, dst_y;           /* where in pixmap to write (UL) */
-    int datalen, diff;
+    int datalen;
 
     XImage *reg_image, *ximage;
-    int srcRect_x, srcRect_y, srcRect_width, srcRect_height;
     int bytes_per_line;
 
     ximage = XCreateImage(disp, fakeVis, depth, format, 0, NULL, width, height,
@@ -373,27 +369,28 @@ ReadRegionsInList(Display *disp, Visual *fakeVis, int depth, int format,
 
     ximage->bits_per_pixel = depth; /** Valid only if format is ZPixmap ***/
 
-    for (reg = (image_region_type *) first_in_list(regions); reg;
-         reg = (image_region_type *) next_in_list(regions)) {
-        int rect;
-        struct my_XRegion *vis_reg;
+    for (image_region_type *reg = (image_region_type *) first_in_list(regions);
+         reg; reg = (image_region_type *) next_in_list(regions)) {
 
-        vis_reg = (struct my_XRegion *) (reg->visible_region);
-        for (rect = 0; rect < vis_reg->numRects; rect++) {
+        struct my_XRegion *vis_reg = (struct my_XRegion *) (reg->visible_region);
+
+        for (int rect = 0; rect < vis_reg->numRects; rect++) {
 /** ------------------------------------------------------------------------
 	Intersect bbox with visible part of region giving src rect & output
 	location.  Width is the min right side minus the max left side.
 	Similar for height.  Offset src rect so x,y are relative to
 	origin of win, not the root-relative visible rect of win.
  ------------------------------------------------------------------------ **/
-            srcRect_width =
+            int srcRect_width =
                 MIN(vis_reg->rects[rect].x2, bbox.width + bbox.x) -
                 MAX(vis_reg->rects[rect].x1, bbox.x);
-            srcRect_height =
+            int srcRect_height =
                 MIN(vis_reg->rects[rect].y2, bbox.height + bbox.y) -
                 MAX(vis_reg->rects[rect].y1, bbox.y);
+            int srcRect_x, srcRect_y;
+            int dst_x, dst_y;           /* where in pixmap to write (UL) */
 
-            diff = bbox.x - vis_reg->rects[rect].x1;
+            int diff = bbox.x - vis_reg->rects[rect].x1;
             srcRect_x = MAX(0,diff) +
                 (vis_reg->rects[rect].x1 - reg->x_rootrel - reg->border);
             dst_x = MAX(0, -diff);
@@ -439,17 +436,12 @@ ReadAreaToImage(Display *disp,
     int depth;
     XImage *ximage, *ximage_ipm = NULL;
     Visual fakeVis;
-    int x1, y1;
     XImage *image;
 
 #if 0
     unsigned char *pmData, *ipmData;
 #endif
     int transparentColor, transparentType;
-    int srcRect_x, srcRect_y, srcRect_width, srcRect_height;
-    int diff;
-    int dst_x, dst_y;           /* where in pixmap to write (UL) */
-    int pixel;
 
     bbox.x = x;                 /* init X rect for bounding box */
     bbox.y = y;
@@ -482,6 +474,9 @@ ReadAreaToImage(Display *disp,
 
         if (src_in_overlay(reg, numOverlayVisuals, pOverlayVisuals,
                            &transparentColor, &transparentType)) {
+            int srcRect_x, srcRect_y, srcRect_width, srcRect_height;
+            int diff;
+            int dst_x, dst_y;           /* where in pixmap to write (UL) */
             int test = 0;
 
             srcRect_width =
@@ -508,10 +503,11 @@ ReadAreaToImage(Display *disp,
                 unsigned char *pixel_ptr;
                 unsigned char *start_of_line = (unsigned char *) image->data;
 
-                for (y1 = 0; y1 < srcRect_height; y1++) {
+                for (int y1 = 0; y1 < srcRect_height; y1++) {
                     pixel_ptr = start_of_line;
-                    for (x1 = 0; x1 < srcRect_width; x1++) {
+                    for (int x1 = 0; x1 < srcRect_width; x1++) {
                         if (*pixel_ptr++ == transparentColor) {
+                            int pixel;
 #if 0
                             *pmData++ = *ipmData++;
                             *pmData++ = *ipmData++;
@@ -537,11 +533,12 @@ ReadAreaToImage(Display *disp,
             }
             else {
                 if (transparentType == TransparentPixel) {
-                    for (y1 = 0; y1 < srcRect_height; y1++) {
-                        for (x1 = 0; x1 < srcRect_width; x1++) {
+                    for (int y1 = 0; y1 < srcRect_height; y1++) {
+                        for (int x1 = 0; x1 < srcRect_width; x1++) {
                             int pixel_value = XGetPixel(image, x1, y1);
 
                             if (pixel_value == transparentColor) {
+                                int pixel;
 #if 0
                                 *pmData++ = *ipmData++;
                                 *pmData++ = *ipmData++;
@@ -566,11 +563,12 @@ ReadAreaToImage(Display *disp,
                     }
                 }
                 else {
-                    for (y1 = 0; y1 < srcRect_height; y1++) {
-                        for (x1 = 0; x1 < srcRect_width; x1++) {
+                    for (int y1 = 0; y1 < srcRect_height; y1++) {
+                        for (int x1 = 0; x1 < srcRect_width; x1++) {
                             int pixel_value = XGetPixel(image, x1, y1);
 
                             if (pixel_value & transparentColor) {
+                                int pixel;
 #if 0
                                 *pmData++ = *ipmData++;
                                 *pmData++ = *ipmData++;
@@ -628,10 +626,8 @@ make_src_list(Display *disp, list_ptr image_wins,
 {
     XWindowAttributes child_attrs;
     Window root, parent, *child;        /* variables for XQueryTree() */
-    Window *save_child_list;            /* variables for XQueryTree() */
     unsigned int nchild;                /* variables for XQueryTree() */
     XRectangle child_clip;              /* vis part of child */
-    int curr_clipX, curr_clipY, curr_clipRt, curr_clipBt;
 
     /* check that win is mapped & not outside bounding box */
     if (curr_attrs->map_state == IsViewable &&
@@ -641,6 +637,9 @@ make_src_list(Display *disp, list_ptr image_wins,
           (int) (pclip->x + pclip->width) <= bbox->x ||
           (int) (pclip->y + pclip->height) <= bbox->y)) {
 
+        Window *save_child_list;
+        int curr_clipX, curr_clipY, curr_clipRt, curr_clipBt;
+
         XQueryTree(disp, curr, &root, &parent, &child, &nchild);
         save_child_list = child;   /* so we can free list when we're done */
         add_window_to_list(image_wins, curr, x_rootrel, y_rootrel,
@@ -1020,15 +1019,13 @@ GetXVisualInfo(   /* Which X server (aka "display"). */
     XVisualInfo getVisInfo;     /* Parameters of XGetVisualInfo */
     int mask;
     XVisualInfo *pVis, **pIVis; /* Faster, local copies */
-    OverlayInfo *pOVis;
     OverlayVisualPropertyRec *pOOldVis;
-    int nVisuals, nOVisuals;
+    int nVisuals;
     Atom overlayVisualsAtom;    /* Parameters for XGetWindowProperty */
     Atom actualType;
     unsigned long numLongs, bytesAfter;
     int actualFormat;
     int nImageVisualsAlloced;   /* Values to process the XVisualInfo */
-    int imageVisual;            /* array */
 
     /* First, get the list of visuals for this screen. */
     getVisInfo.screen = screen;
@@ -1076,9 +1073,10 @@ GetXVisualInfo(   /* Which X server (aka "display"). */
     nImageVisualsAlloced = 1;
     pIVis = *pImageVisuals = malloc(sizeof(XVisualInfo *));
     while (--nVisuals >= 0) {
-        nOVisuals = *numOverlayVisuals;
-        pOVis = *pOverlayVisuals;
-        imageVisual = True;
+        int nOVisuals = *numOverlayVisuals;
+        OverlayInfo *pOVis = *pOverlayVisuals;
+        int imageVisual = True;
+
         while (--nOVisuals >= 0) {
             pOOldVis = (OverlayVisualPropertyRec *) pOVis;
             if (pVis->visualid == pOOldVis->visualID) {
diff --git a/xwd.c b/xwd.c
index c1548d6..0ea4168 100644
--- a/xwd.c
+++ b/xwd.c
@@ -654,11 +654,10 @@ Get_XColors(XWindowAttributes *win_info, XColor **colors)
 void
 _swapshort(register char *bp, register unsigned n)
 {
-    register char c;
-    register char *ep = bp + n;
+    char *ep = bp + n;
 
     while (bp < ep) {
-        c = *bp;
+        char c = *bp;
         *bp = *(bp + 1);
         bp++;
         *bp++ = c;
@@ -668,11 +667,10 @@ _swapshort(register char *bp, register unsigned n)
 void
 _swaplong(register char *bp, register unsigned n)
 {
-    register char c;
-    register char *ep = bp + n;
+    char *ep = bp + n;
 
     while (bp < ep) {
-        c = bp[3];
+        char c = bp[3];
         bp[3] = bp[0];
         bp[0] = c;
         c = bp[2];