diff options
| author | Cyril Brulebois <kibi@debian.org> | 2010-11-12 11:36:36 +0100 |
|---|---|---|
| committer | Cyril Brulebois <kibi@debian.org> | 2010-12-07 18:42:44 +0100 |
| commit | 6e8b34b7048bc9e49ef52b81e2de1b518a05890e (patch) | |
| tree | a2743cb1c3c143633bf4d070265feb49977fea09 | |
| parent | ac04c1377a42ab6803adf551756653fd8e1a694b (diff) | |
Replace SecurityLookupIDByType() with dixLookupResourceByType(), take 2.
These occurrences are a bit harder to catch through a semantic patch,
so process them “manually”.
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
| -rw-r--r-- | hw/dmx/dmx.c | 10 | ||||
| -rw-r--r-- | hw/dmx/glxProxy/glxcmds.c | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c index 1dee077b5..f3e41ac17 100644 --- a/hw/dmx/dmx.c +++ b/hw/dmx/dmx.c @@ -231,8 +231,9 @@ static int ProcDMXForceWindowCreation(ClientPtr client) PanoramiXRes *win; int i; - if (!(win = SecurityLookupIDByType(client, stuff->window, XRT_WINDOW, - DixReadAccess))) + if (Success != dixLookupResourceByType((pointer*) &win, + stuff->window, XRT_WINDOW, + client, DixReadAccess)) return -1; /* BadWindow */ FOR_NSCREENS(i) { @@ -506,8 +507,9 @@ static int dmxPopulatePanoramiX(ClientPtr client, Window window, int count = 0; DMXWindowAttributesRec attr; - if (!(win = SecurityLookupIDByType(client, window, XRT_WINDOW, - DixReadAccess))) + if (Success != dixLookupResourceByType((pointer*) &win, + window, XRT_WINDOW, + client, DixReadAccess)) return -1; /* BadWindow */ FOR_NSCREENS(i) { diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c index 4e2e62fa6..0f8e8d8d3 100644 --- a/hw/dmx/glxProxy/glxcmds.c +++ b/hw/dmx/glxProxy/glxcmds.c @@ -3074,7 +3074,10 @@ int __glXQueryContextInfoEXT(__GLXclientState *cl, GLbyte *pc) int nReplyBytes; req = (xGLXQueryContextInfoEXTReq *)pc; - ctx = (__GLXcontext *) SecurityLookupIDByType(client, req->context, __glXContextRes, DixReadAccess); + dixLookupResourceByType((pointer*) &ctx, + req->context, __glXContextRes, + client, DixReadAccess); + if (!ctx) { client->errorValue = req->context; return __glXBadContext; |