frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Xext: rename two shadowing variables 

panoramiX.c: In function 'PanoramiXCreateConnectionBlock':
panoramiX.c:599:10: warning: declaration of 'disableBackingStore' shadows a
global declaration [-Wshadow]
In file included from ../include/windowstr.h:60:0,
                 from panoramiX.c:47:
../include/opaque.h:56:52: warning: shadowed declaration is here [-Wshadow]

panoramiX.c: In function 'PanoramiXConsolidate':
panoramiX.c:834:19: warning: declaration of 'pScreen' shadows a previous
local [-Wshadow]
panoramiX.c:813:15: warning: shadowed declaration is here [-Wshadow]

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Mark Kettenis <kettenis@openbsd.org>
This commit is contained in:
Peter Hutterer 2013-02-14 10:13:53 +10:00
parent 8bbea9f48f
commit 63d00c6b14
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Xext/panoramiX.c
View File

@ -596,7 +596,7 @@ Bool
PanoramiXCreateConnectionBlock(void) PanoramiXCreateConnectionBlock(void)
{ {
int i, j, length; int i, j, length;
Bool disableBackingStore = FALSE; Bool disable_backing_store = FALSE;
int old_width, old_height; int old_width, old_height;
float width_mult, height_mult; float width_mult, height_mult;
xWindowRoot *root; xWindowRoot *root;
@ -622,10 +622,10 @@ PanoramiXCreateConnectionBlock(void)
} }
if (pScreen->backingStoreSupport != if (pScreen->backingStoreSupport !=
screenInfo.screens[0]->backingStoreSupport) screenInfo.screens[0]->backingStoreSupport)
disableBackingStore = TRUE; disable_backing_store = TRUE;
} }
if (disableBackingStore) { if (disable_backing_store) {
for (i = 0; i < screenInfo.numScreens; i++) { for (i = 0; i < screenInfo.numScreens; i++) {
pScreen = screenInfo.screens[i]; pScreen = screenInfo.screens[i];
pScreen->backingStoreSupport = NotUseful; pScreen->backingStoreSupport = NotUseful;
@ -831,15 +831,15 @@ PanoramiXConsolidate(void)
saver->type = XRT_WINDOW; saver->type = XRT_WINDOW;
FOR_NSCREENS(i) { FOR_NSCREENS(i) {
ScreenPtr pScreen = screenInfo.screens[i]; ScreenPtr scr = screenInfo.screens[i];
root->info[i].id = pScreen->root->drawable.id; root->info[i].id = scr->root->drawable.id;
root->u.win.class = InputOutput; root->u.win.class = InputOutput;
root->u.win.root = TRUE; root->u.win.root = TRUE;
saver->info[i].id = pScreen->screensaver.wid; saver->info[i].id = scr->screensaver.wid;
saver->u.win.class = InputOutput; saver->u.win.class = InputOutput;
saver->u.win.root = TRUE; saver->u.win.root = TRUE;
defmap->info[i].id = pScreen->defColormap; defmap->info[i].id = scr->defColormap;
} }
AddResource(root->info[0].id, XRT_WINDOW, root); AddResource(root->info[0].id, XRT_WINDOW, root);