summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2008-10-26 11:14:40 +0100
committerJulien Cristau <jcristau@debian.org>2008-10-26 11:44:10 +0100
commitadd946daed531e29935593fb2e7ee70286185baf (patch)
tree33ed16a9800979f0ea8a64e35af1d7c43570fa94
parentf2bda61c03f64133ef68dd1557b26ae7dc5beb0e (diff)
Nuke unused variables
-rw-r--r--Xi/chgdctl.c1
-rw-r--r--dix/main.c1
-rw-r--r--dix/window.c2
-rw-r--r--hw/xfree86/ramdac/xf86Cursor.c1
-rw-r--r--hw/xnest/Events.c1
5 files changed, 1 insertions, 5 deletions
diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c
index bbec7ccf0..6044f6cd6 100644
--- a/Xi/chgdctl.c
+++ b/Xi/chgdctl.c
@@ -138,7 +138,6 @@ ProcXChangeDeviceControl(ClientPtr client)
CARD32 *resolution;
xDeviceAbsCalibCtl *calib;
xDeviceAbsAreaCtl *area;
- xDeviceCoreCtl *c;
xDeviceEnableCtl *e;
devicePresenceNotify dpn;
diff --git a/dix/main.c b/dix/main.c
index 9a6f2d680..7bd91e0c2 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -240,7 +240,6 @@ int main(int argc, char *argv[], char *envp[])
#endif
{
int i;
- char *xauthfile;
HWEventQueueType alwaysCheckForInput[2];
display = "0";
diff --git a/dix/window.c b/dix/window.c
index e9aad52af..1a28d27c6 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -1014,7 +1014,7 @@ ChangeWindowAttributes(WindowPtr pWin, Mask vmask, XID *vlist, ClientPtr client)
Pixmap pixID;
CursorPtr pCursor, pOldCursor;
Cursor cursorID;
- WindowPtr pChild, pLayerWin;
+ WindowPtr pChild;
Colormap cmap;
ColormapPtr pCmap;
xEvent xE;
diff --git a/hw/xfree86/ramdac/xf86Cursor.c b/hw/xfree86/ramdac/xf86Cursor.c
index 592eaadd8..aea1d3337 100644
--- a/hw/xfree86/ramdac/xf86Cursor.c
+++ b/hw/xfree86/ramdac/xf86Cursor.c
@@ -460,7 +460,6 @@ xf86DeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen)
static void
xf86DeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen)
{
- DeviceIntPtr it;
xf86CursorScreenPtr ScreenPriv = (xf86CursorScreenPtr)dixLookupPrivate(
&pScreen->devPrivates, xf86CursorScreenKey);
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index 355b46f98..35ba43269 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -117,7 +117,6 @@ void
xnestCollectEvents(void)
{
XEvent X;
- xEvent x;
int i, n, valuators[2];
ScreenPtr pScreen;
GetEventList(&xnestEvents);