summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2012-08-21 14:03:55 +1000
committerThomas Hellstrom <thellstrom@vmware.com>2012-11-23 10:19:19 +0100
commitcabf4cb7c0ba3e535068ebb1d80108a26dddddaa (patch)
tree341a0266fefd17c08a73ce37f2ae1715b013fcd9
parent393880d2e6fe7f744e6c701a4fde6116a7278325 (diff)
Fix compiler warnings about unused variables
vmmouse.c: In function 'MouseCommonOptions': vmmouse.c:732:16: warning: variable 'from' set but not used [-Wunused-but-set-variable] vmmouse.c: In function 'MouseCommonOptions': vmmouse.c:733:8: warning: variable 'origButtons' set but not used [-Wunused-but-set-variable] vmmouse.c: In function 'VMMouseDeviceControl': vmmouse.c:838:19: warning: variable 'mPriv' set but not used [-Wunused-but-set-variable] Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
-rw-r--r--src/vmmouse.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/vmmouse.c b/src/vmmouse.c
index d841771..bb450ff 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -729,19 +729,14 @@ static void
MouseCommonOptions(InputInfoPtr pInfo)
{
MouseDevPtr pMse;
- MessageType from = X_DEFAULT;
char *s;
- int origButtons;
pMse = pInfo->private;
pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0);
- from = X_CONFIG;
if (!pMse->buttons) {
pMse->buttons = MSE_DFLTBUTTONS;
- from = X_DEFAULT;
}
- origButtons = pMse->buttons;
/*
* "emulate3Buttons" and "Drag Lock" is not supported
@@ -790,13 +785,6 @@ MouseCommonOptions(InputInfoPtr pInfo)
pInfo->name, s);
}
}
-
- /*
- * Emulatewheel is not supported
- */
- if (origButtons != pMse->buttons)
- from = X_CONFIG;
-
}
@@ -847,7 +835,6 @@ VMMouseDeviceControl(DeviceIntPtr device, int mode)
{
InputInfoPtr pInfo;
MouseDevPtr pMse;
- VMMousePrivPtr mPriv;
unsigned char map[MSE_MAXBUTTONS + 1];
int i;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
@@ -858,7 +845,6 @@ VMMouseDeviceControl(DeviceIntPtr device, int mode)
pInfo = device->public.devicePrivate;
pMse = pInfo->private;
pMse->device = device;
- mPriv = (VMMousePrivPtr)pMse->mousePriv;
switch (mode){
case DEVICE_INIT: