From c97a3ade5a8718b063292c73a31aac2196fe2452 Mon Sep 17 00:00:00 2001 From: Jamey Sharp Date: Tue, 25 May 2010 15:17:30 -0700 Subject: [PATCH] dmx: Delete unused local variables. Signed-off-by: Jamey Sharp Reviewed-by: Peter Hutterer --- hw/dmx/glxProxy/g_renderswap.c | 39 --------------------------------- hw/dmx/glxProxy/glxcmds.c | 7 +----- hw/dmx/glxProxy/glxscreens.c | 1 - hw/dmx/glxProxy/glxsingle.c | 1 - hw/dmx/glxProxy/renderpixswap.c | 2 +- hw/dmx/input/dmxinputinit.c | 1 - 6 files changed, 2 insertions(+), 49 deletions(-) diff --git a/hw/dmx/glxProxy/g_renderswap.c b/hw/dmx/glxProxy/g_renderswap.c index b92821d0a..b6bede370 100644 --- a/hw/dmx/glxProxy/g_renderswap.c +++ b/hw/dmx/glxProxy/g_renderswap.c @@ -101,7 +101,6 @@ void __glXDispSwap_Color3sv(GLbyte *pc) void __glXDispSwap_Color3ubv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; } void __glXDispSwap_Color3uiv(GLbyte *pc) @@ -120,7 +119,6 @@ void __glXDispSwap_Color3usv(GLbyte *pc) void __glXDispSwap_Color4bv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; } void __glXDispSwap_Color4dv(GLbyte *pc) @@ -163,7 +161,6 @@ void __glXDispSwap_Color4sv(GLbyte *pc) void __glXDispSwap_Color4ubv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; } @@ -185,16 +182,10 @@ void __glXDispSwap_Color4usv(GLbyte *pc) void __glXDispSwap_EdgeFlagv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; - - } void __glXDispSwap_End(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; - - } void __glXDispSwap_Indexdv(GLbyte *pc) @@ -238,9 +229,6 @@ void __glXDispSwap_Indexsv(GLbyte *pc) void __glXDispSwap_Normal3bv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; - - } void __glXDispSwap_Normal3dv(GLbyte *pc) @@ -1203,9 +1191,6 @@ void __glXDispSwap_TexGeniv(GLbyte *pc) void __glXDispSwap_InitNames(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; - - } void __glXDispSwap_LoadName(GLbyte *pc) @@ -1226,9 +1211,6 @@ void __glXDispSwap_PassThrough(GLbyte *pc) void __glXDispSwap_PopName(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; - - } void __glXDispSwap_PushName(GLbyte *pc) @@ -1318,16 +1300,10 @@ void __glXDispSwap_StencilMask(GLbyte *pc) void __glXDispSwap_ColorMask(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; - - } void __glXDispSwap_DepthMask(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; - - } void __glXDispSwap_IndexMask(GLbyte *pc) @@ -1365,9 +1341,6 @@ void __glXDispSwap_Enable(GLbyte *pc) void __glXDispSwap_PopAttrib(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; - - } void __glXDispSwap_PushAttrib(GLbyte *pc) @@ -1698,9 +1671,6 @@ void __glXDispSwap_Frustum(GLbyte *pc) void __glXDispSwap_LoadIdentity(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; - - } void __glXDispSwap_LoadMatrixf(GLbyte *pc) @@ -1779,16 +1749,10 @@ void __glXDispSwap_Ortho(GLbyte *pc) void __glXDispSwap_PopMatrix(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; - - } void __glXDispSwap_PushMatrix(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; - - } void __glXDispSwap_Rotated(GLbyte *pc) @@ -1974,9 +1938,6 @@ void __glXDispSwap_PrioritizeTextures(GLbyte *pc) void __glXDispSwap_Indexubv(GLbyte *pc) { - __GLX_DECLARE_SWAP_VARIABLES; - - } void __glXDispSwap_BlendColor(GLbyte *pc) diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c index 18df675ba..389aa3d85 100644 --- a/hw/dmx/glxProxy/glxcmds.c +++ b/hw/dmx/glxProxy/glxcmds.c @@ -3420,11 +3420,6 @@ int __glXChangeDrawableAttributes(__GLXclientState *cl, GLbyte *pc) Display *dpy; int screen, rc; DMXScreenInfo *dmxScreen; - char *attrbuf; -#ifdef PANORAMIX - PanoramiXRes *pXinDraw = NULL; - PanoramiXRes *pXinReadDraw = NULL; -#endif if (drawId != None) { rc = dixLookupDrawable(&pDraw, drawId, client, 0, DixSetAttrAccess); @@ -3491,7 +3486,7 @@ int __glXChangeDrawableAttributes(__GLXclientState *cl, GLbyte *pc) #ifdef PANORAMIX if (!noPanoramiXExtension) { - pXinDraw = (PanoramiXRes *) + PanoramiXRes *pXinDraw = (PanoramiXRes *) SecurityLookupIDByClass(client, pDraw->id, XRC_DRAWABLE, DixReadAccess); if (!pXinDraw) { client->errorValue = drawId; diff --git a/hw/dmx/glxProxy/glxscreens.c b/hw/dmx/glxProxy/glxscreens.c index dbd4a927e..029843563 100644 --- a/hw/dmx/glxProxy/glxscreens.c +++ b/hw/dmx/glxProxy/glxscreens.c @@ -254,7 +254,6 @@ void __glXScreenInit(GLint numscreens) if (numscreens > 1) { for (s=1; sfbconfigs[c], dmxScreen->fbconfigs, diff --git a/hw/dmx/glxProxy/glxsingle.c b/hw/dmx/glxProxy/glxsingle.c index a41257eed..a07613485 100644 --- a/hw/dmx/glxProxy/glxsingle.c +++ b/hw/dmx/glxProxy/glxsingle.c @@ -750,7 +750,6 @@ int __glXDisp_ReadPixels(__GLXclientState *cl, GLbyte *pc) GLboolean swapBytes, lsbFirst; ClientPtr client = cl->client; DrawablePtr pDraw; - int error; __GLXcontext *glxc; int from_screen = 0; int to_screen = 0; diff --git a/hw/dmx/glxProxy/renderpixswap.c b/hw/dmx/glxProxy/renderpixswap.c index 462feeeb1..9deb30d4b 100644 --- a/hw/dmx/glxProxy/renderpixswap.c +++ b/hw/dmx/glxProxy/renderpixswap.c @@ -358,7 +358,7 @@ void __glXDispSwap_SeparableFilter2D(GLbyte *pc) { __GLXdispatchConvolutionFilterHeader *hdr = (__GLXdispatchConvolutionFilterHeader *) pc; - GLint hdrlen, image1len; + GLint hdrlen; __GLX_DECLARE_SWAP_VARIABLES; hdrlen = __GLX_PAD(__GLX_CONV_FILT_CMD_HDR_SIZE); diff --git a/hw/dmx/input/dmxinputinit.c b/hw/dmx/input/dmxinputinit.c index 9da4aba8b..5943e9248 100644 --- a/hw/dmx/input/dmxinputinit.c +++ b/hw/dmx/input/dmxinputinit.c @@ -839,7 +839,6 @@ static void dmxInputScanForExtensions(DMXInputInfo *dmxInput, int doXI) Display *display; int num; int i, j; - DMXLocalInputInfoPtr dmxLocal; int (*handler)(Display *, char *, char *); if (!(display = XOpenDisplay(dmxInput->name))) return;