diff options
author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2006-12-15 17:26:58 -0500 |
---|---|---|
committer | Eamon Walsh <ewalsh@moss-huskies.epoch.ncsc.mil> | 2006-12-15 17:26:58 -0500 |
commit | ab1d5b0c31a1cfce95ab6b1d06f209f2c44e19ac (patch) | |
tree | 50eebcf74cd3902b90af50ebf60376821da58725 /Xext | |
parent | f11dafaafc68f5cff1a1538d9566907786d8ab72 (diff) |
Convert callers of LookupClient() to dixLookupClient().
Diffstat (limited to 'Xext')
-rw-r--r-- | Xext/appgroup.c | 7 | ||||
-rw-r--r-- | Xext/sync.c | 20 |
2 files changed, 17 insertions, 10 deletions
diff --git a/Xext/appgroup.c b/Xext/appgroup.c index 134b172f9..bb7a73ce1 100644 --- a/Xext/appgroup.c +++ b/Xext/appgroup.c @@ -485,10 +485,13 @@ int ProcXagQuery( ClientPtr pClient; AppGroupPtr pAppGrp; REQUEST (xXagQueryReq); - int n; + int n, rc; REQUEST_SIZE_MATCH (xXagQueryReq); - pClient = LookupClient (stuff->resource, client); + rc = dixLookupClient(&pClient, stuff->resource, client, DixUnknownAccess); + if (rc != Success) + return rc; + for (pAppGrp = appGrpList; pAppGrp != NULL; pAppGrp = pAppGrp->next) for (n = 0; n < pAppGrp->nclients; n++) if (pAppGrp->clients[n] == pClient) { diff --git a/Xext/sync.c b/Xext/sync.c index 1d899348b..531b48cc1 100644 --- a/Xext/sync.c +++ b/Xext/sync.c @@ -1452,15 +1452,17 @@ ProcSyncSetPriority(client) { REQUEST(xSyncSetPriorityReq); ClientPtr priorityclient; + int rc; REQUEST_SIZE_MATCH(xSyncSetPriorityReq); if (stuff->id == None) priorityclient = client; - else if (!(priorityclient = LookupClient(stuff->id, client))) - { - client->errorValue = stuff->id; - return BadMatch; + else { + rc = dixLookupClient(&priorityclient, stuff->id, client, + DixUnknownAccess); + if (rc != Success) + return rc; } if (priorityclient->priority != stuff->priority) @@ -1487,15 +1489,17 @@ ProcSyncGetPriority(client) REQUEST(xSyncGetPriorityReq); xSyncGetPriorityReply rep; ClientPtr priorityclient; + int rc; REQUEST_SIZE_MATCH(xSyncGetPriorityReq); if (stuff->id == None) priorityclient = client; - else if (!(priorityclient = LookupClient(stuff->id, client))) - { - client->errorValue = stuff->id; - return BadMatch; + else { + rc = dixLookupClient(&priorityclient, stuff->id, client, + DixUnknownAccess); + if (rc != Success) + return rc; } rep.type = X_Reply; |