Commit ab50f84b authored by Mike Gabriel's avatar Mike Gabriel

hw/nxagent/Screen.c: Drop various unused variables.

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; ^ ```
parent ef287b54
...@@ -3545,11 +3545,8 @@ Bool nxagentReconnectScreen(void *p0) ...@@ -3545,11 +3545,8 @@ Bool nxagentReconnectScreen(void *p0)
{ {
CARD16 w, h; CARD16 w, h;
PixmapPtr pPixmap = (PixmapPtr)nxagentDefaultScreen->devPrivate; PixmapPtr pPixmap = (PixmapPtr)nxagentDefaultScreen->devPrivate;
int flexibility;
Mask mask; Mask mask;
flexibility = *(int*)p0;
#if defined(NXAGENT_RECONNECT_DEBUG) || defined(NXAGENT_RECONNECT_SCREEN_DEBUG) #if defined(NXAGENT_RECONNECT_DEBUG) || defined(NXAGENT_RECONNECT_SCREEN_DEBUG)
fprintf(stderr, "nxagentReconnectScreen\n"); fprintf(stderr, "nxagentReconnectScreen\n");
#endif #endif
...@@ -3740,7 +3737,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen) ...@@ -3740,7 +3737,7 @@ int nxagentAdjustRandRXinerama(ScreenPtr pScreen)
if (pScrPriv) if (pScrPriv)
{ {
int i, j; int i;
int number = 0; int number = 0;
XineramaScreenInfo *screeninfo = NULL; XineramaScreenInfo *screeninfo = NULL;
...@@ -4110,7 +4107,6 @@ void nxagentSaveAreas(PixmapPtr pPixmap, RegionPtr prgnSave, int xorg, int yorg, ...@@ -4110,7 +4107,6 @@ void nxagentSaveAreas(PixmapPtr pPixmap, RegionPtr prgnSave, int xorg, int yorg,
nxagentPrivPixmapPtr pPrivPixmap; nxagentPrivPixmapPtr pPrivPixmap;
XlibGC gc; XlibGC gc;
XGCValues values; XGCValues values;
DrawablePtr pDrawable;
int i; int i;
int xSrc, ySrc, xDst, yDst, w, h; int xSrc, ySrc, xDst, yDst, w, h;
int nRects; int nRects;
...@@ -4131,8 +4127,6 @@ void nxagentSaveAreas(PixmapPtr pPixmap, RegionPtr prgnSave, int xorg, int yorg, ...@@ -4131,8 +4127,6 @@ void nxagentSaveAreas(PixmapPtr pPixmap, RegionPtr prgnSave, int xorg, int yorg,
fbCopyWindowProc(&pWin -> drawable, &pVirtualPixmap -> drawable, 0, RegionRects(prgnSave), fbCopyWindowProc(&pWin -> drawable, &pVirtualPixmap -> drawable, 0, RegionRects(prgnSave),
RegionNumRects(prgnSave), xorg, yorg, FALSE, FALSE, 0, 0); RegionNumRects(prgnSave), xorg, yorg, FALSE, FALSE, 0, 0);
pDrawable = &pWin -> drawable;
values.subwindow_mode = IncludeInferiors; values.subwindow_mode = IncludeInferiors;
gc = XCreateGC(nxagentDisplay, nxagentWindow(WindowTable[0]), GCSubwindowMode, &values); gc = XCreateGC(nxagentDisplay, nxagentWindow(WindowTable[0]), GCSubwindowMode, &values);
...@@ -4230,7 +4224,6 @@ void nxagentRestoreAreas(PixmapPtr pPixmap, RegionPtr prgnRestore, int xorg, ...@@ -4230,7 +4224,6 @@ void nxagentRestoreAreas(PixmapPtr pPixmap, RegionPtr prgnRestore, int xorg,
RegionPtr clipRegion; RegionPtr clipRegion;
XlibGC gc; XlibGC gc;
XGCValues values; XGCValues values;
DrawablePtr pDrawable;
int i; int i;
int xSrc, ySrc, xDst, yDst, w, h; int xSrc, ySrc, xDst, yDst, w, h;
int nRects; int nRects;
...@@ -4255,8 +4248,6 @@ void nxagentRestoreAreas(PixmapPtr pPixmap, RegionPtr prgnRestore, int xorg, ...@@ -4255,8 +4248,6 @@ void nxagentRestoreAreas(PixmapPtr pPixmap, RegionPtr prgnRestore, int xorg,
fbCopyWindowProc(&pVirtualPixmap -> drawable, &pWin -> drawable, 0, RegionRects(prgnRestore), fbCopyWindowProc(&pVirtualPixmap -> drawable, &pWin -> drawable, 0, RegionRects(prgnRestore),
RegionNumRects(prgnRestore), -xorg, -yorg, FALSE, FALSE, 0, 0); RegionNumRects(prgnRestore), -xorg, -yorg, FALSE, FALSE, 0, 0);
pDrawable = &pVirtualPixmap -> drawable;
values.subwindow_mode = ClipByChildren; values.subwindow_mode = ClipByChildren;
gc = XCreateGC(nxagentDisplay, nxagentWindow(WindowTable[0]), GCSubwindowMode, &values); gc = XCreateGC(nxagentDisplay, nxagentWindow(WindowTable[0]), GCSubwindowMode, &values);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment