frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace SecurityLookupIDByClass() with dixLookupResourceByClass(). 

This patch has been prepared with the following Coccinelle semantic patch:

@@
expression a, b, c, d;
identifier r;
type t;
@@
-r = (t) SecurityLookupIDByClass(a, b, c, d);
+dixLookupResourceByClass((pointer*) &r, b, c, a, d);

The only occurrence not matching directly was processed after separating
declaration of pXinDraw and call to SecurityLookupIDByClass().

Reviewed-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Cyril Brulebois <kibi@debian.org>
This commit is contained in:
Cyril Brulebois 2010-11-12 12:04:11 +01:00
parent 6e8b34b704
commit 73fbc4a4a7
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hw/dmx/glxProxy/glxcmds.c
View File

@ -1104,14 +1104,16 @@ static int MakeCurrent(__GLXclientState *cl,
to_screen = screenInfo.numScreens - 1; to_screen = screenInfo.numScreens - 1;
if (pDraw && new_reply.writeType != GLX_PBUFFER_TYPE) { if (pDraw && new_reply.writeType != GLX_PBUFFER_TYPE) {
pXinDraw = (PanoramiXRes *) dixLookupResourceByClass((pointer*) &pXinDraw,
SecurityLookupIDByClass(client, pDraw->id, XRC_DRAWABLE, DixReadAccess); pDraw->id, XRC_DRAWABLE,
client, DixReadAccess);
} }
if (pReadDraw && pReadDraw != pDraw && if (pReadDraw && pReadDraw != pDraw &&
new_reply.readType != GLX_PBUFFER_TYPE) { new_reply.readType != GLX_PBUFFER_TYPE) {
pXinReadDraw = (PanoramiXRes *) dixLookupResourceByClass((pointer*) &pXinReadDraw,
SecurityLookupIDByClass(client, pReadDraw->id, XRC_DRAWABLE, DixReadAccess); pReadDraw->id, XRC_DRAWABLE,
client, DixReadAccess);
} }
else { else {
pXinReadDraw = pXinDraw; pXinReadDraw = pXinDraw;
@ -1765,8 +1767,9 @@ static int CreateGLXPixmap(__GLXclientState *cl,
from_screen = 0; from_screen = 0;
to_screen = screenInfo.numScreens - 1; to_screen = screenInfo.numScreens - 1;
pXinDraw = (PanoramiXRes *) dixLookupResourceByClass((pointer*) &pXinDraw,
SecurityLookupIDByClass(client, pDraw->id, XRC_DRAWABLE, DixReadAccess); pDraw->id, XRC_DRAWABLE,
client, DixReadAccess);
} }
#endif #endif
@ -2013,8 +2016,9 @@ int __glXDoSwapBuffers(__GLXclientState *cl, XID drawId, GLXContextTag tag)
if (!noPanoramiXExtension) { if (!noPanoramiXExtension) {
from_screen = 0; from_screen = 0;
to_screen = screenInfo.numScreens - 1; to_screen = screenInfo.numScreens - 1;
pXinDraw = (PanoramiXRes *) dixLookupResourceByClass((pointer*) &pXinDraw,
SecurityLookupIDByClass(client, pDraw->id, XRC_DRAWABLE, DixReadAccess); pDraw->id, XRC_DRAWABLE,
client, DixReadAccess);
} }
#endif #endif
@ -3369,9 +3373,9 @@ int __glXGetDrawableAttributes(__GLXclientState *cl, GLbyte *pc)
#ifdef PANORAMIX #ifdef PANORAMIX
if (!noPanoramiXExtension) { if (!noPanoramiXExtension) {
pXinDraw = (PanoramiXRes *) if (Success != dixLookupResourceByClass((pointer*) &pXinDraw,
SecurityLookupIDByClass(client, pDraw->id, XRC_DRAWABLE, DixReadAccess); pDraw->id, XRC_DRAWABLE,
if (!pXinDraw) { client, DixReadAccess)) {
client->errorValue = drawId; client->errorValue = drawId;
return __glXBadDrawable; return __glXBadDrawable;
} }
@ -3533,9 +3537,10 @@ int __glXChangeDrawableAttributes(__GLXclientState *cl, GLbyte *pc)
#ifdef PANORAMIX #ifdef PANORAMIX
if (!noPanoramiXExtension) { if (!noPanoramiXExtension) {
PanoramiXRes *pXinDraw = (PanoramiXRes *) PanoramiXRes *pXinDraw;
SecurityLookupIDByClass(client, pDraw->id, XRC_DRAWABLE, DixReadAccess); if (Success != dixLookupResourceByClass((pointer*) &pXinDraw,
if (!pXinDraw) { pDraw->id, XRC_DRAWABLE,
client, DixReadAccess)) {
client->errorValue = drawId; client->errorValue = drawId;
return __glXBadDrawable; return __glXBadDrawable;
} }