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

Xace: clean up XaceHookDispatch() declaration 

Overloading real function name with macro makes it unnecessarily
complicated. Just rename the real function.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1556>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-05-15 20:20:10 +02:00 committed by Marge Bot
parent 3e0a4ab712
commit 632a48a057
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Xext/xace.c
View File

@ -33,9 +33,8 @@ CallbackListPtr XaceHooks[XACE_NUM_HOOKS] = { 0 };
/* Special-cased hook functions. Called by Xserver. /* Special-cased hook functions. Called by Xserver.
*/ */
#undef XaceHookDispatch
int int
XaceHookDispatch(ClientPtr client, int major) XaceHookDispatch0(ClientPtr client, int major)
{ {
/* Call the extension dispatch hook */ /* Call the extension dispatch hook */
ExtensionEntry *ext = GetExtensionEntry(major); ExtensionEntry *ext = GetExtensionEntry(major);

4
Xext/xace.h
View File

@ -68,10 +68,10 @@ int XaceHookIsSet(int hook);
/* Special-cased hook functions /* Special-cased hook functions
*/ */
int XaceHookDispatch(ClientPtr ptr, int major); int XaceHookDispatch0(ClientPtr ptr, int major);
#define XaceHookDispatch(c, m) \ #define XaceHookDispatch(c, m) \
((XaceHooks[XACE_EXT_DISPATCH] && (m) >= EXTENSION_BASE) ? \ ((XaceHooks[XACE_EXT_DISPATCH] && (m) >= EXTENSION_BASE) ? \
XaceHookDispatch((c), (m)) : \ XaceHookDispatch0((c), (m)) : \
Success) Success)
int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin, PropertyPtr *ppProp, int XaceHookPropertyAccess(ClientPtr ptr, WindowPtr pWin, PropertyPtr *ppProp,