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

Remove instances of macros VERIFY_GEOMETRABLE and VERIFY_GC.

This commit is contained in:
Eamon Walsh 2006-12-14 18:27:09 -05:00 committed by Eamon Walsh
parent 51b69ff499
commit 5e334f06a1
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Xext/panoramiXprocs.c
View File

@ -531,10 +531,14 @@ int PanoramiXGetGeometry(ClientPtr client)
{ {
xGetGeometryReply rep; xGetGeometryReply rep;
DrawablePtr pDraw; DrawablePtr pDraw;
int rc;
REQUEST(xResourceReq); REQUEST(xResourceReq);
REQUEST_SIZE_MATCH(xResourceReq); REQUEST_SIZE_MATCH(xResourceReq);
VERIFY_GEOMETRABLE (pDraw, stuff->id, client); rc = dixLookupDrawable(&pDraw, stuff->id, client, M_ANY, DixUnknownAccess);
if (rc != Success)
return rc;
rep.type = X_Reply; rep.type = X_Reply;
rep.length = 0; rep.length = 0;
rep.sequenceNumber = client->sequence; rep.sequenceNumber = client->sequence;

18
Xext/shm.c
View File

@ -727,7 +727,7 @@ ProcPanoramiXShmCreatePixmap(
PixmapPtr pMap = NULL; PixmapPtr pMap = NULL;
DrawablePtr pDraw; DrawablePtr pDraw;
DepthPtr pDepth; DepthPtr pDepth;
int i, j, result; int i, j, result, rc;
ShmDescPtr shmdesc; ShmDescPtr shmdesc;
REQUEST(xShmCreatePixmapReq); REQUEST(xShmCreatePixmapReq);
PanoramiXRes *newPix; PanoramiXRes *newPix;
@ -737,7 +737,11 @@ ProcPanoramiXShmCreatePixmap(
if (!sharedPixmaps) if (!sharedPixmaps)
return BadImplementation; return BadImplementation;
LEGAL_NEW_RESOURCE(stuff->pid, client); LEGAL_NEW_RESOURCE(stuff->pid, client);
VERIFY_GEOMETRABLE(pDraw, stuff->drawable, client); rc = dixLookupDrawable(&pDraw, stuff->drawable, client, M_ANY,
DixUnknownAccess);
if (rc != Success)
return rc;
VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client); VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client);
if (!stuff->width || !stuff->height) if (!stuff->width || !stuff->height)
{ {
@ -1052,9 +1056,9 @@ ProcShmCreatePixmap(client)
register ClientPtr client; register ClientPtr client;
{ {
PixmapPtr pMap; PixmapPtr pMap;
register DrawablePtr pDraw; DrawablePtr pDraw;
DepthPtr pDepth; DepthPtr pDepth;
register int i; register int i, rc;
ShmDescPtr shmdesc; ShmDescPtr shmdesc;
REQUEST(xShmCreatePixmapReq); REQUEST(xShmCreatePixmapReq);
@ -1063,7 +1067,11 @@ ProcShmCreatePixmap(client)
if (!sharedPixmaps) if (!sharedPixmaps)
return BadImplementation; return BadImplementation;
LEGAL_NEW_RESOURCE(stuff->pid, client); LEGAL_NEW_RESOURCE(stuff->pid, client);
VERIFY_GEOMETRABLE(pDraw, stuff->drawable, client); rc = dixLookupDrawable(&pDraw, stuff->drawable, client, M_ANY,
DixUnknownAccess);
if (rc != Success)
return rc;
VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client); VERIFY_SHMPTR(stuff->shmseg, stuff->offset, TRUE, shmdesc, client);
if (!stuff->width || !stuff->height) if (!stuff->width || !stuff->height)
{ {

1
Xext/xf86bigfont.c
View File

@ -447,7 +447,6 @@ ProcXF86BigfontQueryFont(
pFont = (FontPtr)SecurityLookupIDByType(client, stuff->id, RT_FONT, pFont = (FontPtr)SecurityLookupIDByType(client, stuff->id, RT_FONT,
DixReadAccess); DixReadAccess);
if (!pFont) { if (!pFont) {
/* can't use VERIFY_GC because it might return BadGC */
GC *pGC = (GC *) SecurityLookupIDByType(client, stuff->id, RT_GC, GC *pGC = (GC *) SecurityLookupIDByType(client, stuff->id, RT_GC,
DixReadAccess); DixReadAccess);
if (!pGC) { if (!pGC) {

1
dix/dispatch.c
View File

@ -1385,7 +1385,6 @@ ProcQueryFont(register ClientPtr client)
DixReadAccess); DixReadAccess);
if (!pFont) if (!pFont)
{ {
/* can't use VERIFY_GC because it might return BadGC */
pGC = (GC *) SecurityLookupIDByType(client, stuff->id, RT_GC, pGC = (GC *) SecurityLookupIDByType(client, stuff->id, RT_GC,
DixReadAccess); DixReadAccess);
if (!pGC) if (!pGC)