diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-20 15:26:41 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-20 15:26:41 +0000 |
| commit | f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23 (patch) | |
| tree | c76e9cb708483e65b114c08ed008880f478cae15 /xorg-server/dix/dixutils.c | |
| parent | b16c0295c9f95426980d567e93ae00c52545b3fa (diff) | |
| parent | 3319741e6f9fc3232eb40462a261271b9af2dcb2 (diff) | |
| download | vcxsrv-f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23.tar.gz vcxsrv-f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23.tar.bz2 vcxsrv-f5fb2d27f1fd4976f0e77d97461a5e57ba6c9a23.zip | |
svn merge "^/branches/released" .
Diffstat (limited to 'xorg-server/dix/dixutils.c')
| -rw-r--r-- | xorg-server/dix/dixutils.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/xorg-server/dix/dixutils.c b/xorg-server/dix/dixutils.c index 9d5eb78eb..6b6b41d0d 100644 --- a/xorg-server/dix/dixutils.c +++ b/xorg-server/dix/dixutils.c @@ -231,9 +231,7 @@ dixLookupWindow(WindowPtr *pWin, XID id, ClientPtr client, Mask access) int
dixLookupGC(GCPtr *pGC, XID id, ClientPtr client, Mask access)
{
- int rc;
- rc = dixLookupResourceByType((pointer *)pGC, id, RT_GC, client, access);
- return (rc == BadValue) ? BadGC : rc;
+ return dixLookupResourceByType((pointer *)pGC, id, RT_GC, client, access);
}
int
@@ -243,10 +241,10 @@ dixLookupFontable(FontPtr *pFont, XID id, ClientPtr client, Mask access) GC *pGC;
client->errorValue = id; /* EITHER font or gc */
rc = dixLookupResourceByType((pointer *) pFont, id, RT_FONT, client, access);
- if (rc != BadValue)
+ if (rc != BadFont)
return rc;
rc = dixLookupResourceByType((pointer *) &pGC, id, RT_GC, client, access);
- if (rc == BadValue)
+ if (rc == BadGC)
return BadFont;
if (rc == Success)
*pFont = pGC->font;
|