From 35c075e2c4f8398ebd73a982848ffe173b560a06 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 8 Aug 2025 14:45:51 +0200 Subject: [PATCH] dix: WriteRpcbufToClient(): fix int type mismatches Use explicit cast to match WriteToClient()'s expectation and return ssize_t, as coming from WriteToClient() Signed-off-by: Enrico Weigelt, metux IT consult --- dix/dix_priv.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dix/dix_priv.h b/dix/dix_priv.h index 13422298e1..745449d164 100644 --- a/dix/dix_priv.h +++ b/dix/dix_priv.h @@ -704,9 +704,13 @@ static inline ClientPtr dixLookupXIDOwner(XID xid) * @param rpcbuf the buffer whose contents will be written * @return the result of WriteToClient() call */ -static inline int WriteRpcbufToClient(ClientPtr pClient, - x_rpcbuf_t *rpcbuf) { - int ret = WriteToClient(pClient, rpcbuf->wpos, rpcbuf->buffer); +static inline ssize_t WriteRpcbufToClient(ClientPtr pClient, + x_rpcbuf_t *rpcbuf) { + /* explicitly casting between (s)size_t and int - should be safe, + since payloads are always small enough to easily fit into int. */ + ssize_t ret = WriteToClient(pClient, + (int)rpcbuf->wpos, + rpcbuf->buffer); x_rpcbuf_clear(rpcbuf); return ret; }