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/Xserver/hw') 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/Xserver/hw') 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/Xserver/hw') 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/Xserver/hw') 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