From 3c5621c37064958a96707df2f2fb831f21a2f97e Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 15 Oct 2016 21:41:03 +0200 Subject: Args.c: fix string format warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 5 has type ‘long int’ [-Wformat=] --- nx-X11/programs/Xserver/hw/nxagent/Args.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Args.c b/nx-X11/programs/Xserver/hw/nxagent/Args.c index 1c93bbbe5..7d256f5c5 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Args.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Args.c @@ -1447,7 +1447,7 @@ static void nxagentParseOptions(char *name, char *value) tolerance_parse = UINT_MAX; fprintf(stderr, "nxagentParseOptions: Warning: value [%s] of option [%s] " - "out of range, clamped to [%u].\n", + "out of range, clamped to [%lu].\n", validateString(value), validateString(name), tolerance_parse); } @@ -1456,7 +1456,7 @@ static void nxagentParseOptions(char *name, char *value) tolerance_parse = 0; fprintf(stderr, "nxagentParseOptions: Warning: value [%s] of option [%s] " - "out of range, clamped to [%u].\n", + "out of range, clamped to [%lu].\n", validateString(value), validateString(name), tolerance_parse); } -- cgit v1.2.3 From 54b7561f989b1fc85431d9856e89a58b0443ee3b Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 15 Oct 2016 21:42:54 +0200 Subject: Colormap.c: add cast to avoid warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Colormap.c: In function ‘nxagentSetInstalledColormapWindows’: Colormap.c:314:27: warning: format ‘%p’ expects argument of type ‘void *’, but argument 3 has type ‘WindowPtr’ [-Wformat=] pWin, pWin -> drawable.class); ^ --- nx-X11/programs/Xserver/hw/nxagent/Colormap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c index ecfbe210e..c21bcbbe7 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Colormap.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Colormap.c @@ -311,7 +311,7 @@ void nxagentSetInstalledColormapWindows(ScreenPtr pScreen) { fprintf(stderr, "nxagentSetInstalledColormapWindows: WARNING! " "Window at [%p] has no colormap with class [%d].\n", - pWin, pWin -> drawable.class); + (void *)pWin, pWin -> drawable.class); } #endif } -- cgit v1.2.3 From 81a7c6cf4af6bb865fc18bb0bcc79421fed233c8 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 15 Oct 2016 21:45:30 +0200 Subject: Display.c: remove unused variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Display.c: In function ‘nxagentCheckForPixmapFormatsCompatibility’: Display.c:2471:8: warning: variable ‘one_match’ set but not used [-Wunused-but-set-variable] bool one_match = false; ^ --- nx-X11/programs/Xserver/hw/nxagent/Display.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Display.c b/nx-X11/programs/Xserver/hw/nxagent/Display.c index 04f2fbb4c..f1fb1e902 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Display.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Display.c @@ -2468,7 +2468,6 @@ static int nxagentCheckForPixmapFormatsCompatibility() */ bool compatible = true; - bool one_match = false; bool matched = false; int total_matches = 0; @@ -2483,7 +2482,6 @@ static int nxagentCheckForPixmapFormatsCompatibility() nxagentPixmapFormats[i].scanline_pad == nxagentRemotePixmapFormats[j].scanline_pad) { matched = true; - one_match = true; ++total_matches; break; -- cgit v1.2.3 From d238db344d3ea7325205efe7fb75403c5a9643f2 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 15 Oct 2016 22:02:06 +0200 Subject: Window.c: Fix function assignment warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Window.c: In function ‘nxagentFrameBufferPaintWindow’: Window.c:1968:31: warning: ISO C forbids assignment between function pointer and ‘void *’ [-Wpedantic] PaintWindowBackgroundBackup = pWin->drawable.pScreen -> PaintWindowBackground; --- nx-X11/programs/Xserver/hw/nxagent/Window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Window.c b/nx-X11/programs/Xserver/hw/nxagent/Window.c index e39afe240..f81e08ebc 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Window.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Window.c @@ -1953,7 +1953,7 @@ Bool nxagentUnrealizeWindow(pWin) void nxagentFrameBufferPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what) { - void *PaintWindowBackgroundBackup; + void (*PaintWindowBackgroundBackup)(WindowPtr, RegionPtr, int); if (pWin->backgroundState == BackgroundPixmap) { -- cgit v1.2.3 From c180a21473b7a3883704b0e361e9ed4ab7b78c50 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 16 Oct 2016 00:02:41 +0200 Subject: security.c: fix compiler warnings --- nx-X11/programs/Xserver/Xext/security.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c index 1071565f3..c1b7b50a9 100644 --- a/nx-X11/programs/Xserver/Xext/security.c +++ b/nx-X11/programs/Xserver/Xext/security.c @@ -148,7 +148,7 @@ int (*SwappedUntrustedProcVector[256])( * try a set of well known paths. */ -const char *_NXGetPolicyFilePath(const char *path) +char *_NXGetPolicyFilePath(const char *path) { struct stat SecurityPolicyStat; @@ -1345,7 +1345,6 @@ SecurityCensorImage(client, pVisibleRegion, widthBytesLine, pDraw, x, y, w, h, unsigned int format; char * pBuf; { - ScreenPtr pScreen = pDraw->pScreen; RegionRec imageRegion; /* region representing x,y,w,h */ RegionRec censorRegion; /* region to obliterate */ BoxRec imageBox; -- cgit v1.2.3 From 33b5911f2c061bcce7b507066330f346aa63dbf5 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 16 Oct 2016 00:07:21 +0200 Subject: xcmisc.c: remove HAVE_STDINT This eliminates a warning since we do not have this define in our build environment. --- nx-X11/programs/Xserver/Xext/xcmisc.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/Xext/xcmisc.c b/nx-X11/programs/Xserver/Xext/xcmisc.c index 68843fd04..b7f55aa6d 100644 --- a/nx-X11/programs/Xserver/Xext/xcmisc.c +++ b/nx-X11/programs/Xserver/Xext/xcmisc.c @@ -40,11 +40,7 @@ from The Open Group. #include #include "modinit.h" -#if HAVE_STDINT_H #include -#elif !defined(UINT32_MAX) -#define UINT32_MAX 0xffffffffU -#endif #if 0 static unsigned char XCMiscCode; -- cgit v1.2.3 From 057ddde08e30bf79440a8c983090a1cf1bd4de9d Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 16 Oct 2016 00:19:47 +0200 Subject: xkmread.c: use _X_UNUSED to avoid compiler warning when result is not needed --- nx-X11/programs/Xserver/xkb/xkmread.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/xkb/xkmread.c b/nx-X11/programs/Xserver/xkb/xkmread.c index 18ab21dca..1d8f6d772 100644 --- a/nx-X11/programs/Xserver/xkb/xkmread.c +++ b/nx-X11/programs/Xserver/xkb/xkmread.c @@ -1085,7 +1085,8 @@ unsigned i,size_toc; } return 0; } - fread(file_info,SIZEOF(xkmFileInfo),1,file); + _X_UNUSED int ignored_result; + ignored_result = fread(file_info,SIZEOF(xkmFileInfo),1,file); size_toc= file_info->num_toc; if (size_toc>max_toc) { #ifdef DEBUG @@ -1095,7 +1096,7 @@ unsigned i,size_toc; size_toc= max_toc; } for (i=0;ioffset,SEEK_SET); - fread(&tmpTOC,SIZEOF(xkmSectionInfo),1,file); + _X_UNUSED int ignored_result; + ignored_result = fread(&tmpTOC,SIZEOF(xkmSectionInfo),1,file); nRead= SIZEOF(xkmSectionInfo); if ((tmpTOC.type!=toc->type)||(tmpTOC.format!=toc->format)|| (tmpTOC.size!=toc->size)||(tmpTOC.offset!=toc->offset)) { @@ -1201,7 +1203,8 @@ char name[100]; case XkmSymbolsIndex: case XkmGeometryIndex: fseek(file,toc->offset,SEEK_SET); - fread(&tmpTOC,SIZEOF(xkmSectionInfo),1,file); + _X_UNUSED int ignored_result; + ignored_result = fread(&tmpTOC,SIZEOF(xkmSectionInfo),1,file); if ((tmpTOC.type!=toc->type)||(tmpTOC.format!=toc->format)|| (tmpTOC.size!=toc->size)||(tmpTOC.offset!=toc->offset)) { _XkbLibError(_XkbErrIllegalContents,"XkmReadFileSectionName",0); -- cgit v1.2.3 From 0a28292ec986070edccc8fc1eea4c3d3e280e102 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 16 Oct 2016 00:41:11 +0200 Subject: xkb.c: fix 'assignment makes integer from pointer without a cast' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit xkb.c: In function ‘_GetCountedString’: xkb.c:4405:8: warning: assignment makes integer from pointer without a cast [enabled by default] len= (CARD16 *)wire; --- nx-X11/programs/Xserver/xkb/xkb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/xkb/xkb.c b/nx-X11/programs/Xserver/xkb/xkb.c index 3e4cf4acd..a78541e75 100644 --- a/nx-X11/programs/Xserver/xkb/xkb.c +++ b/nx-X11/programs/Xserver/xkb/xkb.c @@ -4402,7 +4402,7 @@ char * wire, *next; CARD16 len; wire= *wire_inout; - len= (CARD16 *)wire; + len = *(CARD16 *) wire; if (client->swapped) { swaps(&len); } -- cgit v1.2.3 From e3e4062c35a5a337ca2edfddb0bf68b8b192fefb Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Tue, 9 Dec 2014 09:30:57 -0800 Subject: dbe: Call to DDX SwapBuffers requires address of int, not unsigned int [CVE-2014-8097 pt. 2] When the local types used to walk the DBE request were changed, this changed the type of the parameter passed to the DDX SwapBuffers API, but there wasn't a matching change in the API definition. At this point, with the API frozen, I just stuck a new variable in with the correct type. Because we've already bounds-checked nStuff to be smaller than UINT32_MAX / sizeof(DbeSwapInfoRec), we know it will fit in a signed int without overflow. Signed-off-by: Keith Packard Signed-off-by: Alan Coopersmith Backported-to-NX-by: Ulrich Sibiller --- nx-X11/programs/Xserver/dbe/dbe.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/dbe/dbe.c b/nx-X11/programs/Xserver/dbe/dbe.c index 276919e34..58301e158 100644 --- a/nx-X11/programs/Xserver/dbe/dbe.c +++ b/nx-X11/programs/Xserver/dbe/dbe.c @@ -721,7 +721,7 @@ ProcDbeSwapBuffers(client) int error; unsigned int i, j; unsigned int nStuff; - + int nStuff_i; /* DDX API requires int for nStuff */ REQUEST_AT_LEAST_SIZE(xDbeSwapBuffersReq); nStuff = stuff->n; /* use local variable for performance. */ @@ -806,10 +806,11 @@ ProcDbeSwapBuffers(client) * could deal with cross-screen synchronization. */ - while (nStuff > 0) + nStuff_i = nStuff; + while (nStuff_i > 0) { pDbeScreenPriv = DBE_SCREEN_PRIV_FROM_WINDOW(swapInfo[0].pWindow); - error = (*pDbeScreenPriv->SwapBuffers)(client, &nStuff, swapInfo); + error = (*pDbeScreenPriv->SwapBuffers)(client, &nStuff_i, swapInfo); if (error != Success) { free(swapInfo); -- cgit v1.2.3 From 4f99f854cd29e980144254678828dcb11c121cd3 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Sun, 11 Jan 2009 08:25:17 +0100 Subject: dix: fix cast from pointer to integer --- nx-X11/programs/Xserver/dix/devices.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/dix/devices.c b/nx-X11/programs/Xserver/dix/devices.c index 39f5d123f..69cdc82e1 100644 --- a/nx-X11/programs/Xserver/dix/devices.c +++ b/nx-X11/programs/Xserver/dix/devices.c @@ -725,7 +725,7 @@ InitStringFeedbackClassDeviceStruct ( for (i=0; ictrl.symbols_supported+i) = *symbols++; for (i=0; ictrl.symbols_displayed+i) = (KeySym) NULL; + *(feedc->ctrl.symbols_displayed+i) = (KeySym) 0; feedc->ctrl.id = 0; if ( (feedc->next = dev->stringfeed) ) feedc->ctrl.id = dev->stringfeed->ctrl.id + 1; -- cgit v1.2.3 From c266216107f0f0964c0a3d3979f4c364a59c578c Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Tue, 14 Feb 2006 08:11:41 +0000 Subject: Remove useless line of code that contained a bug and triggered a gcc warning. This variable will be overriden before being used anyway. (Bugzilla #5595) --- nx-X11/programs/Xserver/fb/fbbits.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/fb/fbbits.h b/nx-X11/programs/Xserver/fb/fbbits.h index 5cd7ae70f..d915d7b35 100644 --- a/nx-X11/programs/Xserver/fb/fbbits.h +++ b/nx-X11/programs/Xserver/fb/fbbits.h @@ -829,8 +829,6 @@ POLYSEGMENT (DrawablePtr pDrawable, ul = coordToInt(pBox->x1 - xoff, pBox->y1 - yoff); lr = coordToInt(pBox->x2 - xoff - 1, pBox->y2 - yoff - 1); - bits += bitsStride * yoff + xoff * MUL; - capNotLast = pGC->capStyle == CapNotLast; while (nseg--) -- cgit v1.2.3 From 151e0b16da708f54a03cf50e104f2ac43ec16a5b Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Tue, 24 May 2011 18:33:17 +0200 Subject: xfixes: Remove unused variable. The last use of pScreen in ProcXFixesSetPictureClipRegion was removed in aa7096ca6f108e399d9916639cf20c57f9776305 so remove it entirely. Reviewed-by: Jeremy Huddleston Signed-off-by: Cyril Brulebois Backported-to-NX-by: Ulrich Sibiller --- nx-X11/programs/Xserver/xfixes/region.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/xfixes/region.c b/nx-X11/programs/Xserver/xfixes/region.c index 0b502c7f9..6759b4bfe 100644 --- a/nx-X11/programs/Xserver/xfixes/region.c +++ b/nx-X11/programs/Xserver/xfixes/region.c @@ -753,13 +753,11 @@ ProcXFixesSetPictureClipRegion (ClientPtr client) #ifdef RENDER PicturePtr pPicture; RegionPtr pRegion; - ScreenPtr pScreen; REQUEST(xXFixesSetPictureClipRegionReq); REQUEST_SIZE_MATCH (xXFixesSetPictureClipRegionReq); VERIFY_PICTURE(pPicture, stuff->picture, client, SecurityWriteAccess, RenderErrBase + BadPicture); - pScreen = pPicture->pDrawable->pScreen; VERIFY_REGION_OR_NONE(pRegion, stuff->region, client, SecurityReadAccess); return SetPictureClipRegion (pPicture, stuff->xOrigin, stuff->yOrigin, -- cgit v1.2.3 From 50eb5e4a9bf812895a7d5c4e6ae0775c6910931f Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 20 Oct 2016 00:15:20 +0200 Subject: sendexev.c: Fix return of unitialized variable Well, kinda fix. Upstream handles that differently here, we need a thorough check! Add another FIXME comment because of this. --- nx-X11/programs/Xserver/Xi/sendexev.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/Xi/sendexev.c b/nx-X11/programs/Xserver/Xi/sendexev.c index 28286d97f..a851c5120 100644 --- a/nx-X11/programs/Xserver/Xi/sendexev.c +++ b/nx-X11/programs/Xserver/Xi/sendexev.c @@ -149,10 +149,14 @@ ProcXSendExtensionEvent (client) return Success; } - // FIXME: ret is not initialized and should not be returned... - + /* + the previous code here returned the unitialized variable ret, + so using Success we have defined returncode at least. FIXME: + Upstream works different here, we must check this! + */ if (stuff->num_events == 0) - return ret; + /* return ret; */ + return Success; /* The client's event type must be one defined by an extension. */ -- cgit v1.2.3