From: Yaakov Selkowitz <[email protected]>
Signed-off-by: Yaakov Selkowitz <[email protected]>
---
Xext/shm.c | 10 +++++-----
Xext/xace.c | 12 ++++++------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Xext/shm.c b/Xext/shm.c
index 3fa04b9..5596090 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 b2e7dda..026d3c5 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;
}
}
--
1.7.9
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
