diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2012-10-27 21:50:01 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2012-11-05 13:25:08 -0600 |
| commit | d631dbe9b6a1faa4cd18ab7a4a0276db02b84b77 (patch) | |
| tree | 5abfe2f7d7d34aa2f1610d5b70c111a9aab17698 /Xext | |
| parent | 20cf7918ed954a932a4cc404b3d0c4ca87a6ae16 (diff) | |
Xext: fix shadow warnings
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'Xext')
| -rw-r--r-- | Xext/shm.c | 10 | ||||
| -rw-r--r-- | Xext/xace.c | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/Xext/shm.c b/Xext/shm.c index 3fa04b921..55960907b 100644 --- a/Xext/shm.c +++ b/Xext/shm.c @@ -135,11 +135,11 @@ static ShmFuncs fbFuncs = { fbShmCreatePixmap, NULL }; #define VERIFY_SHMSEG(shmseg,shmdesc,client) \ { \ - int rc; \ - rc = dixLookupResourceByType((pointer *)&(shmdesc), shmseg, ShmSegType, \ - client, DixReadAccess); \ - if (rc != Success) \ - return rc; \ + int tmprc; \ + tmprc = dixLookupResourceByType((pointer *)&(shmdesc), shmseg, ShmSegType, \ + client, DixReadAccess); \ + if (tmprc != Success) \ + return tmprc; \ } #define VERIFY_SHMPTR(shmseg,offset,needwrite,shmdesc,client) \ diff --git a/Xext/xace.c b/Xext/xace.c index b2e7ddaf0..026d3c5cf 100644 --- a/Xext/xace.c +++ b/Xext/xace.c @@ -47,18 +47,18 @@ XaceHookDispatch(ClientPtr client, int major) if (major < 128) { /* Call the core dispatch hook */ - XaceCoreDispatchRec rec = { client, Success /* default allow */ }; - CallCallbacks(&XaceHooks[XACE_CORE_DISPATCH], &rec); - return rec.status; + XaceCoreDispatchRec drec = { client, Success /* default allow */ }; + CallCallbacks(&XaceHooks[XACE_CORE_DISPATCH], &drec); + return drec.status; } else { /* Call the extension dispatch hook */ ExtensionEntry *ext = GetExtensionEntry(major); - XaceExtAccessRec rec = { client, ext, DixUseAccess, Success }; + XaceExtAccessRec erec = { client, ext, DixUseAccess, Success }; if (ext) - CallCallbacks(&XaceHooks[XACE_EXT_DISPATCH], &rec); + CallCallbacks(&XaceHooks[XACE_EXT_DISPATCH], &erec); /* On error, pretend extension doesn't exist */ - return (rec.status == Success) ? Success : BadRequest; + return (erec.status == Success) ? Success : BadRequest; } } |