kdrive: fix "set but not used" warnings
kinput.c: In function 'KdEnqueueKeyboardEvent': kinput.c:1845:16: warning: variable 'ctrl' set but not used kinput.c:1844:17: warning: variable 'keyc' set but not used kinput.c: In function 'KdEnqueuePointerEvent': kinput.c:1887:12: warning: variable 'ms' set but not used kxv.c: In function 'KdXVDisable': kxv.c:1181:19: warning: variable 'ScreenPriv' set but not used mouse.c: In function 'ps2SkipInit': mouse.c:444:9: warning: variable 'skipping' set but not used mouse.c: In function 'ps2Init': mouse.c:473:10: warning: variable 'waiting' set but not used mouse.c:472:9: warning: variable 'skipping' set but not used fbdev.c: In function 'fbdevRandRSetConfig': fbdev.c:468:19: warning: variable 'newheight' set but not used fbdev.c:468:9: warning: variable 'newwidth' set but not used Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Robert Morell <rmorell@nvidia.com>
This commit is contained in:
parent
44fc062f85
commit
4149ee8ec0
|
@ -465,16 +465,6 @@ fbdevRandRSetConfig(ScreenPtr pScreen,
|
|||
int oldheight;
|
||||
int oldmmwidth;
|
||||
int oldmmheight;
|
||||
int newwidth, newheight;
|
||||
|
||||
if (screen->randr & (RR_Rotate_0 | RR_Rotate_180)) {
|
||||
newwidth = pSize->width;
|
||||
newheight = pSize->height;
|
||||
}
|
||||
else {
|
||||
newwidth = pSize->height;
|
||||
newheight = pSize->width;
|
||||
}
|
||||
|
||||
if (wasEnabled)
|
||||
KdDisableScreen(pScreen);
|
||||
|
|
|
@ -441,10 +441,8 @@ ps2SkipInit(KdPointerInfo * pi, int ninit, Bool ret_next)
|
|||
{
|
||||
Kmouse *km = pi->driverPrivate;
|
||||
int c = -1;
|
||||
int skipping;
|
||||
Bool waiting;
|
||||
|
||||
skipping = 0;
|
||||
waiting = FALSE;
|
||||
while (ninit || ret_next) {
|
||||
c = MouseReadByte(&km->iob, MOUSE_TIMEOUT);
|
||||
|
@ -469,8 +467,6 @@ static Bool
|
|||
ps2Init(KdPointerInfo * pi)
|
||||
{
|
||||
Kmouse *km = pi->driverPrivate;
|
||||
int skipping;
|
||||
Bool waiting;
|
||||
int id;
|
||||
unsigned char *init;
|
||||
int ninit;
|
||||
|
@ -483,8 +479,6 @@ ps2Init(KdPointerInfo * pi)
|
|||
*/
|
||||
if (!MouseWriteByte(km->iob.fd, PSMC_SEND_DEV_ID, 100))
|
||||
return FALSE;
|
||||
skipping = 0;
|
||||
waiting = FALSE;
|
||||
id = ps2SkipInit(pi, 0, TRUE);
|
||||
switch (id) {
|
||||
case 3:
|
||||
|
|
|
@ -1821,16 +1821,11 @@ KdEnqueueKeyboardEvent(KdKeyboardInfo * ki,
|
|||
unsigned char scan_code, unsigned char is_up)
|
||||
{
|
||||
unsigned char key_code;
|
||||
KeyClassPtr keyc = NULL;
|
||||
KeybdCtrl *ctrl = NULL;
|
||||
int type;
|
||||
|
||||
if (!ki || !ki->dixdev || !ki->dixdev->kbdfeed || !ki->dixdev->key)
|
||||
return;
|
||||
|
||||
keyc = ki->dixdev->key;
|
||||
ctrl = &ki->dixdev->kbdfeed->ctrl;
|
||||
|
||||
if (scan_code >= ki->minScanCode && scan_code <= ki->maxScanCode) {
|
||||
key_code = scan_code + KD_MIN_KEYCODE - ki->minScanCode;
|
||||
|
||||
|
@ -1864,7 +1859,6 @@ void
|
|||
KdEnqueuePointerEvent(KdPointerInfo * pi, unsigned long flags, int rx, int ry,
|
||||
int rz)
|
||||
{
|
||||
CARD32 ms;
|
||||
unsigned char buttons;
|
||||
int x, y, z;
|
||||
int (*matrix)[3] = kdPointerMatrix.matrix;
|
||||
|
@ -1875,8 +1869,6 @@ KdEnqueuePointerEvent(KdPointerInfo * pi, unsigned long flags, int rx, int ry,
|
|||
if (!pi)
|
||||
return;
|
||||
|
||||
ms = GetTimeInMillis();
|
||||
|
||||
/* we don't need to transform z, so we don't. */
|
||||
if (flags & KD_MOUSE_DELTA) {
|
||||
if (pi->transformCoordinates) {
|
||||
|
|
|
@ -1174,7 +1174,6 @@ void
|
|||
KdXVDisable(ScreenPtr pScreen)
|
||||
{
|
||||
XvScreenPtr pxvs;
|
||||
KdXVScreenPtr ScreenPriv;
|
||||
XvAdaptorPtr pAdaptor;
|
||||
XvPortPtr pPort;
|
||||
XvPortRecPrivatePtr pPriv;
|
||||
|
@ -1184,7 +1183,6 @@ KdXVDisable(ScreenPtr pScreen)
|
|||
return;
|
||||
|
||||
pxvs = GET_XV_SCREEN(pScreen);
|
||||
ScreenPriv = GET_KDXV_SCREEN(pScreen);
|
||||
|
||||
for (i = 0; i < pxvs->nAdaptors; i++) {
|
||||
pAdaptor = &pxvs->pAdaptors[i];
|
||||
|
|
Loading…
Reference in New Issue
Block a user