diff options
| author | Thomas Klausner <wiz@NetBSD.org> | 2013-06-25 23:02:46 +0200 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-07-09 23:20:13 -0700 |
| commit | 3919044bd7d3bcb85ce3425a43b8889a248a7542 (patch) | |
| tree | 7c988eee011ec632c9ebbf4fc7ae61033c42cce6 /src/Object.c | |
| parent | d395f487e659ee1091eb60c89c551ba1b61dfe51 (diff) | |
| download | xorg-lib-libXt-3919044bd7d3bcb85ce3425a43b8889a248a7542.tar.gz | |
Avoid shadowing variables.
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'src/Object.c')
| -rw-r--r-- | src/Object.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/Object.c b/src/Object.c index ae1ac75..3626aba 100644 --- a/src/Object.c +++ b/src/Object.c @@ -130,7 +130,7 @@ externaldef(objectClass) WidgetClass objectClass static void ConstructCallbackOffsets( - WidgetClass widgetClass) + WidgetClass cwidgetClass) { static XrmQuark QCallback = NULLQUARK; register int i; @@ -138,7 +138,7 @@ static void ConstructCallbackOffsets( register CallbackTable newTable; register CallbackTable superTable; register XrmResourceList resourceList; - ObjectClass objectClass = (ObjectClass)widgetClass; + ObjectClass cobjectClass = (ObjectClass)cwidgetClass; /* This function builds an array of pointers to the resource @@ -150,9 +150,9 @@ static void ConstructCallbackOffsets( if (QCallback == NULLQUARK) QCallback = XrmPermStringToQuark(XtRCallback); - if (objectClass->object_class.superclass != NULL) { + if (cobjectClass->object_class.superclass != NULL) { superTable = (CallbackTable) - ((ObjectClass) objectClass->object_class.superclass)-> + ((ObjectClass) cobjectClass->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) objectClass->object_class.resources; - for (i = objectClass->object_class.num_resources; --i >= 0; resourceList++) + resourceList = (XrmResourceList) cobjectClass->object_class.resources; + for (i = cobjectClass->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) objectClass->object_class.resources; + resourceList = (XrmResourceList) cobjectClass->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; - objectClass->object_class.callback_private = (XtPointer) newTable; + cobjectClass->object_class.callback_private = (XtPointer) newTable; } static void InheritObjectExtensionMethods( |