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

(!1893) dix: write out X_InternAtom reply directly 

No need for using a complex callback machinery, if we just move the
little pieces of byte-swapping directly into the request handler.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-04-03 17:45:35 +02:00
parent 5682ffe50d
commit 4e5c48b48f
4 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dix/dispatch.c
View File

@ -1090,18 +1090,22 @@ ProcInternAtom(ClientPtr client)
} }
tchar = (char *) &stuff[1]; tchar = (char *) &stuff[1];
atom = MakeAtom(tchar, stuff->nbytes, !stuff->onlyIfExists); atom = MakeAtom(tchar, stuff->nbytes, !stuff->onlyIfExists);
if (atom != BAD_RESOURCE) { if (atom == BAD_RESOURCE)
xInternAtomReply reply = { return BadAlloc;
xInternAtomReply rep = {
.type = X_Reply, .type = X_Reply,
.sequenceNumber = client->sequence, .sequenceNumber = client->sequence,
.length = 0, .length = 0,
.atom = atom .atom = atom
}; };
WriteReplyToClient(client, sizeof(xInternAtomReply), &reply);
return Success; if (client->swapped) {
swaps(&rep.sequenceNumber);
swapl(&rep.atom);
} }
else WriteToClient(client, sizeof(rep), &rep);
return BadAlloc; return Success;
} }
int int

8
dix/swaprep.c
View File

@ -183,14 +183,6 @@ SGenericReply(ClientPtr pClient, int size, xGenericReply * pRep)
WriteToClient(pClient, size, pRep); WriteToClient(pClient, size, pRep);
} }
void _X_COLD
SInternAtomReply(ClientPtr pClient, int size, xInternAtomReply * pRep)
{
swaps(&pRep->sequenceNumber);
swapl(&pRep->atom);
WriteToClient(pClient, size, pRep);
}
void _X_COLD void _X_COLD
SGetAtomNameReply(ClientPtr pClient, int size, xGetAtomNameReply * pRep) SGetAtomNameReply(ClientPtr pClient, int size, xGetAtomNameReply * pRep)
{ {

2
dix/tables.c
View File

@ -731,7 +731,7 @@ ReplySwapPtr ReplySwapVector[256] = {
ReplyNotSwappd, ReplyNotSwappd,
ReplyNotSwappd, ReplyNotSwappd,
ReplyNotSwappd, /* 15 */ ReplyNotSwappd, /* 15 */
(ReplySwapPtr) SInternAtomReply, ReplyNotSwappd,
(ReplySwapPtr) SGetAtomNameReply, (ReplySwapPtr) SGetAtomNameReply,
ReplyNotSwappd, ReplyNotSwappd,
ReplyNotSwappd, ReplyNotSwappd,

4
include/swaprep.h
View File

@ -42,10 +42,6 @@ extern void SGenericReply(ClientPtr /* pClient */ ,
int /* size */ , int /* size */ ,
xGenericReply * /* pRep */ ); xGenericReply * /* pRep */ );
extern void SInternAtomReply(ClientPtr /* pClient */ ,
int /* size */ ,
xInternAtomReply * /* pRep */ );
extern void SGetAtomNameReply(ClientPtr /* pClient */ , extern void SGetAtomNameReply(ClientPtr /* pClient */ ,
int /* size */ , int /* size */ ,
xGetAtomNameReply * /* pRep */ ); xGetAtomNameReply * /* pRep */ );