From 4acf999c294868a44e559d212c6d88a4978256b2 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri, 4 Nov 2011 15:37:32 +1000
Subject: [PATCH] dix: use a single return statement in
 CheckPassiveGrabsOnWindow

No functional change.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
---
 dix/events.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/dix/events.c b/dix/events.c
index 35b446b2b..4847db005 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3788,14 +3788,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
@@ -3861,9 +3860,10 @@ CheckPassiveGrabsOnWindow(
         }
 
         free(xE);
-        return grab;
+        break;
     }
-    return NULL;
+
+    return grab;
 #undef CORE_MATCH
 #undef XI_MATCH
 #undef XI2_MATCH