hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-11-03 03:24:39 +00:00
Code Issues Projects Releases Wiki Activity

xkb: parentheses around macro argument symbols

Browse source 
For safety, add extra parantheses on each used macro argument.
In most cases not strictly necessary, but better have some strict
and automatically enforcable policy here than wasting time on
judging individual cases.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2026-06-08 17:45:41 +02:00 • committed by Enrico Weigelt
commit 005853953a
5 changed files with 58 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Xext/xkeyboard/XKBMisc.c
View file

@ -40,7 +40,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
/***====================================================================***/ /***====================================================================***/
#define CORE_SYM(i) (i<map_width?core_syms[i]:NoSymbol) #define CORE_SYM(i) ((i)<map_width?core_syms[(i)]:NoSymbol)
#define XKB_OFFSET(g,l) (((g)*groupsWidth)+(l)) #define XKB_OFFSET(g,l) (((g)*groupsWidth)+(l))
int int

4
Xext/xkeyboard/maprules.c
View file

@ -108,9 +108,9 @@ InputLineAddChar(InputLine * line, int ch)
return ch; return ch;
} }
#define ADD_CHAR(l,c) ((l)->num_line<(l)->sz_line?\ #define ADD_CHAR(l,c) (((l)->num_line<(l)->sz_line?\
(int)((l)->line[(l)->num_line++]= (c)):\ (int)((l)->line[(l)->num_line++]= (c)):\
InputLineAddChar(l,c)) InputLineAddChar((l),(c))))
static Bool static Bool
GetInputLine(FILE * file, InputLine * line, Bool checkbang) GetInputLine(FILE * file, InputLine * line, Bool checkbang)

60
Xext/xkeyboard/xkb.c
View file

@ -60,62 +60,62 @@ RESTYPE RT_XKBCLIENT = 0;
#define CHK_DEVICE(dev, id, client, access_mode, lf) {\ #define CHK_DEVICE(dev, id, client, access_mode, lf) {\
int why;\ int why;\
int tmprc = lf(&(dev), id, client, access_mode, &why);\ int tmprc = (lf)(&(dev), (id), (client), (access_mode), &why);\
if (tmprc != Success) {\ if (tmprc != Success) {\
client->errorValue = _XkbErrCode2(why, id);\ (client)->errorValue = _XkbErrCode2(why, (id));\
return tmprc;\ return tmprc;\
}\ }\
} }
#define CHK_KBD_DEVICE(dev, id, client, mode) \ #define CHK_KBD_DEVICE(dev, id, client, mode) \
CHK_DEVICE(dev, id, client, mode, _XkbLookupKeyboard) CHK_DEVICE((dev), (id), (client), (mode), _XkbLookupKeyboard)
#define CHK_LED_DEVICE(dev, id, client, mode) \ #define CHK_LED_DEVICE(dev, id, client, mode) \
CHK_DEVICE(dev, id, client, mode, _XkbLookupLedDevice) CHK_DEVICE((dev), (id), (client), (mode), _XkbLookupLedDevice)
#define CHK_BELL_DEVICE(dev, id, client, mode) \ #define CHK_BELL_DEVICE(dev, id, client, mode) \
CHK_DEVICE(dev, id, client, mode, _XkbLookupBellDevice) CHK_DEVICE((dev), (id), (client), (mode), _XkbLookupBellDevice)
#define CHK_ANY_DEVICE(dev, id, client, mode) \ #define CHK_ANY_DEVICE(dev, id, client, mode) \
CHK_DEVICE(dev, id, client, mode, _XkbLookupAnyDevice) CHK_DEVICE((dev), (id), (client), (mode), _XkbLookupAnyDevice)
#define CHK_ATOM_ONLY2(a,ev,er) {\ #define CHK_ATOM_ONLY2(a,ev,er) {\
if (((a)==None)||(!ValidAtom((a)))) {\ if (((a)==None)||(!ValidAtom((a)))) {\
(ev)= (XID)(a);\ (ev)= (XID)(a);\
return er;\ return (er);\
}\ }\
} }
#define CHK_ATOM_ONLY(a) \ #define CHK_ATOM_ONLY(a) \
CHK_ATOM_ONLY2(a,client->errorValue,BadAtom) CHK_ATOM_ONLY2((a),client->errorValue,BadAtom)
#define CHK_ATOM_OR_NONE3(a,ev,er,ret) {\ #define CHK_ATOM_OR_NONE3(a,ev,er,ret) {\
if (((a)!=None)&&(!ValidAtom((a)))) {\ if (((a)!=None)&&(!ValidAtom((a)))) {\
(ev)= (XID)(a);\ (ev)= (XID)(a);\
(er)= BadAtom;\ (er)= BadAtom;\
return ret;\ return (ret);\
}\ }\
} }
#define CHK_ATOM_OR_NONE2(a,ev,er) {\ #define CHK_ATOM_OR_NONE2(a,ev,er) {\
if (((a)!=None)&&(!ValidAtom((a)))) {\ if (((a)!=None)&&(!ValidAtom((a)))) {\
(ev)= (XID)(a);\ (ev)= (XID)(a);\
return er;\ return (er);\
}\ }\
} }
#define CHK_ATOM_OR_NONE(a) \ #define CHK_ATOM_OR_NONE(a) \
CHK_ATOM_OR_NONE2(a,client->errorValue,BadAtom) CHK_ATOM_OR_NONE2((a),client->errorValue,BadAtom)
#define CHK_MASK_LEGAL3(err,mask,legal,ev,er,ret) {\ #define CHK_MASK_LEGAL3(err,mask,legal,ev,er,ret) {\
if ((mask)&(~(legal))) { \ if ((mask)&(~(legal))) { \
(ev)= _XkbErrCode2((err),((mask)&(~(legal))));\ (ev)= _XkbErrCode2((err),((mask)&(~(legal))));\
(er)= BadValue;\ (er)= BadValue;\
return ret;\ return (ret);\
}\ }\
} }
#define CHK_MASK_LEGAL2(err,mask,legal,ev,er) {\ #define CHK_MASK_LEGAL2(err,mask,legal,ev,er) {\
if ((mask)&(~(legal))) { \ if ((mask)&(~(legal))) { \
(ev)= _XkbErrCode2((err),((mask)&(~(legal))));\ (ev)= _XkbErrCode2((err),((mask)&(~(legal))));\
return er;\ return (er);\
}\ }\
} }
#define CHK_MASK_LEGAL(err,mask,legal) \ #define CHK_MASK_LEGAL(err,mask,legal) \
CHK_MASK_LEGAL2(err,mask,legal,client->errorValue,BadValue) CHK_MASK_LEGAL2((err),(mask),(legal),client->errorValue,BadValue)
#define CHK_MASK_MATCH(err,affect,value) {\ #define CHK_MASK_MATCH(err,affect,value) {\
if ((value)&(~(affect))) { \ if ((value)&(~(affect))) { \
@ -130,30 +130,30 @@ RESTYPE RT_XKBCLIENT = 0;
}\ }\
} }
#define CHK_KEY_RANGE2(err,first,num,x,ev,er) {\ #define CHK_KEY_RANGE2(err,first,num,x,ev,er) {\
if (((unsigned)(first)+(num)-1)>(x)->max_key_code) {\ if (((unsigned)(first)+(num)-1)>(((x)->max_key_code))) {\
(ev)=_XkbErrCode4(err,(first),(num),(x)->max_key_code);\ (ev)=_XkbErrCode4((err),(first),(num),(x)->max_key_code);\
return er;\ return (er);\
}\ }\
else if ( (first)<(x)->min_key_code ) {\ else if ( (first)<(((x)->min_key_code)) ) {\
(ev)=_XkbErrCode3(err+1,(first),xkb->min_key_code);\ (ev)=_XkbErrCode3((err)+1,(first),xkb->min_key_code);\
return er;\ return (er);\
}\ }\
} }
#define CHK_KEY_RANGE(err,first,num,x) \ #define CHK_KEY_RANGE(err,first,num,x) \
CHK_KEY_RANGE2(err,first,num,x,client->errorValue,BadValue) CHK_KEY_RANGE2((err),(first),(num),(x),client->errorValue,BadValue)
#define CHK_REQ_KEY_RANGE2(err,first,num,r,ev,er) {\ #define CHK_REQ_KEY_RANGE2(err,first,num,r,ev,er) {\
if (((unsigned)(first)+(num)-1)>(r)->maxKeyCode) {\ if (((unsigned)(first)+(num)-1)>(((r)->maxKeyCode))) {\
(ev)=_XkbErrCode4(err,(first),(num),(r)->maxKeyCode);\ (ev)=_XkbErrCode4((err),(first),(num),(r)->maxKeyCode);\
return er;\ return (er);\
}\ }\
else if ( (first)<(r)->minKeyCode ) {\ else if ( (first)<(((r)->minKeyCode)) ) {\
(ev)=_XkbErrCode3(err+1,(first),(r)->minKeyCode);\ (ev)=_XkbErrCode3((err)+1,(first),(r)->minKeyCode);\
return er;\ return (er);\
}\ }\
} }
#define CHK_REQ_KEY_RANGE(err,first,num,r) \ #define CHK_REQ_KEY_RANGE(err,first,num,r) \
CHK_REQ_KEY_RANGE2(err,first,num,r,client->errorValue,BadValue) CHK_REQ_KEY_RANGE2((err),(first),(num),(r),client->errorValue,BadValue)
static Bool static Bool
_XkbCheckRequestBounds(ClientPtr client, void *stuff, void *from, void *to) { _XkbCheckRequestBounds(ClientPtr client, void *stuff, void *from, void *to) {
@ -2435,7 +2435,7 @@ SetVirtualModMap(XkbSrvInfoPtr xkbi,
#define _add_check_len(new) \ #define _add_check_len(new) \
if (len > UINT32_MAX - (new) || len > req_len - (new)) goto bad; \ if (len > UINT32_MAX - (new) || len > req_len - (new)) goto bad; \
else len += new else len += (new)
/** /**
* Check the length of the SetMap request * Check the length of the SetMap request
@ -4460,7 +4460,7 @@ ProcXkbSetNames(ClientPtr client)
#include "xkbgeom_priv.h" #include "xkbgeom_priv.h"
#define XkbSizeCountedString(s) ((s)?((((2+strlen(s))+3)/4)*4):4) #define XkbSizeCountedString(s) ((s)?((((2+strlen((s)))+3)/4)*4):4)
/** /**
* Write the zero-terminated string str into wire as a pascal string with a * Write the zero-terminated string str into wire as a pascal string with a

4
Xext/xkeyboard/xkbfmisc.c
View file

@ -149,8 +149,8 @@ XkbWriteSectionFromName(FILE * file, const char *sectionName, const char *name)
return TRUE; return TRUE;
} }
#define NEED_DESC(n) ((!n)||((n)[0]=='+')||((n)[0]=='|')||(strchr((n),'%'))) #define NEED_DESC(n) ((!(n))||((n)[0]=='+')||((n)[0]=='|')||(strchr((n),'%')))
#define COMPLETE(n) ((n)&&(!NEED_DESC(n))) #define COMPLETE(n) ((n)&&(!NEED_DESC((n))))
/* ARGSUSED */ /* ARGSUSED */
static void static void

46
Xext/xkeyboard/xkbsrv_priv.h
View file

@ -42,9 +42,9 @@
#define XkbSetCauseReq(c,j,n,cl) { (c)->kc= (c)->event= 0,\ #define XkbSetCauseReq(c,j,n,cl) { (c)->kc= (c)->event= 0,\
(c)->mjr= (j),(c)->mnr= (n);\ (c)->mjr= (j),(c)->mnr= (n);\
(c)->client= (cl); } (c)->client= (cl); }
#define XkbSetCauseCoreReq(c,e,cl) XkbSetCauseReq(c,e,0,cl) #define XkbSetCauseCoreReq(c,e,cl) XkbSetCauseReq((c),(e),0,(cl))
#define XkbSetCauseXkbReq(c,e,cl) XkbSetCauseReq(c,XkbReqCode,e,cl) #define XkbSetCauseXkbReq(c,e,cl) XkbSetCauseReq((c),XkbReqCode,(e),(cl))
#define XkbSetCauseUnknown(c) XkbSetCauseKey(c,0,0) #define XkbSetCauseUnknown(c) XkbSetCauseKey((c),0,0)
#define XkbSLI_IsDefault (1L<<0) #define XkbSLI_IsDefault (1L<<0)
#define XkbSLI_HasOwnState (1L<<1) #define XkbSLI_HasOwnState (1L<<1)
@ -72,32 +72,32 @@
* statement in this function". lovely. * statement in this function". lovely.
*/ */
#define _XkbErrCode2(a,b) ((XID)((((unsigned int)(a))<<24)|((b)&0xffffff))) #define _XkbErrCode2(a,b) ((XID)((((unsigned int)(a))<<24)|((b)&0xffffff)))
#define _XkbErrCode3(a,b,c) _XkbErrCode2(a,(((unsigned int)(b))<<16)|(c)) #define _XkbErrCode3(a,b,c) _XkbErrCode2((a),(((unsigned int)(b))<<16)|(c))
#define _XkbErrCode4(a,b,c,d) _XkbErrCode3(a,b,((((unsigned int)(c))<<8)|(d))) #define _XkbErrCode4(a,b,c,d) _XkbErrCode3((a),(b),((((unsigned int)(c))<<8)|(d)))
#define WRAP_PROCESS_INPUT_PROC(device, oldprocs, proc, unwrapproc) \ #define WRAP_PROCESS_INPUT_PROC(device, oldprocs, proc, unwrapproc) \
device->public.processInputProc = proc; \ (device)->public.processInputProc = (proc); \
oldprocs->processInputProc = \ (oldprocs)->processInputProc = \
oldprocs->realInputProc = device->public.realInputProc; \ (oldprocs)->realInputProc = (device)->public.realInputProc; \
device->public.realInputProc = proc; \ (device)->public.realInputProc = (proc); \
oldprocs->unwrapProc = device->unwrapProc; \ (oldprocs)->unwrapProc = (device)->unwrapProc; \
device->unwrapProc = unwrapproc; (device)->unwrapProc = (unwrapproc);
#define COND_WRAP_PROCESS_INPUT_PROC(device, oldprocs, proc, unwrapproc) \ #define COND_WRAP_PROCESS_INPUT_PROC(device, oldprocs, proc, unwrapproc) \
if (device->public.processInputProc == device->public.realInputProc)\ if ((device)->public.processInputProc == (device)->public.realInputProc)\
device->public.processInputProc = proc; \ (device)->public.processInputProc = (proc); \
oldprocs->processInputProc = \ (oldprocs)->processInputProc = \
oldprocs->realInputProc = device->public.realInputProc; \ (oldprocs)->realInputProc = (device)->public.realInputProc; \
device->public.realInputProc = proc; \ (device)->public.realInputProc = (proc); \
oldprocs->unwrapProc = device->unwrapProc; \ (oldprocs)->unwrapProc = (device)->unwrapProc; \
device->unwrapProc = unwrapproc; (device)->unwrapProc = (unwrapproc);
#define UNWRAP_PROCESS_INPUT_PROC(device, oldprocs, backupproc) \ #define UNWRAP_PROCESS_INPUT_PROC(device, oldprocs, backupproc) \
backupproc = device->public.realInputProc; \ (backupproc) = (device)->public.realInputProc; \
if (device->public.processInputProc == device->public.realInputProc)\ if ((device)->public.processInputProc == (device)->public.realInputProc)\
device->public.processInputProc = oldprocs->realInputProc; \ (device)->public.processInputProc = (oldprocs)->realInputProc; \
device->public.realInputProc = oldprocs->realInputProc; \ (device)->public.realInputProc = (oldprocs)->realInputProc; \
device->unwrapProc = oldprocs->unwrapProc; (device)->unwrapProc = (oldprocs)->unwrapProc;
extern RESTYPE RT_XKBCLIENT; extern RESTYPE RT_XKBCLIENT;