xserver: Branch 'master' - 3 commits

[Adam Jackson]

 Xext/sync.c         |   12 ++++++------
 dri3/dri3_request.c |    4 ++--
 glx/glxdri2.c       |    2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 7d33ab0f8c7958b205076f71e4b47c24aace77fd
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jun 28 15:54:44 2016 -0400

    dri2: Don't make reference to noClientException
    
    noClientException is now never filled in with a meaningful value, it's
    always -1. The sole caller of this function disregards the error value
    in any case.
    
    Reviewed-by: Eric Anholt <eric at anholt.net>
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index afaf44e..3a95a8f 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -297,7 +297,7 @@ __glXDRIcontextWait(__GLXcontext * baseContext,
     }
 
     if (ret) {
-        *error = cl->client->noClientException;
+        *error = -1;
         return TRUE;
     }
 
commit dff435568b40286df2bf7a66e870f9ae5f4eb9bd
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jun 28 15:54:43 2016 -0400

    dri3: Don't do return client->noClientException
    
    Hasn't been necessary since:
    
        commit 92ed75ac59e2d3af149cddb962efd05fc8487750
        Author: Jamey Sharp <jamey at minilop.net>
        Date:   Mon May 10 20:22:05 2010 -0700
    
            Eliminate boilerplate around client->noClientException.
    
    Reviewed-by: Eric Anholt <eric at anholt.net>
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/dri3/dri3_request.c b/dri3/dri3_request.c
index 35548b6..8c15dbe 100644
--- a/dri3/dri3_request.c
+++ b/dri3/dri3_request.c
@@ -230,7 +230,7 @@ proc_dri3_buffer_from_pixmap(ClientPtr client)
 
     WriteToClient(client, sizeof(rep), &rep);
 
-    return client->noClientException;
+    return Success;
 }
 
 static int
@@ -296,7 +296,7 @@ proc_dri3_fd_from_fence(ClientPtr client)
 
     WriteToClient(client, sizeof(rep), &rep);
 
-    return client->noClientException;
+    return Success;
 }
 
 int (*proc_dri3_vector[DRI3NumberRequests]) (ClientPtr) = {
commit 65493c0b73f6ee65b2a8fcaa4a15b0c453ff72b1
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jun 28 15:54:42 2016 -0400

    sync: Don't do return client->noClientException
    
    Hasn't been necessary since:
    
        commit 92ed75ac59e2d3af149cddb962efd05fc8487750
        Author: Jamey Sharp <jamey at minilop.net>
        Date:   Mon May 10 20:22:05 2010 -0700
    
            Eliminate boilerplate around client->noClientException.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Eric Anholt <eric at anholt.net>

diff --git a/Xext/sync.c b/Xext/sync.c
index 323b9db..6335068 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -1899,7 +1899,7 @@ ProcSyncCreateFence(ClientPtr client)
     if (!AddResource(stuff->fid, RTFence, (void *) pFence))
         return BadAlloc;
 
-    return client->noClientException;
+    return Success;
 }
 
 static int
@@ -1940,7 +1940,7 @@ ProcSyncTriggerFence(ClientPtr client)
 
     miSyncTriggerFence(pFence);
 
-    return client->noClientException;
+    return Success;
 }
 
 static int
@@ -1962,7 +1962,7 @@ ProcSyncResetFence(ClientPtr client)
 
     pFence->funcs.Reset(pFence);
 
-    return client->noClientException;
+    return Success;
 }
 
 static int
@@ -1980,7 +1980,7 @@ ProcSyncDestroyFence(ClientPtr client)
         return rc;
 
     FreeResource(stuff->fid, RT_NONE);
-    return client->noClientException;
+    return Success;
 }
 
 static int
@@ -2012,7 +2012,7 @@ ProcSyncQueryFence(ClientPtr client)
     }
 
     WriteToClient(client, sizeof(xSyncQueryFenceReply), &rep);
-    return client->noClientException;
+    return Success;
 }
 
 static int
@@ -2090,7 +2090,7 @@ ProcSyncAwaitFence(ClientPtr client)
 
     SyncAwaitEpilogue(client, items, pAwaitUnion);
 
-    return client->noClientException;
+    return Success;
 }
 
 /*