diff options
author | Mihai Moldovan <ionic@ionic.de> | 2017-12-14 10:49:21 +0100 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2017-12-14 10:49:21 +0100 |
commit | 1d301c517e613dbb7e14e8b5fe5552919366fc4e (patch) | |
tree | fbcc0812cafcd14eb4512bb66b751314736671fc /nx-X11/programs/Xserver/hw | |
parent | 91ca51bffc299519f723cc3adeb207bbad8a26c3 (diff) | |
parent | 8bb1579f40bb74b9dad302e79c124541694b3265 (diff) | |
download | nx-libs-1d301c517e613dbb7e14e8b5fe5552919366fc4e.tar.gz nx-libs-1d301c517e613dbb7e14e8b5fe5552919366fc4e.tar.bz2 nx-libs-1d301c517e613dbb7e14e8b5fe5552919366fc4e.zip |
Merge branch 'sunweaver-pr/fix-compiler-warnings' into 3.6.x
Attributes GH PR #333: https://github.com/ArcticaProject/nx-libs/pull/333
Diffstat (limited to 'nx-X11/programs/Xserver/hw')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Events.c | 24 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c | 2 | ||||
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c | 28 |
3 files changed, 33 insertions, 21 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Events.c b/nx-X11/programs/Xserver/hw/nxagent/Events.c index 61d39ee98..c186c1508 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Events.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Events.c @@ -4664,12 +4664,12 @@ void nxagentDumpInputDevicesState(void) } } - fprintf(stderr, "\nKeyboard device state: \n\tdevice [%p]\n\tlast grab time [%lu]" + fprintf(stderr, "\nKeyboard device state: \n\tdevice [%p]\n\tlast grab time [%u]" "\n\tfrozen [%s]\n\tstate [%s]\n\tother [%p]\n\tevent count [%d]" - "\n\tfrom passive grab [%s]\n\tactivating key [%d]", dev, + "\n\tfrom passive grab [%s]\n\tactivating key [%d]", (void *)dev, dev -> grabTime.milliseconds, dev -> sync.frozen ? "Yes": "No", nxagentGrabStateToString(dev -> sync.state), - dev -> sync.other, dev -> sync.evcount, + (void *)dev -> sync.other, dev -> sync.evcount, dev -> fromPassiveGrab ? "Yes" : "No", dev -> activatingKey); @@ -4679,7 +4679,7 @@ void nxagentDumpInputDevicesState(void) { fprintf(stderr, "\nKeyboard grab state: \n\twindow pointer [%p]" "\n\towner events flag [%s]\n\tgrab mode [%s]", - grab -> window, grab -> ownerEvents ? "True" : "False", + (void *)grab -> window, grab -> ownerEvents ? "True" : "False", grab -> keyboardMode ? "asynchronous" : "synchronous"); /* @@ -4693,8 +4693,8 @@ void nxagentDumpInputDevicesState(void) { fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]" "\n\tpointer grab mode [%s]\n\tkeyboard grab mode [%s]\n\tevent type [%d]" - "\n\tmodifiers [%x]\n\tbutton/key [%u]\n\tevent mask [%lx]", - grab -> device, grab -> ownerEvents ? "True" : "False", + "\n\tmodifiers [%x]\n\tbutton/key [%u]\n\tevent mask [%x]", + (void *)grab -> device, grab -> ownerEvents ? "True" : "False", grab -> pointerMode ? "asynchronous" : "synchronous", grab -> keyboardMode ? "asynchronous" : "synchronous", grab -> type, grab -> modifiersDetail.exact, @@ -4724,12 +4724,12 @@ void nxagentDumpInputDevicesState(void) } } - fprintf(stderr, "\nPointer device state: \n\tdevice [%p]\n\tlast grab time [%lu]" + fprintf(stderr, "\nPointer device state: \n\tdevice [%p]\n\tlast grab time [%u]" "\n\tfrozen [%s]\n\tstate [%s]\n\tother [%p]\n\tevent count [%d]" - "\n\tfrom passive grab [%s]\n\tactivating button [%d]", dev, + "\n\tfrom passive grab [%s]\n\tactivating button [%d]", (void *)dev, dev -> grabTime.milliseconds, dev -> sync.frozen ? "Yes" : "No", nxagentGrabStateToString(dev -> sync.state), - dev -> sync.other, dev -> sync.evcount, + (void *)dev -> sync.other, dev -> sync.evcount, dev -> fromPassiveGrab ? "Yes" : "No", dev -> activatingKey); @@ -4739,7 +4739,7 @@ void nxagentDumpInputDevicesState(void) { fprintf(stderr, "\nPointer grab state: \n\twindow pointer [%p]" "\n\towner events flag [%s]\n\tgrab mode [%s]", - grab -> window, grab -> ownerEvents ? "True" : "False", + (void *)grab -> window, grab -> ownerEvents ? "True" : "False", grab -> pointerMode ? "asynchronous" : "synchronous"); if (grab -> window != pWin) @@ -4754,8 +4754,8 @@ void nxagentDumpInputDevicesState(void) { fprintf(stderr, "\nPassive grab state: \n\tdevice [%p]\n\towner events flag [%s]" "\n\tpointer grab mode [%s]\n\tkeyboard grab mode [%s]\n\tevent type [%d]" - "\n\tmodifiers [%x]\n\tbutton/key [%u]\n\tevent mask [%lx]", - grab -> device, grab -> ownerEvents ? "True" : "False", + "\n\tmodifiers [%x]\n\tbutton/key [%u]\n\tevent mask [%x]", + (void *)grab -> device, grab -> ownerEvents ? "True" : "False", grab -> pointerMode ? "asynchronous" : "synchronous", grab -> keyboardMode ? "asynchronous" : "synchronous", grab -> type, grab -> modifiersDetail.exact, diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c index 5792a41c5..1c2cd42ac 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXdispatch.c @@ -309,7 +309,7 @@ Reply Total Cached Bits In Bits Out Bits/Reply Ratio if (!(dispatchException & DE_TERMINATE)) dispatchException = 0; - while (!dispatchException) + while (!dispatchException) { if (*icheck[0] != *icheck[1]) { diff --git a/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c b/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c index ee19c28d0..ea617aa4b 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c +++ b/nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c @@ -95,16 +95,20 @@ ProcXvDispatch(ClientPtr client) result = (XineramaXvPutVideo(client)); else #endif - result = (ProcXvPutVideo(client)); - break; + { + result = (ProcXvPutVideo(client)); + } + break; case xv_PutStill: #ifdef PANORAMIX if(!noPanoramiXExtension) result = (XineramaXvPutStill(client)); else #endif - result = (ProcXvPutStill(client)); - break; + { + result = (ProcXvPutStill(client)); + } + break; case xv_GetVideo: result = (ProcXvGetVideo(client)); break; case xv_GetStill: result = (ProcXvGetStill(client)); break; case xv_GrabPort: result = (ProcXvGrabPort(client)); break; @@ -117,16 +121,20 @@ ProcXvDispatch(ClientPtr client) result = (XineramaXvStopVideo(client)); else #endif + { result = (ProcXvStopVideo(client)); - break; + } + break; case xv_SetPortAttribute: #ifdef PANORAMIX if(!noPanoramiXExtension) result = (XineramaXvSetPortAttribute(client)); else #endif + { result = (ProcXvSetPortAttribute(client)); - break; + } + break; case xv_GetPortAttribute: result = (ProcXvGetPortAttribute(client)); break; case xv_QueryBestSize: result = (ProcXvQueryBestSize(client)); break; case xv_QueryPortAttributes: result = (ProcXvQueryPortAttributes(client)); break; @@ -136,8 +144,10 @@ ProcXvDispatch(ClientPtr client) result = (XineramaXvPutImage(client)); else #endif + { result = (ProcXvPutImage(client)); - break; + } + break; #ifdef MITSHM case xv_ShmPutImage: #ifdef PANORAMIX @@ -145,8 +155,10 @@ ProcXvDispatch(ClientPtr client) result = (XineramaXvShmPutImage(client)); else #endif + { result = (ProcXvShmPutImage(client)); - break; + } + break; #endif case xv_QueryImageAttributes: result = (ProcXvQueryImageAttributes(client)); break; case xv_ListImageFormats: result = (ProcXvListImageFormats(client)); break; |