aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-06-18 19:04:12 +0200
committerUlrich Sibiller <uli42@gmx.de>2019-06-19 00:49:57 +0200
commit7e12c9ba57eb583cf1d0a22894fa3c4c090a2c7f (patch)
tree0b98d6f4baab9989c314a57eeba5a909b6cb859b /nx-X11/programs/Xserver
parent17d5e62ba400e105b7faf130ef31db299a5478c7 (diff)
downloadnx-libs-7e12c9ba57eb583cf1d0a22894fa3c4c090a2c7f.tar.gz
nx-libs-7e12c9ba57eb583cf1d0a22894fa3c4c090a2c7f.tar.bz2
nx-libs-7e12c9ba57eb583cf1d0a22894fa3c4c090a2c7f.zip
Extension.c: code simplifications
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Extensions.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c
index 785724cea..239d84b85 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Extensions.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Extensions.c
@@ -98,13 +98,12 @@ void nxagentInitGlxExtension(VisualPtr *visuals, DepthPtr *depths,
int *numVisuals, int *numDepths, int *rootDepth,
VisualID *defaultVisual)
{
- miInitVisualsProcPtr initVisuals;
/*
* Initialize the visuals to use the GLX extension.
*/
- initVisuals = NULL;
+ miInitVisualsProcPtr initVisuals = NULL;
GlxWrapInitVisuals(&initVisuals);
@@ -372,15 +371,13 @@ static int nxagentRandRInitSizes(ScreenPtr pScreen)
int nxagentRandRSetConfig(ScreenPtr pScreen, Rotation rotation,
int rate, RRScreenSizePtr pSize)
{
- int r;
-
UpdateCurrentTime();
/*
* Whatever size is OK for us.
*/
- r = nxagentResizeScreen(pScreen, pSize -> width, pSize -> height,
+ int r = nxagentResizeScreen(pScreen, pSize -> width, pSize -> height,
pSize -> mmWidth, pSize -> mmHeight);
nxagentMoveViewport(pScreen, 0, 0);
@@ -430,8 +427,6 @@ void nxagentRandRSetWindowsSize(int width, int height)
int nxagentRandRScreenSetSize(ScreenPtr pScreen, CARD16 width, CARD16 height,
CARD32 mmWidth, CARD32 mmHeight)
{
- int result;
-
UpdateCurrentTime();
if (nxagentOption(DesktopResize) == 1 &&
@@ -453,7 +448,7 @@ int nxagentRandRScreenSetSize(ScreenPtr pScreen, CARD16 width, CARD16 height,
nxagentChangeOption(Height, height);
}
- result = nxagentResizeScreen(pScreen, width, height, mmWidth, mmHeight);
+ int result = nxagentResizeScreen(pScreen, width, height, mmWidth, mmHeight);
if (result == 1 && nxagentOption(DesktopResize) == 1 &&
nxagentOption(Fullscreen) == 0 && nxagentOption(AllScreens) == 0)