From ab50f84b50c8f11e0be813a5e54ca307e72a656f Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 18 Mar 2016 16:45:59 +0100
Subject: hw/nxagent/Screen.c: Drop various unused variables.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 Amends the following compiler warnings:

 ```
 Screen.c: In function ‘nxagentReconnectScreen’:
 Screen.c:3547:7: warning: variable ‘flexibility’ set but not used [-Wunused-but-set-variable]
   int flexibility;
       ^
 Screen.c: In function ‘nxagentAdjustRandRXinerama’:
 Screen.c:3746:12: warning: unused variable ‘j’ [-Wunused-variable]
      int i, j;
             ^
 Screen.c: In function ‘nxagentSaveAreas’:
 Screen.c:4116:15: warning: variable ‘pDrawable’ set but not used [-Wunused-but-set-variable]
    DrawablePtr pDrawable;
                ^
 Screen.c: In function ‘nxagentRestoreAreas’:
 Screen.c:4236:15: warning: variable ‘pDrawable’ set but not used [-Wunused-but-set-variable]
    DrawablePtr pDrawable;
                ^
 ```
---
 nx-X11/programs/Xserver/hw/nxagent/Screen.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Screen.c b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
index 767810b5e..c5e09df49 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Screen.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Screen.c
@@ -3545,11 +3545,8 @@ Bool nxagentReconnectScreen(void *p0)
 {
   CARD16 w, h;
   PixmapPtr pPixmap = (PixmapPtr)nxagentDefaultScreen->devPrivate;
-  int flexibility;
   Mask mask;
 
-  flexibility = *(int*)p0;
-
 #if defined(NXAGENT_RECONNECT_DEBUG) || defined(NXAGENT_RECONNECT_SCREEN_DEBUG)
   fprintf(stderr, "nxagentReconnectScreen\n");
 #endif
@@ -3740,7 +3737,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
 
   if (pScrPriv)
   {
-    int i, j;
+    int i;
     int number = 0;
 
     XineramaScreenInfo *screeninfo = NULL;
@@ -4110,7 +4107,6 @@ void nxagentSaveAreas(PixmapPtr pPixmap, RegionPtr prgnSave, int xorg, int yorg,
   nxagentPrivPixmapPtr pPrivPixmap;
   XlibGC gc;
   XGCValues values;
-  DrawablePtr pDrawable;
   int i;
   int xSrc, ySrc, xDst, yDst, w, h;
   int nRects;
@@ -4131,8 +4127,6 @@ void nxagentSaveAreas(PixmapPtr pPixmap, RegionPtr prgnSave, int xorg, int yorg,
   fbCopyWindowProc(&pWin -> drawable, &pVirtualPixmap -> drawable, 0, RegionRects(prgnSave),
                        RegionNumRects(prgnSave), xorg, yorg, FALSE, FALSE, 0, 0);
 
-  pDrawable = &pWin -> drawable;
-
   values.subwindow_mode = IncludeInferiors;
 
   gc = XCreateGC(nxagentDisplay, nxagentWindow(WindowTable[0]), GCSubwindowMode, &values);
@@ -4230,7 +4224,6 @@ void nxagentRestoreAreas(PixmapPtr pPixmap, RegionPtr prgnRestore, int xorg,
   RegionPtr clipRegion;
   XlibGC gc;
   XGCValues values;
-  DrawablePtr pDrawable;
   int i;
   int xSrc, ySrc, xDst, yDst, w, h;
   int nRects;
@@ -4255,8 +4248,6 @@ void nxagentRestoreAreas(PixmapPtr pPixmap, RegionPtr prgnRestore, int xorg,
   fbCopyWindowProc(&pVirtualPixmap -> drawable, &pWin -> drawable, 0, RegionRects(prgnRestore),
                        RegionNumRects(prgnRestore), -xorg, -yorg, FALSE, FALSE, 0, 0);
 
-  pDrawable = &pVirtualPixmap -> drawable;
-
   values.subwindow_mode = ClipByChildren;
 
   gc = XCreateGC(nxagentDisplay, nxagentWindow(WindowTable[0]), GCSubwindowMode, &values);
-- 
cgit v1.2.3