From 52c9b59a9fed6abfeca775a7a04133cee18eac0b Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 30 May 2011 09:47:06 +1000
Subject: [PATCH] dix: use 'rc' for return code in DeliverRawEvent

Reported-by: Walter Harms <wharms@bfs.de>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
---
 dix/events.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dix/events.c b/dix/events.c
index 2112a47db..6b74b1aa9 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -2284,14 +2284,14 @@ DeliverRawEvent(RawDeviceEvent *ev, DeviceIntPtr device)
 {
     GrabPtr grab = device->deviceGrab.grab;
     xEvent *xi;
-    int i;
+    int i, rc;
     int filter;
 
-    i = EventToXI2((InternalEvent*)ev, (xEvent**)&xi);
-    if (i != Success)
+    rc = EventToXI2((InternalEvent*)ev, (xEvent**)&xi);
+    if (rc != Success)
     {
         ErrorF("[Xi] %s: XI2 conversion failed in %s (%d)\n",
-                __func__, device->name, i);
+                __func__, device->name, rc);
         return;
     }