From 5c3404c619239f4170fba91e212afdfd6d0d843b Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Thu, 6 Mar 2025 16:05:24 +0100 Subject: [PATCH] include/resource.h: replace RESOURCE_CLIENT_BITS by ResourceClientBits() We can write down the function name directly. Nobody else than a few define's in here using that macro. Signed-off-by: Enrico Weigelt, metux IT consult --- include/resource.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/resource.h b/include/resource.h index 5993c7ef5..90c2b6760 100644 --- a/include/resource.h +++ b/include/resource.h @@ -102,15 +102,13 @@ typedef uint32_t RESTYPE; extern _X_EXPORT unsigned int ResourceClientBits(void); /* bits and fields within a resource id */ #define RESOURCE_AND_CLIENT_COUNT 29 /* 29 bits for XIDs */ -#define RESOURCE_CLIENT_BITS ResourceClientBits() /* client field offset */ -#define CLIENTOFFSET (RESOURCE_AND_CLIENT_COUNT - RESOURCE_CLIENT_BITS) +#define CLIENTOFFSET (RESOURCE_AND_CLIENT_COUNT - ResourceClientBits()) /* resource field */ #define RESOURCE_ID_MASK ((1 << CLIENTOFFSET) - 1) /* client field */ -#define RESOURCE_CLIENT_MASK (((1 << RESOURCE_CLIENT_BITS) - 1) << CLIENTOFFSET) +#define RESOURCE_CLIENT_MASK (((1 << ResourceClientBits()) - 1) << CLIENTOFFSET) /* extract the client mask from an XID */ #define CLIENT_BITS(id) ((id) & RESOURCE_CLIENT_MASK) -/* extract the client id from an XID */ #define SERVER_BIT (Mask)0x40000000 /* use illegal bit */ #ifdef INVALID