From ae8ec6b14e05909ede894a51c9faa035c2893e8c Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 15 Oct 2016 17:51:11 +0200 Subject: Fix libX11 implicit declaration warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit all _X11Trans* functions lead to a warnign like this: implicit declaration of function ‘_X11TransOpenCOTSClient’ [-Wimplicit-function-declaration] Fix it by partly reverting d3ae0b2c9559e70448746240caaf5634c78d0eef (which removed too much) --- nx-X11/lib/X11/Imakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nx-X11') diff --git a/nx-X11/lib/X11/Imakefile b/nx-X11/lib/X11/Imakefile index 8549f69cd..e9ee564cd 100644 --- a/nx-X11/lib/X11/Imakefile +++ b/nx-X11/lib/X11/Imakefile @@ -147,8 +147,8 @@ EXTRA_LIBRARIES = /**/ POLL_DEFINES = -DUSE_POLL #endif CONN_DEFINES = $(CONNECTION_FLAGS) - XTRANS_X_DEFINES = $(XTRANS_FAILDEFINES) - XTRANS_XIM_DEFINES = $(XTRANS_FAILDEFINES) + XTRANS_X_DEFINES = -DX11_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES) + XTRANS_XIM_DEFINES = -DXIM_t -DTRANS_CLIENT $(XTRANS_FAILDEFINES) #if HasBSD44Sockets SOCK_DEFINES = -DBSD44SOCKETS #endif -- cgit v1.2.3 From babaf67c92010d2f783d355a50ce11a2a12bb667 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 15 Oct 2016 18:03:18 +0200 Subject: Pending.c: Fix compilation warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pending.c: In function ‘XEventsQueued’: Pending.c:44:5: warning: format ‘%p’ expects argument of type ‘void *’, but argument 3 has type ‘struct Display *’ [-Wformat=] fprintf(stderr, "\nXEventsQueued: Called with a display at [%p].\n", dpy); ^ --- nx-X11/lib/X11/Pending.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nx-X11') diff --git a/nx-X11/lib/X11/Pending.c b/nx-X11/lib/X11/Pending.c index dc52c81dc..d3804c629 100644 --- a/nx-X11/lib/X11/Pending.c +++ b/nx-X11/lib/X11/Pending.c @@ -41,7 +41,7 @@ int XEventsQueued ( { int ret_val; #if defined(NX_TRANS_SOCKET) && defined(NX_TRANS_TEST) - fprintf(stderr, "\nXEventsQueued: Called with a display at [%p].\n", dpy); + fprintf(stderr, "\nXEventsQueued: Called with a display at [%p].\n", (void *)dpy); #endif LockDisplay(dpy); @@ -50,7 +50,7 @@ int XEventsQueued ( else ret_val = _XEventsQueued (dpy, mode); #if defined(NX_TRANS_SOCKET) && defined(NX_TRANS_TEST) - fprintf(stderr, "\nXEventsQueued: Going to unlock the display at [%p].\n", dpy); + fprintf(stderr, "\nXEventsQueued: Going to unlock the display at [%p].\n", (void *)dpy); #endif UnlockDisplay(dpy); return ret_val; -- cgit v1.2.3 From e3c9bc3926213139dce3a22109822a821d031c80 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 15 Oct 2016 18:21:48 +0200 Subject: imLcIm.c: Fix unused variables MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit imLcIm.c: In function ‘_XimCreateDefaultTree’: imLcIm.c:525:11: warning: unused variable ‘cachedir’ [-Wunused-variable] char *cachedir = NULL; ^ imLcIm.c:521:35: warning: variable ‘intname’ set but not used [-Wunused-but-set-variable] char *name, *tmpname = NULL, *intname; --- nx-X11/lib/X11/imLcIm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'nx-X11') diff --git a/nx-X11/lib/X11/imLcIm.c b/nx-X11/lib/X11/imLcIm.c index 817fb2147..b3662bc96 100644 --- a/nx-X11/lib/X11/imLcIm.c +++ b/nx-X11/lib/X11/imLcIm.c @@ -510,14 +510,15 @@ _XimCreateDefaultTree( Xim im) { FILE *fp = NULL; - char *name, *tmpname = NULL, *intname; + char *name, *tmpname = NULL; char *cachename = NULL; /* Should use getpwent() instead of $HOME (cross-platform?) */ char *home = getenv("HOME"); - char *cachedir = NULL; char *tmpcachedir = NULL; int hl = home ? strlen (home) : 0; #ifdef COMPOSECACHE + char *intname; + char *cachedir = NULL; const char *encoding = nl_langinfo (CODESET); uid_t euid = geteuid (); gid_t egid = getegid (); @@ -545,9 +546,9 @@ _XimCreateDefaultTree( if (name == (char *) NULL) { tmpname = name = _XlcFileName(im->core.lcd, COMPOSE_FILE); } +#ifdef COMPOSECACHE intname = name; -#ifdef COMPOSECACHE if (getuid () == euid && getgid () == egid && euid != 0) { char *c; /* Usage: XCOMPOSECACHE=[=] -- cgit v1.2.3 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') 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') 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') 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') 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') 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') 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') 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') 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 2c59fbe30b86854f32e80b84be18328a661e7707 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sun, 16 Oct 2016 02:15:13 +0200 Subject: Fix warnings in XlibInt.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit XlibInt.c: In function ‘_XIOError’: XlibInt.c:3750:1: warning: ‘noreturn’ function does return [enabled by default] } After fixing the above a new warning came up, which is also fixed now: XlibInt.c: In function ‘_XIOError’: XlibInt.c:3750:1: warning: control reaches end of non-void function [-Wreturn-type] } --- nx-X11/lib/X11/XlibInt.c | 2 ++ nx-X11/lib/X11/Xlibint.h | 5 +++++ 2 files changed, 7 insertions(+) (limited to 'nx-X11') diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c index d3c85a343..851fa236e 100644 --- a/nx-X11/lib/X11/XlibInt.c +++ b/nx-X11/lib/X11/XlibInt.c @@ -3743,6 +3743,8 @@ _XIOError ( dpy->flags &= ~XlibDisplayReadEvents; dpy->flags &= ~XlibDisplayWriting; dpy->flags &= ~XlibDisplayReply; + /* shut up the compiler by returning something */ + return 0; #else exit (1); #endif diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h index 056b4d8f9..932ed745e 100644 --- a/nx-X11/lib/X11/Xlibint.h +++ b/nx-X11/lib/X11/Xlibint.h @@ -856,7 +856,12 @@ extern int _XError( ); extern int _XIOError( Display* /* dpy */ +#ifdef NX_TRANS_SOCKET +); +#else ) _X_NORETURN; +#endif /* NX_TRANS_SOCKET */ + extern int (*_XIOErrorFunction)( Display* /* dpy */ ); -- cgit v1.2.3 From 897b8b28b34b3f4c12aca073176df7781d801dfc Mon Sep 17 00:00:00 2001 From: walter harms Date: Tue, 26 Apr 2016 16:23:46 +0200 Subject: remove stray extern remove stray extern Signed-off-by: walter harms --- nx-X11/lib/X11/XKBExtDev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11') diff --git a/nx-X11/lib/X11/XKBExtDev.c b/nx-X11/lib/X11/XKBExtDev.c index 183647fc6..cb40ecd04 100644 --- a/nx-X11/lib/X11/XKBExtDev.c +++ b/nx-X11/lib/X11/XKBExtDev.c @@ -36,7 +36,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. /***====================================================================***/ -extern void +void XkbNoteDeviceChanges(XkbDeviceChangesPtr old, XkbExtensionDeviceNotifyEvent *new, unsigned int wanted) -- cgit v1.2.3 From 3f9ebf33d49b6e92b4a6a88adfa5de0dd7471fae Mon Sep 17 00:00:00 2001 From: walter harms Date: Tue, 26 Apr 2016 16:34:11 +0200 Subject: no need to check args for Xfree() simplify code Signed-off-by: walter harms --- nx-X11/lib/X11/lcGeneric.c | 74 +++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 41 deletions(-) (limited to 'nx-X11') diff --git a/nx-X11/lib/X11/lcGeneric.c b/nx-X11/lib/X11/lcGeneric.c index 1c78a95c6..58ee5d27c 100644 --- a/nx-X11/lib/X11/lcGeneric.c +++ b/nx-X11/lib/X11/lcGeneric.c @@ -1027,10 +1027,8 @@ freeByteM( } blst = codeset->byteM; for (i = 0; i < codeset->length; i++) { - if (blst[i].byteinfo) { Xfree(blst[i].byteinfo); blst[i].byteinfo = NULL; - } } Xfree(codeset->byteM); codeset->byteM = NULL; @@ -1044,20 +1042,18 @@ freeConversion( if (codeset->mbconv) { mbconv = codeset->mbconv; /* ... */ - if (mbconv->convlist) { - Xfree(mbconv->convlist); - mbconv->convlist = NULL; - } + Xfree(mbconv->convlist); + mbconv->convlist = NULL; + Xfree(mbconv); codeset->mbconv = NULL; } if (codeset->ctconv) { ctconv = codeset->ctconv; /* ... */ - if (ctconv->convlist) { - Xfree(ctconv->convlist); - ctconv->convlist = NULL; - } + Xfree(ctconv->convlist); + ctconv->convlist = NULL; + Xfree(ctconv); codeset->ctconv = NULL; } @@ -1072,14 +1068,12 @@ freeExtdSegment( return; } ctextseg = codeset->ctextseg; - if (ctextseg->name) { - Xfree(ctextseg->name); - ctextseg->name = NULL; - } - if (ctextseg->area) { - Xfree(ctextseg->area); - ctextseg->area = NULL; - } + Xfree(ctextseg->name); + ctextseg->name = NULL; + + Xfree(ctextseg->area); + ctextseg->area = NULL; + Xfree(codeset->ctextseg); codeset->ctextseg = NULL; } @@ -1093,10 +1087,10 @@ freeParseInfo( return; } parse_info = codeset->parse_info; - if (parse_info->encoding) { - Xfree(parse_info->encoding); - parse_info->encoding = NULL; - } + + Xfree(parse_info->encoding); + parse_info->encoding = NULL; + Xfree(codeset->parse_info); codeset->parse_info = NULL; } @@ -1115,10 +1109,10 @@ destroy_CodeSetList( freeConversion(codeset[i]); freeExtdSegment(codeset[i]); freeParseInfo(codeset[i]); - if (codeset[i]->charset_list) { - Xfree(codeset[i]->charset_list); - codeset[i]->charset_list = NULL; - } + + Xfree(codeset[i]->charset_list); + codeset[i]->charset_list = NULL; + Xfree(codeset[i]); codeset[i]=NULL; } Xfree(codeset); gen->codeset_list = NULL; @@ -1130,21 +1124,20 @@ destroy_SegConv( { SegConv seg = gen->segment_conv; int i; + if (gen->segment_conv_num == 0) { return; } for (i=0;isegment_conv_num;i++) { - if (seg[i].source_encoding) { + Xfree(seg[i].source_encoding); seg[i].source_encoding = NULL; - } - if (seg[i].destination_encoding) { + Xfree(seg[i].destination_encoding); seg[i].destination_encoding = NULL; - } - if (seg[i].conv) { - Xfree(seg[i].conv); seg[i].conv = NULL; - } + + Xfree(seg[i].conv); + seg[i].conv = NULL; } Xfree(seg); gen->segment_conv = NULL; } @@ -1156,14 +1149,13 @@ destroy_gen( XLCdGenericPart *gen = XLC_GENERIC_PART(lcd); destroy_SegConv(gen); destroy_CodeSetList(gen); - if (gen->mb_parse_table) { - Xfree(gen->mb_parse_table); - gen->mb_parse_table = NULL; - } - if (gen->mb_parse_list) { - Xfree(gen->mb_parse_list); - gen->mb_parse_list = NULL; - } + + Xfree(gen->mb_parse_table); + gen->mb_parse_table = NULL; + + Xfree(gen->mb_parse_list); + gen->mb_parse_list = NULL; + } /* VW/UDC end 95.01.08 */ -- cgit v1.2.3 From 21405f62ba6fe9e14db9b0e3b75b55e150614b2c Mon Sep 17 00:00:00 2001 From: walter harms Date: Tue, 26 Apr 2016 16:31:27 +0200 Subject: fix: warning: pointer targets in passing argument 2 of '_XSend' differ in signedness [-Wpointer-sign] fix signess warning by casting Signed-off-by: walter harms --- nx-X11/lib/X11/ModMap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nx-X11') diff --git a/nx-X11/lib/X11/ModMap.c b/nx-X11/lib/X11/ModMap.c index 49a5d08e8..27f3a8d29 100644 --- a/nx-X11/lib/X11/ModMap.c +++ b/nx-X11/lib/X11/ModMap.c @@ -39,7 +39,7 @@ XGetModifierMapping(register Display *dpy) XModifierKeymap *res; LockDisplay(dpy); - GetEmptyReq(GetModifierMapping, req); + GetEmptyReq(GetModifierMapping, req); // Never used ? (void) _XReply (dpy, (xReply *)&rep, 0, xFalse); if (rep.length < (INT_MAX >> 2) && @@ -84,7 +84,7 @@ XSetModifierMapping( req->length += mapSize >> 2; req->numKeyPerModifier = modifier_map->max_keypermod; - Data(dpy, modifier_map->modifiermap, mapSize); + Data(dpy, (const char *)modifier_map->modifiermap, mapSize); (void) _XReply(dpy, (xReply *) & rep, (SIZEOF(xSetModifierMappingReply) - SIZEOF(xReply)) >> 2, xTrue); -- cgit v1.2.3 From ddc5ed4c9b876e2ae901edebcd59c9d77daeafd3 Mon Sep 17 00:00:00 2001 From: walter harms Date: Sat, 4 Jun 2016 17:19:59 +0200 Subject: Fixes: warning: variable 'req' set but not,used Fixes: warning: variable 'req' set but not used [-Wunused-but-set-variable] by marking req _X_UNUSED Solution was discussed on xorg-devel ML Peter Hutter, Alan Coopersmith Re: [PATCH libX11 3/5] fix: warning: pointer targets in passing argument 2 of '_XSend' differ in signedness [-Wpointer-sign] Signed-off-by: harms wharms@bfs.de --- nx-X11/lib/X11/GetFPath.c | 2 +- nx-X11/lib/X11/GetIFocus.c | 2 +- nx-X11/lib/X11/GetKCnt.c | 2 +- nx-X11/lib/X11/GetPCnt.c | 2 +- nx-X11/lib/X11/GetPntMap.c | 2 +- nx-X11/lib/X11/GetSSaver.c | 2 +- nx-X11/lib/X11/GrServer.c | 2 +- nx-X11/lib/X11/LiHosts.c | 2 +- nx-X11/lib/X11/ListExt.c | 2 +- nx-X11/lib/X11/Macros.c | 2 +- nx-X11/lib/X11/ModMap.c | 4 ++-- nx-X11/lib/X11/QuKeybd.c | 2 +- nx-X11/lib/X11/ReconfWM.c | 2 +- nx-X11/lib/X11/Sync.c | 2 +- nx-X11/lib/X11/UngrabSvr.c | 2 +- nx-X11/lib/X11/XlibInt.c | 2 +- nx-X11/lib/X11/cmsCmap.c | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) (limited to 'nx-X11') diff --git a/nx-X11/lib/X11/GetFPath.c b/nx-X11/lib/X11/GetFPath.c index 8c3f49c95..3d87e4f64 100644 --- a/nx-X11/lib/X11/GetFPath.c +++ b/nx-X11/lib/X11/GetFPath.c @@ -42,7 +42,7 @@ char **XGetFontPath( int count = 0; register unsigned i; register int length; - register xReq *req; + _X_UNUSED register xReq *req; LockDisplay(dpy); GetEmptyReq (GetFontPath, req); diff --git a/nx-X11/lib/X11/GetIFocus.c b/nx-X11/lib/X11/GetIFocus.c index 5d43ead4f..0a7f36e8d 100644 --- a/nx-X11/lib/X11/GetIFocus.c +++ b/nx-X11/lib/X11/GetIFocus.c @@ -36,7 +36,7 @@ XGetInputFocus( int *revert_to) { xGetInputFocusReply rep; - register xReq *req; + _X_UNUSED register xReq *req; LockDisplay(dpy); GetEmptyReq(GetInputFocus, req); (void) _XReply (dpy, (xReply *)&rep, 0, xTrue); diff --git a/nx-X11/lib/X11/GetKCnt.c b/nx-X11/lib/X11/GetKCnt.c index 17f487fbe..5829fbeaa 100644 --- a/nx-X11/lib/X11/GetKCnt.c +++ b/nx-X11/lib/X11/GetKCnt.c @@ -35,7 +35,7 @@ XGetKeyboardControl ( register XKeyboardState *state) { xGetKeyboardControlReply rep; - register xReq *req; + _X_UNUSED register xReq *req; LockDisplay(dpy); GetEmptyReq (GetKeyboardControl, req); (void) _XReply (dpy, (xReply *) &rep, diff --git a/nx-X11/lib/X11/GetPCnt.c b/nx-X11/lib/X11/GetPCnt.c index 2c35d210c..72d9495b5 100644 --- a/nx-X11/lib/X11/GetPCnt.c +++ b/nx-X11/lib/X11/GetPCnt.c @@ -38,7 +38,7 @@ XGetPointerControl( int *threshold) { xGetPointerControlReply rep; - xReq *req; + _X_UNUSED xReq *req; LockDisplay(dpy); GetEmptyReq(GetPointerControl, req); (void) _XReply (dpy, (xReply *)&rep, 0, xTrue); diff --git a/nx-X11/lib/X11/GetPntMap.c b/nx-X11/lib/X11/GetPntMap.c index 29fdf21f0..07625f8a0 100644 --- a/nx-X11/lib/X11/GetPntMap.c +++ b/nx-X11/lib/X11/GetPntMap.c @@ -45,7 +45,7 @@ int XGetPointerMapping ( unsigned char mapping[256]; /* known fixed size */ unsigned long nbytes, remainder = 0; xGetPointerMappingReply rep; - register xReq *req; + _X_UNUSED register xReq *req; LockDisplay(dpy); GetEmptyReq(GetPointerMapping, req); diff --git a/nx-X11/lib/X11/GetSSaver.c b/nx-X11/lib/X11/GetSSaver.c index 1aba3bb74..7c2a3061a 100644 --- a/nx-X11/lib/X11/GetSSaver.c +++ b/nx-X11/lib/X11/GetSSaver.c @@ -40,7 +40,7 @@ XGetScreenSaver( { xGetScreenSaverReply rep; - register xReq *req; + _X_UNUSED register xReq *req; LockDisplay(dpy); GetEmptyReq(GetScreenSaver, req); diff --git a/nx-X11/lib/X11/GrServer.c b/nx-X11/lib/X11/GrServer.c index 11d21e491..c4c62bef3 100644 --- a/nx-X11/lib/X11/GrServer.c +++ b/nx-X11/lib/X11/GrServer.c @@ -32,7 +32,7 @@ in this Software without prior written authorization from The Open Group. int XGrabServer (register Display *dpy) { - register xReq *req; + _X_UNUSED register xReq *req; LockDisplay(dpy); GetEmptyReq(GrabServer, req); UnlockDisplay(dpy); diff --git a/nx-X11/lib/X11/LiHosts.c b/nx-X11/lib/X11/LiHosts.c index 83cf3c791..29c36ffb5 100644 --- a/nx-X11/lib/X11/LiHosts.c +++ b/nx-X11/lib/X11/LiHosts.c @@ -77,7 +77,7 @@ XHostAddress *XListHosts ( xListHostsReply reply; unsigned char *buf, *bp; register unsigned i; - register xListHostsReq *req; + _X_UNUSED register xListHostsReq *req; XServerInterpretedAddress *sip; *nhosts = 0; diff --git a/nx-X11/lib/X11/ListExt.c b/nx-X11/lib/X11/ListExt.c index 0516e4596..7fdf9932c 100644 --- a/nx-X11/lib/X11/ListExt.c +++ b/nx-X11/lib/X11/ListExt.c @@ -41,7 +41,7 @@ char **XListExtensions( int count = 0; register unsigned i; register int length; - register xReq *req; + _X_UNUSED register xReq *req; unsigned long rlen = 0; LockDisplay(dpy); diff --git a/nx-X11/lib/X11/Macros.c b/nx-X11/lib/X11/Macros.c index d5a3a0485..e29dcd4e8 100644 --- a/nx-X11/lib/X11/Macros.c +++ b/nx-X11/lib/X11/Macros.c @@ -292,7 +292,7 @@ int XAddPixel( int XNoOp (register Display *dpy) { - register xReq *req; + _X_UNUSED register xReq *req; LockDisplay(dpy); GetEmptyReq(NoOperation, req); diff --git a/nx-X11/lib/X11/ModMap.c b/nx-X11/lib/X11/ModMap.c index 27f3a8d29..ca15dde25 100644 --- a/nx-X11/lib/X11/ModMap.c +++ b/nx-X11/lib/X11/ModMap.c @@ -34,12 +34,12 @@ XModifierKeymap * XGetModifierMapping(register Display *dpy) { xGetModifierMappingReply rep; - register xReq *req; + _X_UNUSED register xReq *req; unsigned long nbytes; XModifierKeymap *res; LockDisplay(dpy); - GetEmptyReq(GetModifierMapping, req); // Never used ? + GetEmptyReq(GetModifierMapping, req); (void) _XReply (dpy, (xReply *)&rep, 0, xFalse); if (rep.length < (INT_MAX >> 2) && diff --git a/nx-X11/lib/X11/QuKeybd.c b/nx-X11/lib/X11/QuKeybd.c index 4b8431d50..0a2d4d0fc 100644 --- a/nx-X11/lib/X11/QuKeybd.c +++ b/nx-X11/lib/X11/QuKeybd.c @@ -39,7 +39,7 @@ XQueryKeymap( char keys[32]) { xQueryKeymapReply rep; - register xReq *req; + _X_UNUSED register xReq *req; LockDisplay(dpy); GetEmptyReq(QueryKeymap, req); diff --git a/nx-X11/lib/X11/ReconfWM.c b/nx-X11/lib/X11/ReconfWM.c index 8dc3534e0..b3d8624cf 100644 --- a/nx-X11/lib/X11/ReconfWM.c +++ b/nx-X11/lib/X11/ReconfWM.c @@ -105,7 +105,7 @@ Status XReconfigureWMWindow ( */ { xGetInputFocusReply rep; - register xReq *req; + _X_UNUSED register xReq *req; GetEmptyReq(GetInputFocus, req); (void) _XReply (dpy, (xReply *)&rep, 0, xTrue); diff --git a/nx-X11/lib/X11/Sync.c b/nx-X11/lib/X11/Sync.c index 6326de768..bc768d4f6 100644 --- a/nx-X11/lib/X11/Sync.c +++ b/nx-X11/lib/X11/Sync.c @@ -37,7 +37,7 @@ XSync ( Bool discard) { xGetInputFocusReply rep; - register xReq *req; + _X_UNUSED register xReq *req; LockDisplay(dpy); GetEmptyReq(GetInputFocus, req); diff --git a/nx-X11/lib/X11/UngrabSvr.c b/nx-X11/lib/X11/UngrabSvr.c index ea0084879..20ad9aa35 100644 --- a/nx-X11/lib/X11/UngrabSvr.c +++ b/nx-X11/lib/X11/UngrabSvr.c @@ -33,7 +33,7 @@ int XUngrabServer ( register Display *dpy) { - register xReq *req; + _X_UNUSED register xReq *req; LockDisplay(dpy); GetEmptyReq(UngrabServer, req); diff --git a/nx-X11/lib/X11/XlibInt.c b/nx-X11/lib/X11/XlibInt.c index 851fa236e..42b928fd5 100644 --- a/nx-X11/lib/X11/XlibInt.c +++ b/nx-X11/lib/X11/XlibInt.c @@ -874,7 +874,7 @@ void _XSeqSyncFunction( register Display *dpy) { xGetInputFocusReply rep; - register xReq *req; + _X_UNUSED register xReq *req; #ifdef NX_TRANS_SOCKET #ifdef NX_TRANS_DEBUG diff --git a/nx-X11/lib/X11/cmsCmap.c b/nx-X11/lib/X11/cmsCmap.c index c5401c05d..c7087ecb1 100644 --- a/nx-X11/lib/X11/cmsCmap.c +++ b/nx-X11/lib/X11/cmsCmap.c @@ -181,7 +181,7 @@ CmapRecForColormap( } { xGetInputFocusReply rep; - register xReq *req; + _X_UNUSED register xReq *req; GetEmptyReq(GetInputFocus, req); (void) _XReply (dpy, (xReply *)&rep, 0, xTrue); -- cgit v1.2.3 From 01eaab8314a7b4a0cc5d5a10d9a0e87fc1709d72 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Wed, 19 Oct 2016 21:58:06 +0200 Subject: LRGB.c: Fix label defined but not used MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit LRGB.c: In function ‘LINEAR_RGB_InitSCCData’: LRGB.c:798:1: warning: label ‘FreeBlueTblElements’ defined but not used [-Wunused-label] FreeBlueTblElements: ^ --- nx-X11/lib/X11/LRGB.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'nx-X11') diff --git a/nx-X11/lib/X11/LRGB.c b/nx-X11/lib/X11/LRGB.c index 4bfa3cfb1..38cc6cfb4 100644 --- a/nx-X11/lib/X11/LRGB.c +++ b/nx-X11/lib/X11/LRGB.c @@ -795,9 +795,6 @@ LINEAR_RGB_InitSCCData( return(XcmsSuccess); -FreeBlueTblElements: - Xfree(pScreenData->pBlueTbl->pBase); - FreeBlueTbl: Xfree(pScreenData->pBlueTbl); -- 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') 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') 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') 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') 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') 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