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

Xext: fix shadow warnings 

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Yaakov Selkowitz 2012-10-27 21:50:01 -05:00
parent 20cf7918ed
commit d631dbe9b6
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Xext/shm.c
View File

@ -135,11 +135,11 @@ static ShmFuncs fbFuncs = { fbShmCreatePixmap, NULL };
#define VERIFY_SHMSEG(shmseg,shmdesc,client) \ #define VERIFY_SHMSEG(shmseg,shmdesc,client) \
{ \ { \
int rc; \ int tmprc; \
rc = dixLookupResourceByType((pointer *)&(shmdesc), shmseg, ShmSegType, \ tmprc = dixLookupResourceByType((pointer *)&(shmdesc), shmseg, ShmSegType, \
client, DixReadAccess); \ client, DixReadAccess); \
if (rc != Success) \ if (tmprc != Success) \
return rc; \ return tmprc; \
} }
#define VERIFY_SHMPTR(shmseg,offset,needwrite,shmdesc,client) \ #define VERIFY_SHMPTR(shmseg,offset,needwrite,shmdesc,client) \

12
Xext/xace.c
View File

@ -47,18 +47,18 @@ XaceHookDispatch(ClientPtr client, int major)
if (major < 128) { if (major < 128) {
/* Call the core dispatch hook */ /* Call the core dispatch hook */
XaceCoreDispatchRec rec = { client, Success /* default allow */ }; XaceCoreDispatchRec drec = { client, Success /* default allow */ };
CallCallbacks(&XaceHooks[XACE_CORE_DISPATCH], &rec); CallCallbacks(&XaceHooks[XACE_CORE_DISPATCH], &drec);
return rec.status; return drec.status;
} }
else { else {
/* Call the extension dispatch hook */ /* Call the extension dispatch hook */
ExtensionEntry *ext = GetExtensionEntry(major); ExtensionEntry *ext = GetExtensionEntry(major);
XaceExtAccessRec rec = { client, ext, DixUseAccess, Success }; XaceExtAccessRec erec = { client, ext, DixUseAccess, Success };
if (ext) if (ext)
CallCallbacks(&XaceHooks[XACE_EXT_DISPATCH], &rec); CallCallbacks(&XaceHooks[XACE_EXT_DISPATCH], &erec);
/* On error, pretend extension doesn't exist */ /* On error, pretend extension doesn't exist */
return (rec.status == Success) ? Success : BadRequest; return (erec.status == Success) ? Success : BadRequest;
} }
} }