From c32b5b4d5ba189d39ffaf41dc38bf6b695704395 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 22 Jul 2025 14:56:08 +0200 Subject: [PATCH] xfixes: use dixGetAtomID() Use the new shortcut helper for cases where we need to check whether an atom exists and retrieve it's ID. Signed-off-by: Enrico Weigelt, metux IT consult --- xfixes/cursor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xfixes/cursor.c b/xfixes/cursor.c index 738d433130..c20f3509d0 100644 --- a/xfixes/cursor.c +++ b/xfixes/cursor.c @@ -413,12 +413,12 @@ ProcXFixesSetCursorName(ClientPtr client) char *tchar; REQUEST(xXFixesSetCursorNameReq); - Atom atom; REQUEST_FIXED_SIZE(xXFixesSetCursorNameReq, stuff->nbytes); VERIFY_CURSOR(pCursor, stuff->cursor, client, DixSetAttrAccess); tchar = (char *) &stuff[1]; - atom = MakeAtom(tchar, stuff->nbytes, TRUE); + tchar[stuff->nbytes] = 0; + Atom atom = dixGetAtomID(tchar); if (atom == BAD_RESOURCE) return BadAlloc; @@ -692,7 +692,6 @@ int ProcXFixesChangeCursorByName(ClientPtr client) { CursorPtr pSource; - Atom name; char *tchar; REQUEST(xXFixesChangeCursorByNameReq); @@ -701,7 +700,8 @@ ProcXFixesChangeCursorByName(ClientPtr client) VERIFY_CURSOR(pSource, stuff->source, client, DixReadAccess | DixGetAttrAccess); tchar = (char *) &stuff[1]; - name = MakeAtom(tchar, stuff->nbytes, FALSE); + tchar[stuff->nbytes] = 0; + Atom name = dixGetAtomID(tchar); if (name) ReplaceCursor(pSource, TestForCursorName, &name); return Success;