From 93a378aad4a4a03f37ddafccfedeb9d6e2be2a6a Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 12 Jun 2012 22:29:51 -0700 Subject: [PATCH 1/3] OtherClientGone: Remove unreachable return statement Now that FatalError is marked as _X_NORETURN, the compilers know we can't get here, and the return statement added to make them happy in the past now makes them unhappy. Signed-off-by: Alan Coopersmith Reviewed-by: Peter Hutterer Reviewed-by: Keith Packard --- dix/events.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dix/events.c b/dix/events.c index 49894fa26..f571329d0 100644 --- a/dix/events.c +++ b/dix/events.c @@ -4325,7 +4325,6 @@ OtherClientGone(pointer value, XID id) prev = other; } FatalError("client not on event list"); - /*NOTREACHED*/ return -1; /* make compiler happy */ } int From 687536b1044a3297f6b9a45f6a2d2987daa7be59 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 12 Jun 2012 22:38:46 -0700 Subject: [PATCH 2/3] Fix some overly indented/poorly line wrapped comments in dix/events.c Signed-off-by: Alan Coopersmith Reviewed-by: Peter Hutterer Reviewed-by: Keith Packard --- dix/events.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/dix/events.c b/dix/events.c index f571329d0..89877a144 100644 --- a/dix/events.c +++ b/dix/events.c @@ -4347,12 +4347,10 @@ EventSelectForWindow(WindowPtr pWin, ClientPtr client, Mask mask) return rc; } check = (mask & AtMostOneClient); - if (check & (pWin->eventMask | wOtherEventMasks(pWin))) { /* It is illegal for two different - clients to select on any of the - events for AtMostOneClient. However, - it is OK, for some client to - continue selecting on one of those - events. */ + if (check & (pWin->eventMask | wOtherEventMasks(pWin))) { + /* It is illegal for two different clients to select on any of the + events for AtMostOneClient. However, it is OK, for some client to + continue selecting on one of those events. */ if ((wClient(pWin) != client) && (check & pWin->eventMask)) return BadAccess; for (others = wOtherClients(pWin); others; others = others->next) { @@ -5632,8 +5630,8 @@ DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources) if (IsKeyboardDevice(keybd)) { focus = keybd->focus; - /* If the focus window is a root window (ie. has no parent) then don't - delete the focus from it. */ + /* If the focus window is a root window (ie. has no parent) + then don't delete the focus from it. */ if ((pWin == focus->win) && (pWin->parent != NullWindow)) { int focusEventMode = NotifyNormal; @@ -5655,12 +5653,12 @@ DeleteWindowFromAnyEvents(WindowPtr pWin, Bool freeResources) parent = parent->parent; focus->traceGood--; } while (!parent->realized - /* This would be a good protocol change -- windows being reparented - during SaveSet processing would cause the focus to revert to the - nearest enclosing window which will survive the death of the exiting - client, instead of ending up reverting to a dying window and thence - to None - */ + /* This would be a good protocol change -- windows being + reparented during SaveSet processing would cause the + focus to revert to the nearest enclosing window which + will survive the death of the exiting client, instead + of ending up reverting to a dying window and thence + to None */ #ifdef NOTDEF || wClient(parent)->clientGone #endif From ff541e0a1f84bd98966148793f35afeaf71c271b Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Wed, 13 Jun 2012 21:20:51 -0700 Subject: [PATCH 3/3] Remove obsolete tab stop comments from hw/xfree86/parser/*.c Signed-off-by: Alan Coopersmith Reviewed-by: Peter Hutterer --- hw/xfree86/parser/Device.c | 2 -- hw/xfree86/parser/Files.c | 2 -- hw/xfree86/parser/Flags.c | 2 -- hw/xfree86/parser/Input.c | 2 -- hw/xfree86/parser/InputClass.c | 2 -- hw/xfree86/parser/Layout.c | 2 -- hw/xfree86/parser/Module.c | 2 -- hw/xfree86/parser/Monitor.c | 2 -- hw/xfree86/parser/Pointer.c | 2 -- hw/xfree86/parser/Screen.c | 2 -- hw/xfree86/parser/Vendor.c | 2 -- hw/xfree86/parser/Video.c | 2 -- hw/xfree86/parser/read.c | 2 -- hw/xfree86/parser/scan.c | 2 -- hw/xfree86/parser/write.c | 2 -- 15 files changed, 30 deletions(-) diff --git a/hw/xfree86/parser/Device.c b/hw/xfree86/parser/Device.c index f27b56fef..bb1ba88fb 100644 --- a/hw/xfree86/parser/Device.c +++ b/hw/xfree86/parser/Device.c @@ -52,8 +52,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* View/edit this file with tab stops set to 4 */ - #ifdef HAVE_XORG_CONFIG_H #include #endif diff --git a/hw/xfree86/parser/Files.c b/hw/xfree86/parser/Files.c index d8152c008..0d3e47ac5 100644 --- a/hw/xfree86/parser/Files.c +++ b/hw/xfree86/parser/Files.c @@ -51,8 +51,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* View/edit this file with tab stops set to 4 */ - #ifdef HAVE_XORG_CONFIG_H #include #endif diff --git a/hw/xfree86/parser/Flags.c b/hw/xfree86/parser/Flags.c index 29a60a2e1..2461476d1 100644 --- a/hw/xfree86/parser/Flags.c +++ b/hw/xfree86/parser/Flags.c @@ -51,8 +51,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* View/edit this file with tab stops set to 4 */ - #ifdef HAVE_XORG_CONFIG_H #include #endif diff --git a/hw/xfree86/parser/Input.c b/hw/xfree86/parser/Input.c index 6e0073437..ff2b9acbc 100644 --- a/hw/xfree86/parser/Input.c +++ b/hw/xfree86/parser/Input.c @@ -52,8 +52,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* View/edit this file with tab stops set to 4 */ - #ifdef HAVE_XORG_CONFIG_H #include #endif diff --git a/hw/xfree86/parser/InputClass.c b/hw/xfree86/parser/InputClass.c index 8493685cd..de6a816ea 100644 --- a/hw/xfree86/parser/InputClass.c +++ b/hw/xfree86/parser/InputClass.c @@ -23,8 +23,6 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -/* View/edit this file with tab stops set to 4 */ - #ifdef HAVE_XORG_CONFIG_H #include #endif diff --git a/hw/xfree86/parser/Layout.c b/hw/xfree86/parser/Layout.c index bd33d6dfc..cbd8d247a 100644 --- a/hw/xfree86/parser/Layout.c +++ b/hw/xfree86/parser/Layout.c @@ -52,8 +52,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* View/edit this file with tab stops set to 4 */ - #ifdef HAVE_XORG_CONFIG_H #include #endif diff --git a/hw/xfree86/parser/Module.c b/hw/xfree86/parser/Module.c index 1c458ae6c..87ddfc635 100644 --- a/hw/xfree86/parser/Module.c +++ b/hw/xfree86/parser/Module.c @@ -52,8 +52,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* View/edit this file with tab stops set to 4 */ - #ifdef HAVE_XORG_CONFIG_H #include #endif diff --git a/hw/xfree86/parser/Monitor.c b/hw/xfree86/parser/Monitor.c index b237dfb32..36b4ebe35 100644 --- a/hw/xfree86/parser/Monitor.c +++ b/hw/xfree86/parser/Monitor.c @@ -52,8 +52,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* View/edit this file with tab stops set to 4 */ - #ifdef HAVE_XORG_CONFIG_H #include #endif diff --git a/hw/xfree86/parser/Pointer.c b/hw/xfree86/parser/Pointer.c index cdbc09c1a..ff748d99a 100644 --- a/hw/xfree86/parser/Pointer.c +++ b/hw/xfree86/parser/Pointer.c @@ -52,8 +52,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* View/edit this file with tab stops set to 4 */ - #ifdef HAVE_XORG_CONFIG_H #include #endif diff --git a/hw/xfree86/parser/Screen.c b/hw/xfree86/parser/Screen.c index 71778d88d..f294ec490 100644 --- a/hw/xfree86/parser/Screen.c +++ b/hw/xfree86/parser/Screen.c @@ -52,8 +52,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* View/edit this file with tab stops set to 4 */ - #ifdef HAVE_XORG_CONFIG_H #include #endif diff --git a/hw/xfree86/parser/Vendor.c b/hw/xfree86/parser/Vendor.c index b4e2165b0..9b7695c8e 100644 --- a/hw/xfree86/parser/Vendor.c +++ b/hw/xfree86/parser/Vendor.c @@ -52,8 +52,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* View/edit this file with tab stops set to 4 */ - #ifdef HAVE_XORG_CONFIG_H #include #endif diff --git a/hw/xfree86/parser/Video.c b/hw/xfree86/parser/Video.c index fc1f1e544..68d611ae7 100644 --- a/hw/xfree86/parser/Video.c +++ b/hw/xfree86/parser/Video.c @@ -52,8 +52,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* View/edit this file with tab stops set to 4 */ - #ifdef HAVE_XORG_CONFIG_H #include #endif diff --git a/hw/xfree86/parser/read.c b/hw/xfree86/parser/read.c index eef873e89..6545bcdae 100644 --- a/hw/xfree86/parser/read.c +++ b/hw/xfree86/parser/read.c @@ -52,8 +52,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* View/edit this file with tab stops set to 4 */ - #ifdef HAVE_XORG_CONFIG_H #include #endif diff --git a/hw/xfree86/parser/scan.c b/hw/xfree86/parser/scan.c index 795da615f..f852b83ec 100644 --- a/hw/xfree86/parser/scan.c +++ b/hw/xfree86/parser/scan.c @@ -51,8 +51,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* View/edit this file with tab stops set to 4 */ - #ifdef HAVE_XORG_CONFIG_H #include #endif diff --git a/hw/xfree86/parser/write.c b/hw/xfree86/parser/write.c index c001c3d51..9c706a062 100644 --- a/hw/xfree86/parser/write.c +++ b/hw/xfree86/parser/write.c @@ -51,8 +51,6 @@ * authorization from the copyright holder(s) and author(s). */ -/* View/edit this file with tab stops set to 4 */ - #ifdef HAVE_XORG_CONFIG_H #include #endif