Variable scope reduction as recommended by cppcheck

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

2 files changed, 38 insertions, 35 deletions

diff --git a/dsimple.c b/dsimple.c
index 0bb2ab8..b5aefbc 100644
--- a/dsimple.c
+++ b/dsimple.c
@@ -108,7 +108,7 @@ void Setup_Display_And_Screen (
     xcb_connection_t **dpy,	/* MODIFIED */
     xcb_screen_t **screen)	/* MODIFIED */
 {
-    int screen_number, i, err;
+    int screen_number, err;
 
     /* Open Display */
     *dpy = xcb_connect (display_name, &screen_number);
@@ -141,7 +141,7 @@ void Setup_Display_And_Screen (
 			 screen_number, screen_count-1 );
 	}
 
-	for (i = 0; i < screen_number; i++)
+	for (int i = 0; i < screen_number; i++)
 	    xcb_screen_next(&screen_iter);
 	*screen = screen_iter.data;
     }
@@ -178,7 +178,6 @@ xcb_window_t Select_Window(xcb_connection_t *dpy,
 			   int descend)
 {
     xcb_cursor_t cursor;
-    xcb_generic_event_t *event;
     xcb_window_t target_win = XCB_WINDOW_NONE;
     xcb_window_t root = screen->root;
     int buttons = 0;
@@ -202,6 +201,8 @@ xcb_window_t Select_Window(xcb_connection_t *dpy,
     /* Let the user select a window... */
     while ((target_win == XCB_WINDOW_NONE) || (buttons != 0)) {
 	/* allow one more event */
+	xcb_generic_event_t *event;
+
 	xcb_allow_events (dpy, XCB_ALLOW_SYNC_POINTER, XCB_TIME_CURRENT_TIME);
 	xcb_flush (dpy);
 	event = xcb_wait_for_event (dpy);
@@ -448,8 +449,6 @@ Print_X_Error (
     xcb_generic_error_t *err
     )
 {
-    char buffer[256] = "";
-
     if ((err == NULL) || (err->response_type != 0)) /* not an error */
 	return;
 
@@ -461,6 +460,8 @@ Print_X_Error (
     }
     else
     {
+	char buffer[256] = "";
+
 	switch (err->error_code)
 	{
 	    case XCB_REQUEST:
diff --git a/xwininfo.c b/xwininfo.c
index 89863b2..5a24ba8 100644
--- a/xwininfo.c
+++ b/xwininfo.c
@@ -343,11 +343,10 @@ scale_init (xcb_screen_t *scale_screen)
 static char *
 nscale (int n, int np, int nmm, char *nbuf, size_t nbufsize)
 {
-    int s;
     snprintf (nbuf, nbufsize, "%d", n);
 
     if (metric||english) {
-	s = strlcat (nbuf, " (", nbufsize);
+	int s = strlcat (nbuf, " (", nbufsize);
 
 	if (metric) {
 	    snprintf (nbuf+s, nbufsize-s, "%.2f mm%s",
@@ -356,13 +355,13 @@ nscale (int n, int np, int nmm, char *nbuf, size_t nbufsize)
 	if (english) {
 	    double inch_frac;
 	    Bool printed_anything = False;
-	    int mi, yar, ft, inr;
+	    int inr;
 
 	    inch_frac = ((double) n)*(nmm/25.4)/np;
 	    inr = (int)inch_frac;
 	    inch_frac -= (double)inr;
 	    if (inr >= MILE) {
-		mi = inr/MILE;
+		int mi = inr/MILE;
 		inr %= MILE;
 		s = strlen (nbuf);
 		snprintf (nbuf+s, nbufsize-s, "%d %s(?!?)",
@@ -370,7 +369,7 @@ nscale (int n, int np, int nmm, char *nbuf, size_t nbufsize)
 		printed_anything = True;
 	    }
 	    if (inr >= YARD) {
-		yar = inr/YARD;
+		int yar = inr/YARD;
 		inr %= YARD;
 		if (printed_anything)
 		    strlcat (nbuf, ", ", nbufsize);
@@ -380,7 +379,7 @@ nscale (int n, int np, int nmm, char *nbuf, size_t nbufsize)
 		printed_anything = True;
 	    }
 	    if (inr >= FOOT) {
-		ft = inr/FOOT;
+		int ft = inr/FOOT;
 		inr  %= FOOT;
 		if (printed_anything)
 		    strlcat (nbuf, ", ", nbufsize);
@@ -440,7 +439,6 @@ window_id_str (xcb_window_t id)
 int
 main (int argc, char **argv)
 {
-    register int i;
     int tree = 0, stats = 0, bits = 0, events = 0, wm = 0, size = 0, shape = 0;
     int frame = 0, children = 0;
     int use_root = 0;
@@ -461,7 +459,7 @@ main (int argc, char **argv)
     memset (w, 0, sizeof(struct wininfo));
 
     /* Handle our command line arguments */
-    for (i = 1; i < argc; i++) {
+    for (int i = 1; i < argc; i++) {
 	if (!strcmp (argv[i], "-help"))
 	    usage ();
 	if (!strcmp (argv[i], "-display") || !strcmp (argv[i], "-d")) {
@@ -745,9 +743,9 @@ wm_size_hints_reply (xcb_connection_t *wshr_dpy, xcb_get_property_cookie_t cooki
 static xcb_size_hints_t *
 fetch_normal_hints (struct wininfo *w, xcb_size_hints_t *hints_return)
 {
-    xcb_size_hints_t hints;
-
     if (!w->normal_hints) {
+	xcb_size_hints_t hints;
+
 	if (xcb_icccm_get_wm_normal_hints_reply (dpy, w->normal_hints_cookie,
 						 &hints, NULL)) {
 	    w->normal_hints = malloc (sizeof(xcb_size_hints_t));
@@ -764,7 +762,6 @@ fetch_normal_hints (struct wininfo *w, xcb_size_hints_t *hints_return)
 /*
  * Lookup: lookup a code in a table.
  */
-static char _lookup_buffer[100];
 
 static const char *
 LookupL (long code, const binding *table)
@@ -780,6 +777,8 @@ LookupL (long code, const binding *table)
     }
 
     if (name == NULL) {
+	static char _lookup_buffer[100];
+
 	snprintf (_lookup_buffer, sizeof(_lookup_buffer),
 		  "unknown (code = %ld. = 0x%lx)", code, code);
 	name = _lookup_buffer;
@@ -1280,7 +1279,6 @@ Display_Tree_Info (struct wininfo *w, int recurse)
 static void
 display_tree_info_1 (struct wininfo *w, int recurse, int level)
 {
-    int i, j;
     unsigned int num_children;
     xcb_query_tree_reply_t *tree;
 
@@ -1311,7 +1309,7 @@ display_tree_info_1 (struct wininfo *w, int recurse, int level)
 
     if (level == 0  ||  num_children > 0) {
 	printf ("     ");
-	for (j = 0; j < level; j++) printf ("   ");
+	for (int j = 0; j < level; j++) printf ("   ");
 	printf ("%d child%s%s\n", num_children, num_children == 1 ? "" : "ren",
 		num_children ? ":" : ".");
     }
@@ -1324,7 +1322,7 @@ display_tree_info_1 (struct wininfo *w, int recurse, int level)
 	if (children == NULL)
 	    Fatal_Error ("Failed to allocate memory in display_tree_info");
 
-	for (i = (int)num_children - 1; i >= 0; i--) {
+	for (int i = (int)num_children - 1; i >= 0; i--) {
 	    struct wininfo *cw = &children[i];
 
 	    cw->window = child_list[i];
@@ -1339,7 +1337,7 @@ display_tree_info_1 (struct wininfo *w, int recurse, int level)
 	}
 	xcb_flush (dpy);
 
-	for (i = (int)num_children - 1; i >= 0; i--) {
+	for (int i = (int)num_children - 1; i >= 0; i--) {
 	    struct wininfo *cw = &children[i];
 	    Bool got_wm_class = False;
 	    char *instance_name = NULL, *class_name = NULL;
@@ -1352,7 +1350,7 @@ display_tree_info_1 (struct wininfo *w, int recurse, int level)
 	    xcb_get_geometry_reply_t *geometry;
 
 	    printf ("     ");
-	    for (j = 0; j < level; j++) printf ("   ");
+	    for (int j = 0; j < level; j++) printf ("   ");
 	    Display_Window_Id (cw, False);
 	    printf (": (");
 
@@ -1660,8 +1658,6 @@ Display_WM_Info (struct wininfo *w)
 {
     xcb_icccm_wm_hints_t wmhints;
     long flags;
-    xcb_get_property_reply_t *prop;
-    int i;
 
     printf ("\n");
     if (!xcb_icccm_get_wm_hints_reply(dpy, w->hints_cookie, &wmhints, &err))
@@ -1698,6 +1694,8 @@ Display_WM_Info (struct wininfo *w)
 		Lookup (wmhints.initial_state, _state_hints));
 
     if (atom_net_wm_desktop) {
+	xcb_get_property_reply_t *prop;
+
 	prop = xcb_get_property_reply (dpy, w->wm_desktop_cookie, NULL);
 	if (prop && (prop->type != XCB_NONE)) {
 	    uint32_t *desktop = xcb_get_property_value (prop);
@@ -1711,6 +1709,8 @@ Display_WM_Info (struct wininfo *w)
     }
 
     if (atom_net_wm_window_type) {
+	xcb_get_property_reply_t *prop;
+
 	prop = xcb_get_property_reply (dpy, w->wm_window_type_cookie,
 				       NULL);
 	if (prop && (prop->type != XCB_NONE) && (prop->value_len > 0)) {
@@ -1719,7 +1719,7 @@ Display_WM_Info (struct wininfo *w)
 
 	    if (atom_count > 0) {
 		printf ("      Window type:\n");
-		for (i = 0; i < atom_count; i++)
+		for (int i = 0; i < atom_count; i++)
 		    Display_Atom_Name (atoms[i], "_NET_WM_WINDOW_TYPE_");
 	    }
 	}
@@ -1727,6 +1727,8 @@ Display_WM_Info (struct wininfo *w)
     }
 
     if (atom_net_wm_state) {
+	xcb_get_property_reply_t *prop;
+
 	prop = xcb_get_property_reply (dpy, w->wm_state_cookie, NULL);
 	if (prop && (prop->type != XCB_NONE) && (prop->value_len > 0)) {
 	    xcb_atom_t *atoms = xcb_get_property_value (prop);
@@ -1734,7 +1736,7 @@ Display_WM_Info (struct wininfo *w)
 
 	    if (atom_count > 0) {
 		printf ("      Window state:\n");
-		for (i = 0; i < atom_count; i++)
+		for (int i = 0; i < atom_count; i++)
 		    Display_Atom_Name (atoms[i], "_NET_WM_STATE_");
 	    }
 	}
@@ -1742,6 +1744,8 @@ Display_WM_Info (struct wininfo *w)
     }
 
     if (atom_net_wm_pid) {
+	xcb_get_property_reply_t *prop;
+
 	printf ("      Process id: ");
 	prop = xcb_get_property_reply (dpy, w->wm_pid_cookie, NULL);
 	if (prop && (prop->type == XCB_ATOM_CARDINAL)) {
@@ -1763,6 +1767,8 @@ Display_WM_Info (struct wininfo *w)
     }
 
     if (atom_net_frame_extents) {
+	xcb_get_property_reply_t *prop;
+
 	prop = xcb_get_property_reply (dpy, w->frame_extents_cookie, NULL);
 	if (prop && (prop->type == XCB_ATOM_CARDINAL)
 	    && (prop->value_len == 4)) {
@@ -1836,13 +1842,10 @@ static int
 is_valid_utf8 (const char *string, size_t len)
 {
     unsigned long codepoint;
-    int rem;
-    size_t i;
-    unsigned char c;
+    int rem = 0;
 
-    rem = 0;
-    for (i = 0; i < len; i++) {
-	c = (unsigned char) string[i];
+    for (size_t i = 0; i < len; i++) {
+	unsigned char c = (unsigned char) string[i];
 
 	/* Order of type check:
 	 *   - Single byte code point
@@ -1913,14 +1916,13 @@ print_utf8 (const char *prefix, const char *u8str, size_t length, const char *su
 	Bool done = True;
 	ICONV_CONST char *inp = (ICONV_CONST char *) u8str;
 	char convbuf[BUFSIZ];
-	int convres;
 
 	printf ("%s", prefix);
 	do {
 	    char *outp = convbuf;
 	    size_t outlen = sizeof(convbuf);
 
-	    convres = iconv (iconv_from_utf8, &inp, &inlen, &outp, &outlen);
+	    int convres = iconv (iconv_from_utf8, &inp, &inlen, &outp, &outlen);
 
 	    if ((convres == -1) && (errno == E2BIG)) {
 		done = False;
@@ -1953,7 +1955,7 @@ static char *
 get_friendly_name (const char *string, const char *prefix)
 {
     const char *name_start = string;
-    char *lowered_name, *n;
+    char *lowered_name;
     Bool first = True;
     size_t prefix_len = strlen (prefix);
 
@@ -1965,7 +1967,7 @@ get_friendly_name (const char *string, const char *prefix)
     if (lowered_name == NULL)
 	Fatal_Error ("Failed to allocate memory in get_friendly_name");
 
-    for (n = lowered_name ; *n != 0 ; n++) {
+    for (char *n = lowered_name ; *n != 0 ; n++) {
 	if (*n == '_') {
 	    *n = ' ';
 	    first = True;