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

Xext: use EXT_MASK macro instead of manual & 0x7f 

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Peter Hutterer 2011-04-07 08:43:13 +10:00
parent b28a1af55c
commit 7aad7dbf40
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Xext/geext.c
View File

@ -49,6 +49,7 @@ static const int version_requests[] = {
static void SGEGenericEvent(xEvent* from, xEvent* to); static void SGEGenericEvent(xEvent* from, xEvent* to);
#define NUM_VERSION_REQUESTS (sizeof (version_requests) / sizeof (version_requests[0])) #define NUM_VERSION_REQUESTS (sizeof (version_requests) / sizeof (version_requests[0]))
#define EXT_MASK(ext) ((ext) & 0x7F)
/************************************************************/ /************************************************************/
/* request handlers */ /* request handlers */
@ -191,8 +192,8 @@ SGEGenericEvent(xEvent* from, xEvent* to)
return; return;
} }
if (GEExtensions[gefrom->extension & 0x7F].evswap) if (GEExtensions[EXT_MASK(gefrom->extension)].evswap)
GEExtensions[gefrom->extension & 0x7F].evswap(gefrom, geto); GEExtensions[EXT_MASK(gefrom->extension)].evswap(gefrom, geto);
} }
/* Init extension, register at server. /* Init extension, register at server.
@ -241,11 +242,11 @@ void
GERegisterExtension(int extension, GERegisterExtension(int extension,
void (*ev_swap)(xGenericEvent* from, xGenericEvent* to)) void (*ev_swap)(xGenericEvent* from, xGenericEvent* to))
{ {
if ((extension & 0x7F) >= MAXEXTENSIONS) if (EXT_MASK(extension) >= MAXEXTENSIONS)
FatalError("GE: extension > MAXEXTENSIONS. This should not happen.\n"); FatalError("GE: extension > MAXEXTENSIONS. This should not happen.\n");
/* extension opcodes are > 128, might as well save some space here */ /* extension opcodes are > 128, might as well save some space here */
GEExtensions[extension & 0x7f].evswap = ev_swap; GEExtensions[EXT_MASK(extension)].evswap = ev_swap;
} }