[PATCH 1/2] dix: Simplify deprecated *Lookup* wrappers around dixLookup*.

[Cyril Brulebois]

As pointed out by Jamey Sharp: “the result pointer is already guaranteed
to be NULL if the return value is not Success”, so get rid of the
variable used to catch the return value, and used in a ternary operation
to decide whether to return the pointer or NULL. Always return the
result pointer instead.

Signed-off-by: Cyril Brulebois <kibi at debian.org>
---
 dix/deprecated.c |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dix/deprecated.c b/dix/deprecated.c
index 21d0f57..4cf596a 100644
--- a/dix/deprecated.c
+++ b/dix/deprecated.c
@@ -65,13 +65,13 @@ WindowPtr
 SecurityLookupWindow(XID id, ClientPtr client, Mask access_mode)
 {
     WindowPtr pWin;
-    int i = dixLookupWindow(&pWin, id, client, access_mode);
     static int warn = 1;
+    dixLookupWindow(&pWin, id, client, access_mode);
     if (warn > 0 && --warn)
 	ErrorF("Warning: LookupWindow()/SecurityLookupWindow() "
 	       "are deprecated.  Please convert your driver/module "
 	       "to use dixLookupWindow().\n");
-    return (i == Success) ? pWin : NULL;
+    return pWin;
 }
 
 /* replaced by dixLookupWindow */
@@ -86,13 +86,13 @@ pointer
 SecurityLookupDrawable(XID id, ClientPtr client, Mask access_mode)
 {
     DrawablePtr pDraw;
-    int i = dixLookupDrawable(&pDraw, id, client, M_DRAWABLE, access_mode);
     static int warn = 1;
+    dixLookupDrawable(&pDraw, id, client, M_DRAWABLE, access_mode);
     if (warn > 0 && --warn)
 	ErrorF("Warning: LookupDrawable()/SecurityLookupDrawable() "
 	       "are deprecated.  Please convert your driver/module "
 	       "to use dixLookupDrawable().\n");
-    return (i == Success) ? pDraw : NULL;
+    return pDraw;
 }
 
 /* replaced by dixLookupDrawable */
@@ -107,12 +107,12 @@ ClientPtr
 LookupClient(XID id, ClientPtr client)
 {
     ClientPtr pClient;
-    int i = dixLookupClient(&pClient, id, client, DixUnknownAccess);
     static int warn = 1;
+    dixLookupClient(&pClient, id, client, DixUnknownAccess);
     if (warn > 0 && --warn)
 	ErrorF("Warning: LookupClient() is deprecated.  Please convert your "
 	       "driver/module to use dixLookupClient().\n");
-    return (i == Success) ? pClient : NULL;
+    return pClient;
 }
 
 /* replaced by dixLookupResourceByType */
@@ -121,13 +121,13 @@ SecurityLookupIDByType(ClientPtr client, XID id, RESTYPE rtype,
 		       Mask access_mode)
 {
     pointer retval;
-    int i = dixLookupResourceByType(&retval, id, rtype, client, access_mode);
     static int warn = 1;
+    dixLookupResourceByType(&retval, id, rtype, client, access_mode);
     if (warn > 0 && --warn)
 	ErrorF("Warning: LookupIDByType()/SecurityLookupIDByType() "
 	       "are deprecated.  Please convert your driver/module "
 	       "to use dixLookupResourceByType().\n");
-    return (i == Success) ? retval : NULL;
+    return retval;
 }
 
 pointer
@@ -135,13 +135,13 @@ SecurityLookupIDByClass(ClientPtr client, XID id, RESTYPE classes,
 			Mask access_mode)
 {
     pointer retval;
-    int i = dixLookupResourceByClass(&retval, id, classes, client, access_mode);
     static int warn = 1;
+    dixLookupResourceByClass(&retval, id, classes, client, access_mode);
     if (warn > 0 && --warn)
 	ErrorF("Warning: LookupIDByClass()/SecurityLookupIDByClass() "
 	       "are deprecated.  Please convert your driver/module "
 	       "to use dixLookupResourceByClass().\n");
-    return (i == Success) ? retval : NULL;
+    return retval;
 }
 
 /* replaced by dixLookupResourceByType */
-- 
1.7.2.3