Revert "Avoid shadowing variables."

This reverts commit 3919044bd7d3bcb85ce3425a43b8889a248a7542.
Breaks programs such as xcalc & xlogo on multiple platforms.

8 files changed, 28 insertions, 26 deletions

diff --git a/src/Composite.c b/src/Composite.c
index ef77e53..29893d8 100644
--- a/src/Composite.c
+++ b/src/Composite.c
@@ -175,17 +175,17 @@ static void InheritAllowsChangeManagedSet(
 }
 
 static void CompositeClassPartInitialize(
-	WidgetClass cwidgetClass)
+	WidgetClass widgetClass)
 {
     register CompositePartPtr wcPtr;
     register CompositePartPtr superPtr = NULL;
 
     wcPtr = (CompositePartPtr)
-	&(((CompositeWidgetClass)cwidgetClass)->composite_class);
+	&(((CompositeWidgetClass)widgetClass)->composite_class);
 
-    if (cwidgetClass != compositeWidgetClass)
+    if (widgetClass != compositeWidgetClass)
 	/* don't compute possible bogus pointer */
-	superPtr = (CompositePartPtr)&(((CompositeWidgetClass)cwidgetClass
+	superPtr = (CompositePartPtr)&(((CompositeWidgetClass)widgetClass
 			->core_class.superclass)->composite_class);
 
     /* We don't need to check for null super since we'll get to composite
@@ -200,7 +200,7 @@ static void CompositeClassPartInitialize(
     if (wcPtr->change_managed == XtInheritChangeManaged) {
 	wcPtr->change_managed =
 		superPtr->change_managed;
-	InheritAllowsChangeManagedSet(cwidgetClass);
+	InheritAllowsChangeManagedSet(widgetClass);
     }
 
     if (wcPtr->insert_child == XtInheritInsertChild) {
diff --git a/src/Convert.c b/src/Convert.c
index bbb8ff1..cea8fd3 100644
--- a/src/Convert.c
+++ b/src/Convert.c
@@ -812,7 +812,7 @@ CallConverter(
 	unsigned int supplied_size = to->size;
 	Boolean do_ref = cP->do_ref_count && cache_ref_return;
 	Boolean do_free = False;
-	retval =
+	Boolean retval =
 	    (*(XtTypeConverter)converter)(dpy, args, &num_args, from, to, &closure);
 
 	if (retval == False && supplied_size < to->size) {
diff --git a/src/Geometry.c b/src/Geometry.c
index 6f95d44..d64c8e2 100644
--- a/src/Geometry.c
+++ b/src/Geometry.c
@@ -726,10 +726,10 @@ void XtTranslateCoords(
                 "Widget has no shell ancestor",
 		(String *)NULL, (Cardinal *)NULL);
     else {
-	Position px, py;
-	_XtShellGetCoordinates( w, &px, &py );
-	*rootx += px + w->core.border_width;
-	*rooty += py + w->core.border_width;
+	Position x, y;
+	_XtShellGetCoordinates( w, &x, &y );
+	*rootx += x + w->core.border_width;
+	*rooty += y + w->core.border_width;
     }
     UNLOCK_APP(app);
 }
diff --git a/src/Intrinsic.c b/src/Intrinsic.c
index 7783050..29bf716 100644
--- a/src/Intrinsic.c
+++ b/src/Intrinsic.c
@@ -88,7 +88,7 @@ String XtCXtToolkitError = "XtToolkitError";
 
 Boolean XtIsSubclass(
     Widget    widget,
-    WidgetClass xwidgetClass)
+    WidgetClass widgetClass)
 {
     register WidgetClass w;
     Boolean retval = FALSE;
@@ -97,7 +97,7 @@ Boolean XtIsSubclass(
     LOCK_APP(app);
     LOCK_PROCESS;
     for (w = widget->core.widget_class; w != NULL; w = w->core_class.superclass)
-	if (w == xwidgetClass) {
+	if (w == widgetClass) {
 	    retval = TRUE;
 	    break;
 	}
@@ -125,7 +125,7 @@ Boolean _XtCheckSubclassFlag(
 
 Boolean _XtIsSubclassOf(
     Widget object,
-    WidgetClass xwidgetClass,
+    WidgetClass widgetClass,
     WidgetClass superClass,
     _XtXtEnum flag)
 {
diff --git a/src/NextEvent.c b/src/NextEvent.c
index c6fbcf1..4f2dcfb 100644
--- a/src/NextEvent.c
+++ b/src/NextEvent.c
@@ -272,6 +272,7 @@ static void InitFds (
 	wf->fdlistlen = wf->num_dpys = 0;
 
     if (!ignoreInputs && app->input_list != NULL) {
+	int ii;
 	for (ii = 0; ii < (int) app->input_max; ii++)
 	    if (app->input_list[ii] != NULL)
 		wf->fdlistlen++;
diff --git a/src/Object.c b/src/Object.c
index 3626aba..ae1ac75 100644
--- a/src/Object.c
+++ b/src/Object.c
@@ -130,7 +130,7 @@ externaldef(objectClass) WidgetClass objectClass
 
 
 static void ConstructCallbackOffsets(
-    WidgetClass cwidgetClass)
+    WidgetClass widgetClass)
 {
     static XrmQuark QCallback = NULLQUARK;
     register int i;
@@ -138,7 +138,7 @@ static void ConstructCallbackOffsets(
     register CallbackTable newTable;
     register CallbackTable superTable;
     register XrmResourceList resourceList;
-    ObjectClass cobjectClass = (ObjectClass)cwidgetClass;
+    ObjectClass objectClass = (ObjectClass)widgetClass;
 
     /*
       This function builds an array of pointers to the resource
@@ -150,9 +150,9 @@ static void ConstructCallbackOffsets(
     if (QCallback == NULLQUARK)
 	QCallback = XrmPermStringToQuark(XtRCallback);
 
-    if (cobjectClass->object_class.superclass != NULL) {
+    if (objectClass->object_class.superclass != NULL) {
 	superTable = (CallbackTable)
-	    ((ObjectClass) cobjectClass->object_class.superclass)->
+	    ((ObjectClass) objectClass->object_class.superclass)->
 		object_class.callback_private;
 	tableSize = (int)(long) superTable[0];
     } else {
@@ -161,8 +161,8 @@ static void ConstructCallbackOffsets(
     }
 
     /* Count the number of callbacks */
-    resourceList = (XrmResourceList) cobjectClass->object_class.resources;
-    for (i = cobjectClass->object_class.num_resources; --i >= 0; resourceList++)
+    resourceList = (XrmResourceList) objectClass->object_class.resources;
+    for (i = objectClass->object_class.num_resources; --i >= 0; resourceList++)
 	if (resourceList->xrm_type == QCallback)
 	    tableSize++;
 
@@ -178,7 +178,7 @@ static void ConstructCallbackOffsets(
 
     if (superTable)
 	tableSize -= (int)(long) superTable[0];
-    resourceList = (XrmResourceList) cobjectClass->object_class.resources;
+    resourceList = (XrmResourceList) objectClass->object_class.resources;
     for (i=1; tableSize > 0; resourceList++)
 	if (resourceList->xrm_type == QCallback) {
 	    newTable[i++] = resourceList;
@@ -190,7 +190,7 @@ static void ConstructCallbackOffsets(
 	    --tableSize >= 0; superTable++)
 	    newTable[i++] = *superTable;
 
-    cobjectClass->object_class.callback_private = (XtPointer) newTable;
+    objectClass->object_class.callback_private = (XtPointer) newTable;
 }
 
 static void InheritObjectExtensionMethods(
diff --git a/src/Selection.c b/src/Selection.c
index 2b794d7..4f59d70 100644
--- a/src/Selection.c
+++ b/src/Selection.c
@@ -2079,6 +2079,7 @@ void XtSendSelectionRequest(
 	Boolean ins[PREALLOCED];
 	Atom *props;
 	Atom p[PREALLOCED];
+	int i = 0;
 	int j = 0;
 
 	/* Allocate */
diff --git a/src/TMaction.c b/src/TMaction.c
index e4a5864..7af75ad 100644
--- a/src/TMaction.c
+++ b/src/TMaction.c
@@ -1041,14 +1041,14 @@ void XtCallActionProc(
     }
 
     {
-	String sparams[2];
-	Cardinal num_sparams = 2;
-	sparams[0] = (String)action;
-	sparams[1] = XtName(widget);
+	String params[2];
+	Cardinal num_params = 2;
+	params[0] = (String)action;
+	params[1] = XtName(widget);
 	XtAppWarningMsg(app,
 			"noActionProc", "xtCallActionProc", XtCXtToolkitError,
 			"No action proc named \"%s\" is registered for widget \"%s\"",
-			sparams, &num_sparams
+			params, &num_params
 			);
     }
     UNLOCK_APP(app);