From 7aed70f14ad8289e199bb31e7d8b60178ea57bb6 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 17 Feb 2017 12:28:05 +0100 Subject: hw/nxagent/NXxvdisp.c: Fix compiler warnings: misleading-indentation NXxvdisp.c: In function 'ProcXvDispatch': NXxvdisp.c:96:9: warning: this 'else' clause does not guard... [-Wmisleading-indentation] else ^~~~ NXxvdisp.c:99:13: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else' break; ^~~~~ NXxvdisp.c:104:9: warning: this 'else' clause does not guard... [-Wmisleading-indentation] else ^~~~ NXxvdisp.c:107:10: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else' break; ^~~~~ NXxvdisp.c:118:2: warning: this 'else' clause does not guard... [-Wmisleading-indentation] else ^~~~ NXxvdisp.c:121:13: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else' break; ^~~~~ NXxvdisp.c:126:2: warning: this 'else' clause does not guard... [-Wmisleading-indentation] else ^~~~ NXxvdisp.c:129:13: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else' break; ^~~~~ NXxvdisp.c:137:2: warning: this 'else' clause does not guard... [-Wmisleading-indentation] else ^~~~ NXxvdisp.c:140:13: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else' break; ^~~~~ NXxvdisp.c:146:2: warning: this 'else' clause does not guard... [-Wmisleading-indentation] else ^~~~ NXxvdisp.c:149:6: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'else' break; ^~~~~ --- nx-X11/programs/Xserver/hw/nxagent/NXxvdisp.c | 28 +++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) 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; -- cgit v1.2.3