From f8e76fd69157b6f466b2efc7d41b031d530e873c Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 8 Mar 2018 22:25:15 +0100 Subject: Events.c: mitigate compiler warning "ISO C forbids assignment between function pointer and 'void *' [-pedantic]" --- nx-X11/programs/Xserver/hw/nxagent/Events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index fad9f2865..23a9182de 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -821,7 +821,7 @@ void nxagentDispatchEvents(PredicateFuncPtr predicate) #ifdef TEST fprintf(stderr, "nxagentDispatchEvents: Going to handle new events with " - "predicate [%p].\n", predicate); + "predicate [%p].\n", *(void **)&predicate); #endif if (nxagentRemoteExposeRegion == NULL) -- cgit v1.2.3 From 2fe89c5bf1ede82097ffcf1a9695b8df21c714ba Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 8 Mar 2018 22:28:29 +0100 Subject: Events.c: fix compiler warnings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit format ‘%p’ expects argument of type ‘void *’ --- nx-X11/programs/Xserver/hw/nxagent/Events.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 23a9182de..8fe4e1ffc 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -1636,7 +1636,7 @@ FIXME: Don't enqueue the KeyRelease event if the key was #ifdef TEST fprintf(stderr, "nxagentDispatchEvents: nxagentLastEnteredTopLevelWindow [%p].\n", - nxagentLastEnteredTopLevelWindow); + (void *)nxagentLastEnteredTopLevelWindow); #endif } @@ -4346,7 +4346,7 @@ int nxagentClipAndSendExpose(WindowPtr pWin, void * ptr) box = *RegionExtents(&pWin -> clipList); fprintf(stderr, "nxagentClipAndSendExpose: Clip list extents for window at [%p]: [%d] [%d] [%d] [%d].\n", - pWin, box.x1, box.y1, box.x2, box.y2); + (void *)pWin, box.x1, box.y1, box.x2, box.y2); #endif RegionIntersect(exposeRgn, remoteExposeRgn, &pWin -> clipList); @@ -4355,7 +4355,7 @@ int nxagentClipAndSendExpose(WindowPtr pWin, void * ptr) { #ifdef DEBUG fprintf(stderr, "nxagentClipAndSendExpose: Forwarding expose to window at [%p] pWin.\n", - pWin); + (void *)pWin); #endif /* -- cgit v1.2.3 From 553b96f0551d660d0700de49da880cf99d9c9168 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 8 Mar 2018 22:29:53 +0100 Subject: Events.c: fix wrong printf format specifiers --- nx-X11/programs/Xserver/hw/nxagent/Events.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 8fe4e1ffc..a1376092d 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -2500,7 +2500,7 @@ FIXME: This can be maybe optimized by consuming the nxagentExposeQueue.exposures[index].remoteRegion, &sum); #ifdef TEST - fprintf(stderr, "nxagentHandleExposeEvent: Added region for window [%ld] to position [%d].\n", + fprintf(stderr, "nxagentHandleExposeEvent: Added region for window [%u] to position [%d].\n", nxagentWindow(pWin), index); #endif @@ -2520,7 +2520,7 @@ FIXME: This can be maybe optimized by consuming the nxagentSplashCount == 1 && X -> xexpose.count == 0) { #ifdef DEBUG - fprintf(stderr, "nxagentHandleExposeEvent: Clearing root tile window id [%ld].\n", + fprintf(stderr, "nxagentHandleExposeEvent: Clearing root tile window id [%u].\n", nxagentWindowPriv(nxagentRootTileWindow) -> window); #endif @@ -2759,7 +2759,7 @@ int nxagentHandleClientMessageEvent(XEvent *X, enum HandleEventResult *result) else { #ifdef TEST - fprintf(stderr, "Events: WM_DELETE_WINDOW arrived Atom = %ld.\n", wmAtom); + fprintf(stderr, "Events: WM_DELETE_WINDOW arrived Atom = %u.\n", wmAtom); #endif if (X -> xclient.window == nxagentIconWindow) @@ -4127,7 +4127,7 @@ void nxagentSynchronizeExpose(void) { #ifdef TEST fprintf(stderr, "nxagentSynchronizeExpose: Going to call miWindowExposures" - " for window [%ld] - rects [%ld].\n", nxagentWindow(pWin), + " for window [%d] - rects [%d].\n", nxagentWindow(pWin), RegionNumRects(nxagentExposeQueueHead.remoteRegion)); #endif -- cgit v1.2.3 From 0db17707384b62d2001618053c80d76dcf5cfb6c Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Thu, 8 Mar 2018 22:32:01 +0100 Subject: Events.c: drop variable that caused compilation warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes this message when compiling with TEST: Events.c:2725:22: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers] message_data = validateString(NameForAtom(x.u.clientMessage.u.l.longs0)); --- nx-X11/programs/Xserver/hw/nxagent/Events.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'nx-X11/programs') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index a1376092d..071e93b32 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -2693,10 +2693,6 @@ int nxagentHandleClientMessageEvent(XEvent *X, enum HandleEventResult *result) if (message_type == MakeAtom("WM_PROTOCOLS", strlen("WM_PROTOCOLS"), False)) { - #ifdef TEST - char *message_data; - #endif - xEvent x; memset(&x, 0, sizeof(xEvent)); @@ -2720,11 +2716,9 @@ int nxagentHandleClientMessageEvent(XEvent *X, enum HandleEventResult *result) #ifdef TEST else { - message_data = validateString(NameForAtom(x.u.clientMessage.u.l.longs0)); + fprintf(stderr, "nxagentHandleClientMessageEvent: Sent client message of type WM_PROTOCOLS " + "and value [%s].\n", validateString(NameForAtom(x.u.clientMessage.u.l.longs0))); } - - fprintf(stderr, "nxagentHandleClientMessageEvent: Sent client message of type WM_PROTOCOLS " - "and value [%s].\n", message_data); #endif TryClientEvents(wClient(pWin), &x, 1, 1, 1, 0); -- cgit v1.2.3