diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-12-06 10:27:35 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-12-10 09:14:20 +1000 |
| commit | b4e07e7acc84f68ed2d37557d64d5655cc262ed5 (patch) | |
| tree | 28eef5da0fa777c6be55884749ae1dadb86b5774 /src/XGetFCtl.c | |
| parent | 845550471fcd95d77e8d738ab8798d8e6e568b4a (diff) | |
Fix compiler warnings
XIQueryVersion.c: In function '_xiQueryVersion':
XIQueryVersion.c:63:26: warning: declaration of 'info' shadows a parameter
[-Wshadow]
XIQueryVersion.c:53:73: warning: shadowed declaration is here [-Wshadow]
XExtInt.c: In function 'XInputWireToEvent':
XExtInt.c:823:25: warning: declaration of 'i' shadows a previous local
[-Wshadow]
XExtInt.c:502:18: warning: shadowed declaration is here [-Wshadow]
XExtInt.c:850:25: warning: declaration of 'i' shadows a previous local
[-Wshadow]
XExtInt.c:502:18: warning: shadowed declaration is here [-Wshadow]
In file included from XExtInt.c:64:0:
../include/X11/extensions/XInput.h:166:17: note: previous declaration of
'_xidevicebusy' was here
XExtInt.c:101:12: warning: redundant redeclaration of
'_XiGetDevicePresenceNotifyEvent' [-Wredundant-decls]
XExtInt.c:76:13: warning: redundant redeclaration of '_xibaddevice'
[-Wredundant-decls]
In file included from XExtInt.c:64:0:
../include/X11/extensions/XInput.h:162:17: note: previous declaration of
'_xibaddevice' was here
XExtInt.c:81:13: warning: redundant redeclaration of '_xibadclass'
[-Wredundant-decls]
In file included from XExtInt.c:64:0:
../include/X11/extensions/XInput.h:163:17: note: previous declaration of
'_xibadclass' was here
XExtInt.c:86:13: warning: redundant redeclaration of '_xibadevent'
[-Wredundant-decls]
In file included from XExtInt.c:64:0:
../include/X11/extensions/XInput.h:164:17: note: previous declaration of
'_xibadevent' was here
XExtInt.c:91:13: warning: redundant redeclaration of '_xibadmode'
[-Wredundant-decls]
In file included from XExtInt.c:64:0:
../include/X11/extensions/XInput.h:165:17: note: previous declaration of
'_xibadmode' was here
XExtInt.c:96:13: warning: redundant redeclaration of '_xidevicebusy'
[-Wredundant-decls]
In file included from XExtInt.c:64:0:
../include/X11/extensions/XInput.h:166:17: note: previous declaration of
'_xidevicebusy' was here
XListDev.c: In function 'ParseClassInfo':
XListDev.c:116:33: warning: declaration of 'k' shadows a previous local
[-Wshadow]
XListDev.c:109:12: warning: shadowed declaration is here [-Wshadow]
XGetFCtl.c: In function 'XGetFeedbackControl':
XGetFCtl.c:184:26: warning: declaration of 'i' shadows a previous local
[-Wshadow]
XGetFCtl.c:72:17: warning: shadowed declaration is here [-Wshadow]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
Diffstat (limited to 'src/XGetFCtl.c')
| -rw-r--r-- | src/XGetFCtl.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/XGetFCtl.c b/src/XGetFCtl.c index 2961034..43afa00 100644 --- a/src/XGetFCtl.c +++ b/src/XGetFCtl.c @@ -181,18 +181,18 @@ XGetFeedbackControl( } case IntegerFeedbackClass: { - xIntegerFeedbackState *i; + xIntegerFeedbackState *ifs; XIntegerFeedbackState *I; - i = (xIntegerFeedbackState *) f; + ifs = (xIntegerFeedbackState *) f; I = (XIntegerFeedbackState *) Feedback; - I->class = i->class; + I->class = ifs->class; I->length = sizeof(XIntegerFeedbackState); - I->id = i->id; - I->resolution = i->resolution; - I->minVal = i->min_value; - I->maxVal = i->max_value; + I->id = ifs->id; + I->resolution = ifs->resolution; + I->minVal = ifs->min_value; + I->maxVal = ifs->max_value; break; } case StringFeedbackClass: |