Unshadow some variables

2 files changed, 19 insertions, 20 deletions

diff --git a/generic/tkBind.c b/generic/tkBind.c
index 979d61e..ad59299 100644
--- a/generic/tkBind.c
+++ b/generic/tkBind.c
@@ -2152,7 +2152,7 @@ Tk_BindEvent(
     TkDisplay *dispPtr;
     TkDisplay *oldDispPtr;
     Event *curEvent;
-    TkWindow *winPtr = (TkWindow *) tkwin;
+    TkWindow *winPtr = (TkWindow *)tkwin;
     BindInfo *bindInfoPtr;
     Tcl_InterpState interpState;
     LookupTables *physTables;
@@ -2442,7 +2442,6 @@ Tk_BindEvent(
 		LookupTables *virtTables = &bindInfoPtr->virtualEventTable.lookupTables;
 		PatSeq *matchPtr = matchPtrArr[k];
 		PatSeq *mPtr;
-		PSList *psl[2];
 
 		/*
 		 * Note that virtual events cannot promote.
@@ -2745,11 +2744,11 @@ CompareModMasks(
 	assert(PSModMaskArr_Size(fstModMaskArr) == PSModMaskArr_Size(sndModMaskArr));
 
 	for (i = PSModMaskArr_Size(fstModMaskArr) - 1; i >= 0; --i) {
-	    unsigned fstModMask = *PSModMaskArr_Get(fstModMaskArr, i);
-	    unsigned sndModMask = *PSModMaskArr_Get(sndModMaskArr, i);
+	    unsigned fstiModMask = *PSModMaskArr_Get(fstModMaskArr, i);
+	    unsigned sndiModMask = *PSModMaskArr_Get(sndModMaskArr, i);
 
-	    if (IsSubsetOf(fstModMask, sndModMask)) { ++sndCount; }
-	    if (IsSubsetOf(sndModMask, fstModMask)) { ++fstCount; }
+	    if (IsSubsetOf(fstiModMask, sndiModMask)) { ++sndCount; }
+	    if (IsSubsetOf(sndiModMask, fstiModMask)) { ++fstCount; }
 	}
     }
 
diff --git a/generic/tkConfig.c b/generic/tkConfig.c
index 46338e2..65e28a6 100644
--- a/generic/tkConfig.c
+++ b/generic/tkConfig.c
@@ -1879,23 +1879,23 @@ GetObjectForOption(
     objPtr = NULL;
     switch (optionPtr->specPtr->type) {
     case TK_OPTION_BOOLEAN:
-	objPtr = Tcl_NewIntObj(*((int *) internalPtr));
+	objPtr = Tcl_NewIntObj(*((int *)internalPtr));
 	break;
     case TK_OPTION_INT:
-	objPtr = Tcl_NewIntObj(*((int *) internalPtr));
+	objPtr = Tcl_NewIntObj(*((int *)internalPtr));
 	break;
     case TK_OPTION_DOUBLE:
-	objPtr = Tcl_NewDoubleObj(*((double *) internalPtr));
+	objPtr = Tcl_NewDoubleObj(*((double *)internalPtr));
 	break;
     case TK_OPTION_STRING:
-	objPtr = Tcl_NewStringObj(*((char **) internalPtr), -1);
+	objPtr = Tcl_NewStringObj(*((char **)internalPtr), -1);
 	break;
     case TK_OPTION_STRING_TABLE:
 	objPtr = Tcl_NewStringObj(((char **) optionPtr->specPtr->clientData)[
 		*((int *) internalPtr)], -1);
 	break;
     case TK_OPTION_COLOR: {
-	XColor *colorPtr = *((XColor **) internalPtr);
+	XColor *colorPtr = *((XColor **)internalPtr);
 
 	if (colorPtr != NULL) {
 	    objPtr = Tcl_NewStringObj(Tk_NameOfColor(colorPtr), -1);
@@ -1903,7 +1903,7 @@ GetObjectForOption(
 	break;
     }
     case TK_OPTION_FONT: {
-	Tk_Font tkfont = *((Tk_Font *) internalPtr);
+	Tk_Font tkfont = *((Tk_Font *)internalPtr);
 
 	if (tkfont != NULL) {
 	    objPtr = Tcl_NewStringObj(Tk_NameOfFont(tkfont), -1);
@@ -1911,7 +1911,7 @@ GetObjectForOption(
 	break;
     }
     case TK_OPTION_STYLE: {
-	Tk_Style style = *((Tk_Style *) internalPtr);
+	Tk_Style style = *((Tk_Style *)internalPtr);
 
 	if (style != NULL) {
 	    objPtr = Tcl_NewStringObj(Tk_NameOfStyle(style), -1);
@@ -1919,7 +1919,7 @@ GetObjectForOption(
 	break;
     }
     case TK_OPTION_BITMAP: {
-	Pixmap pixmap = *((Pixmap *) internalPtr);
+	Pixmap pixmap = *((Pixmap *)internalPtr);
 
 	if (pixmap != None) {
 	    objPtr = Tcl_NewStringObj(
@@ -1928,7 +1928,7 @@ GetObjectForOption(
 	break;
     }
     case TK_OPTION_BORDER: {
-	Tk_3DBorder border = *((Tk_3DBorder *) internalPtr);
+	Tk_3DBorder border = *((Tk_3DBorder *)internalPtr);
 
 	if (border != NULL) {
 	    objPtr = Tcl_NewStringObj(Tk_NameOf3DBorder(border), -1);
@@ -1936,10 +1936,10 @@ GetObjectForOption(
 	break;
     }
     case TK_OPTION_RELIEF:
-	objPtr = Tcl_NewStringObj(Tk_NameOfRelief(*((int *) internalPtr)), -1);
+	objPtr = Tcl_NewStringObj(Tk_NameOfRelief(*((int *)internalPtr)), -1);
 	break;
     case TK_OPTION_CURSOR: {
-	Tk_Cursor cursor = *((Tk_Cursor *) internalPtr);
+	Tk_Cursor cursor = *((Tk_Cursor *)internalPtr);
 
 	if (cursor != NULL) {
 	    objPtr = Tcl_NewStringObj(
@@ -1949,17 +1949,17 @@ GetObjectForOption(
     }
     case TK_OPTION_JUSTIFY:
 	objPtr = Tcl_NewStringObj(Tk_NameOfJustify(
-		*((Tk_Justify *) internalPtr)), -1);
+		*((Tk_Justify *)internalPtr)), -1);
 	break;
     case TK_OPTION_ANCHOR:
 	objPtr = Tcl_NewStringObj(Tk_NameOfAnchor(
 		*((Tk_Anchor *) internalPtr)), -1);
 	break;
     case TK_OPTION_PIXELS:
-	objPtr = Tcl_NewIntObj(*((int *) internalPtr));
+	objPtr = Tcl_NewIntObj(*((int *)internalPtr));
 	break;
     case TK_OPTION_WINDOW: {
-	Tk_Window tkwin = *((Tk_Window *) internalPtr);
+	tkwin = *((Tk_Window *)internalPtr);
 
 	if (tkwin != NULL) {
 	    objPtr = Tcl_NewStringObj(Tk_PathName(tkwin), -1);