[PATCH 13/16] dmx: Delete unused local variables.

[Peter Hutterer]

On Tue, May 25, 2010 at 04:53:24PM -0700, Jamey Sharp wrote:
> Signed-off-by: Jamey Sharp <jamey at minilop.net>

Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
 
Cheers,
  Peter


> ---
>  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 fe4c2d7..e675696 100644
> --- a/hw/dmx/glxProxy/g_renderswap.c
> +++ b/hw/dmx/glxProxy/g_renderswap.c
> @@ -105,7 +105,6 @@ void __glXDispSwap_Color3sv(GLbyte *pc)
>  
>  void __glXDispSwap_Color3ubv(GLbyte *pc)
>  {
> -	__GLX_DECLARE_SWAP_VARIABLES;
>  }
>  
>  void __glXDispSwap_Color3uiv(GLbyte *pc)
> @@ -126,7 +125,6 @@ void __glXDispSwap_Color3usv(GLbyte *pc)
>  
>  void __glXDispSwap_Color4bv(GLbyte *pc)
>  {
> -	__GLX_DECLARE_SWAP_VARIABLES;
>  }
>  
>  void __glXDispSwap_Color4dv(GLbyte *pc)
> @@ -173,7 +171,6 @@ void __glXDispSwap_Color4sv(GLbyte *pc)
>  
>  void __glXDispSwap_Color4ubv(GLbyte *pc)
>  {
> -	__GLX_DECLARE_SWAP_VARIABLES;
>  
>  }
>  
> @@ -197,16 +194,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)
> @@ -254,9 +245,6 @@ void __glXDispSwap_Indexsv(GLbyte *pc)
>  
>  void __glXDispSwap_Normal3bv(GLbyte *pc)
>  {
> -	__GLX_DECLARE_SWAP_VARIABLES;
> -
> -
>  }
>  
>  void __glXDispSwap_Normal3dv(GLbyte *pc)
> @@ -1283,9 +1271,6 @@ void __glXDispSwap_TexGeniv(GLbyte *pc)
>  
>  void __glXDispSwap_InitNames(GLbyte *pc)
>  {
> -	__GLX_DECLARE_SWAP_VARIABLES;
> -
> -
>  }
>  
>  void __glXDispSwap_LoadName(GLbyte *pc)
> @@ -1306,9 +1291,6 @@ void __glXDispSwap_PassThrough(GLbyte *pc)
>  
>  void __glXDispSwap_PopName(GLbyte *pc)
>  {
> -	__GLX_DECLARE_SWAP_VARIABLES;
> -
> -
>  }
>  
>  void __glXDispSwap_PushName(GLbyte *pc)
> @@ -1398,16 +1380,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)
> @@ -1445,9 +1421,6 @@ void __glXDispSwap_Enable(GLbyte *pc)
>  
>  void __glXDispSwap_PopAttrib(GLbyte *pc)
>  {
> -	__GLX_DECLARE_SWAP_VARIABLES;
> -
> -
>  }
>  
>  void __glXDispSwap_PushAttrib(GLbyte *pc)
> @@ -1785,9 +1758,6 @@ void __glXDispSwap_Frustum(GLbyte *pc)
>  
>  void __glXDispSwap_LoadIdentity(GLbyte *pc)
>  {
> -	__GLX_DECLARE_SWAP_VARIABLES;
> -
> -
>  }
>  
>  void __glXDispSwap_LoadMatrixf(GLbyte *pc)
> @@ -1870,16 +1840,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)
> @@ -2066,9 +2030,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 47a1dea..cb4092a 100644
> --- a/hw/dmx/glxProxy/glxcmds.c
> +++ b/hw/dmx/glxProxy/glxcmds.c
> @@ -3416,11 +3416,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);
> @@ -3487,7 +3482,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 daf6dfa..65134dd 100644
> --- a/hw/dmx/glxProxy/glxscreens.c
> +++ b/hw/dmx/glxProxy/glxscreens.c
> @@ -249,7 +249,6 @@ void __glXScreenInit(GLint numscreens)
>  	 if (numscreens > 1) {
>  	    for (s=1; s<numscreens; s++) {
>  	       DMXScreenInfo *dmxScreen = &dmxScreens[s];
> -	       __GLXscreenInfo *glxScreen = &__glXActiveScreens[s];
>  	  
>  	       cfg = FindMatchingFBConfig( &dmxScreen0->fbconfigs[c],
>  		                           dmxScreen->fbconfigs, 
> diff --git a/hw/dmx/glxProxy/glxsingle.c b/hw/dmx/glxProxy/glxsingle.c
> index 737550b..dd72e00 100644
> --- a/hw/dmx/glxProxy/glxsingle.c
> +++ b/hw/dmx/glxProxy/glxsingle.c
> @@ -754,7 +754,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 462feee..9deb30d 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 1662d0f..1242be1 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;
>      XextErrorHandler     handler;
>  
>      if (!(display = XOpenDisplay(dmxInput->name))) return;
> -- 
> 1.7.0