[PATCH 04/12] dix: use a single return statement in CheckPassiveGrabsOnWindow

Peter Hutterer peter.hutterer at who-t.net
Mon Nov 7 13:39:08 PST 2011


No functional change.

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 dix/events.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dix/events.c b/dix/events.c
index 2e5eafc..0269ebe 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3787,14 +3787,13 @@ CheckPassiveGrabsOnWindow(
         }
 
         if (!activate)
-        {
-            return grab;
-        }
+            break;
         else if (!GetXIType(event) && !GetCoreType(event))
         {
             ErrorF("Event type %d in CheckPassiveGrabsOnWindow is neither"
                    " XI 1.x nor core\n", event->any.type);
-            return NULL;
+            grab = NULL;
+            break;
         }
 
         /* The only consumers of corestate are Xi 1.x and core events, which
@@ -3860,9 +3859,10 @@ CheckPassiveGrabsOnWindow(
         }
 
         free(xE);
-        return grab;
+        break;
     }
-    return NULL;
+
+    return grab;
 #undef CORE_MATCH
 #undef XI_MATCH
 #undef XI2_MATCH
-- 
1.7.7



More information about the xorg-devel mailing list