[PATCH 1/4] xfree86: Remove some unused variables

Aaron Plattner aplattner at nvidia.com
Thu Nov 8 17:14:34 PST 2012


These all seem fine to me.  For the series,

Reviewed-by: Aaron Plattner <aplattner at nvidia.com>

-- Aaron

On 11/08/2012 05:50 AM, Thierry Reding wrote:
> GCC complains about these variables being set but not used, so they can
> just as well be removed.
>
> Signed-off-by: Thierry Reding <thierry.reding at avionic-design.de>
> ---
>   hw/xfree86/common/xf86Helper.c |  4 +---
>   hw/xfree86/modes/xf86RandR12.c | 14 --------------
>   2 files changed, 1 insertion(+), 17 deletions(-)
>
> diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
> index 721159d..841b8d5 100644
> --- a/hw/xfree86/common/xf86Helper.c
> +++ b/hw/xfree86/common/xf86Helper.c
> @@ -421,7 +421,6 @@ xf86SetDepthBpp(ScrnInfoPtr scrp, int depth, int dummy, int fbbpp,
>                * Check for DefaultDepth and DefaultFbBpp options in the
>                * Device sections.
>                */
> -            int i;
>               GDevPtr device;
>               Bool found = FALSE;
>
> @@ -1068,9 +1067,8 @@ void
>   xf86EnableDisableFBAccess(ScrnInfoPtr pScrnInfo, Bool enable)
>   {
>       ScreenPtr pScreen = pScrnInfo->pScreen;
> -    PixmapPtr pspix;
>
> -    pspix = (*pScreen->GetScreenPixmap) (pScreen);
> +    (*pScreen->GetScreenPixmap) (pScreen);
>       if (enable) {
>           /*
>            * Restore all of the clip lists on the screen
> diff --git a/hw/xfree86/modes/xf86RandR12.c b/hw/xfree86/modes/xf86RandR12.c
> index 3530abf..6f487bb 100644
> --- a/hw/xfree86/modes/xf86RandR12.c
> +++ b/hw/xfree86/modes/xf86RandR12.c
> @@ -453,7 +453,6 @@ xf86RandR12GetInfo(ScreenPtr pScreen, Rotation * rotations)
>       ScrnInfoPtr scrp = xf86ScreenToScrn(pScreen);
>       XF86RandRInfoPtr randrp = XF86RANDRINFO(pScreen);
>       DisplayModePtr mode;
> -    int refresh0 = 60;
>       int maxX = 0, maxY = 0;
>
>       *rotations = randrp->supported_rotations;
> @@ -478,8 +477,6 @@ xf86RandR12GetInfo(ScreenPtr pScreen, Rotation * rotations)
>               if (maxY < mode->VDisplay)
>                   maxY = mode->VDisplay;
>           }
> -        if (mode == scrp->modes)
> -            refresh0 = refresh;
>           pSize = RRRegisterSize(pScreen,
>                                  mode->HDisplay, mode->VDisplay,
>                                  randrp->mmWidth, randrp->mmHeight);
> @@ -683,7 +680,6 @@ xf86RandR12ScreenSetSize(ScreenPtr pScreen,
>       WindowPtr pRoot = pScreen->root;
>       PixmapPtr pScrnPix;
>       Bool ret = FALSE;
> -    Bool panning = FALSE;
>       int c;
>
>       if (xf86RandR12Key) {
> @@ -715,7 +711,6 @@ xf86RandR12ScreenSetSize(ScreenPtr pScreen,
>                   crtc->panningTrackingArea.y2 += height - pScreen->height;
>               xf86RandR13VerifyPanningArea(crtc, width, height);
>               xf86RandR13Pan(crtc, randrp->pointerX, randrp->pointerY);
> -	    panning = TRUE;
>           }
>       }
>
> @@ -945,8 +940,6 @@ xf86RandR12SetRotations(ScreenPtr pScreen, Rotation rotations)
>   void
>   xf86RandR12SetTransformSupport(ScreenPtr pScreen, Bool transforms)
>   {
> -    XF86RandRInfoPtr randrp;
> -
>   #if RANDR_13_INTERFACE
>       ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
>       int c;
> @@ -956,7 +949,6 @@ xf86RandR12SetTransformSupport(ScreenPtr pScreen, Bool transforms)
>       if (xf86RandR12Key == NULL)
>           return;
>
> -    randrp = XF86RANDRINFO(pScreen);
>   #if RANDR_13_INTERFACE
>       for (c = 0; c < config->num_crtc; c++) {
>           xf86CrtcPtr crtc = config->crtc[c];
> @@ -1454,7 +1446,6 @@ xf86RandR12SetInfo12(ScreenPtr pScreen)
>       RRCrtcPtr *crtcs;
>       int ncrtc;
>       int o, c, l;
> -    RRCrtcPtr randr_crtc;
>       int nclone;
>
>       clones = malloc(config->num_output * sizeof(RROutputPtr));
> @@ -1467,11 +1458,6 @@ xf86RandR12SetInfo12(ScreenPtr pScreen)
>               if (output->possible_crtcs & (1 << c))
>                   crtcs[ncrtc++] = config->crtc[c]->randr_crtc;
>
> -        if (output->crtc)
> -            randr_crtc = output->crtc->randr_crtc;
> -        else
> -            randr_crtc = NULL;
> -
>           if (!RROutputSetCrtcs(output->randr_output, crtcs, ncrtc)) {
>               free(crtcs);
>               free(clones);
>



More information about the xorg-devel mailing list