summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Carnecky <tom@dbservice.com>2009-02-03 23:54:53 +0100
committerPeter Hutterer <peter.hutterer@who-t.net>2009-02-04 09:41:25 +1000
commitbc57efffe654c493ceb62555cccb7926f4a646f1 (patch)
tree2a1cd2671cbbe6ac334417088bfa2be3e35600f9
parent111fdef74dfc7e288cef675b171b673bf64fe056 (diff)
Fix "warning: unused variable XXX"
events.c:4614: warning: unused variable ‘kbd’ xkbUtils.c:361: warning: unused variable ‘maxKeysPerMod’ xf86Events.c:409: warning: unused variable ‘ke’ generic.c:131: warning: unused variable ‘cs’ generic.c:130: warning: unused variable ‘size’ xf86RandR12.c:591: warning: unused variable ‘crtc’ Signed-off-by: Tomas Carnecky <tom@dbservice.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--dix/events.c1
-rw-r--r--hw/xfree86/common/xf86Events.c1
-rw-r--r--hw/xfree86/int10/generic.c3
-rw-r--r--hw/xfree86/modes/xf86RandR12.c1
-rw-r--r--xkb/xkbUtils.c2
5 files changed, 2 insertions, 6 deletions
diff --git a/dix/events.c b/dix/events.c
index 265531231..f1fe3f61a 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -4611,7 +4611,6 @@ ProcQueryPointer(ClientPtr client)
xQueryPointerReply rep;
WindowPtr pWin, t;
DeviceIntPtr mouse = PickPointer(client);
- DeviceIntPtr kbd = PickKeyboard(client);
SpritePtr pSprite;
int rc;
REQUEST(xResourceReq);
diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c
index 50a5bf6d6..592d4e3a0 100644
--- a/hw/xfree86/common/xf86Events.c
+++ b/hw/xfree86/common/xf86Events.c
@@ -406,7 +406,6 @@ static void
xf86ReleaseKeys(DeviceIntPtr pDev)
{
KeyClassPtr keyc;
- xEvent ke;
int i, j, nevents, sigstate;
if (!pDev || !pDev->key)
diff --git a/hw/xfree86/int10/generic.c b/hw/xfree86/int10/generic.c
index 0af7c1baa..4808108ff 100644
--- a/hw/xfree86/int10/generic.c
+++ b/hw/xfree86/int10/generic.c
@@ -126,8 +126,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
int screen;
legacyVGARec vga;
-#ifdef _PC
- int size;
+#if 0
CARD32 cs;
#endif
diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
index 83a4f4f38..ab39329bf 100644
--- a/hw/xfree86/modes/xf86RandR12.c
+++ b/hw/xfree86/modes/xf86RandR12.c
@@ -588,7 +588,6 @@ xf86RandR12CreateScreenResources (ScreenPtr pScreen)
else
{
xf86OutputPtr output = config->output[config->compat_output];
- xf86CrtcPtr crtc = output->crtc;
if (output->conf_monitor &&
(output->conf_monitor->mon_width > 0 &&
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 807c65421..98f9fc503 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -358,7 +358,7 @@ KeySymsPtr
XkbGetCoreMap(DeviceIntPtr keybd)
{
register int key,tmp;
-int maxSymsPerKey,maxKeysPerMod, maxGroup1Width;
+int maxSymsPerKey, maxGroup1Width;
XkbDescPtr xkb;
KeySymsPtr syms;
int maxNumberOfGroups;