XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-03-24 10:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

xf86bigfont: ProcXF86BigfontQueryFont(): use x_rpcbuf_t

Browse Source 
Use x_rpcbuf_t instead of our own local buffer for the reply
payload assembly and byte-swapping.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-08-14 18:59:56 +02:00
committed by Enrico Weigelt
parent 64996477f5
commit 2c2ce8bfea
1 changed files with 25 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
Xext/xf86bigfont.c
View File

@@ -296,6 +296,15 @@ swapCharInfo(xCharInfo * pCI)
swaps(&pCI->attributes);
}
static inline void writeCharInfo(x_rpcbuf_t *rpcbuf, xCharInfo CI) {
x_rpcbuf_write_INT16(rpcbuf, CI.leftSideBearing);
x_rpcbuf_write_INT16(rpcbuf, CI.rightSideBearing);
x_rpcbuf_write_INT16(rpcbuf, CI.characterWidth);
x_rpcbuf_write_INT16(rpcbuf, CI.ascent);
x_rpcbuf_write_INT16(rpcbuf, CI.descent);
x_rpcbuf_write_CARD16(rpcbuf, CI.attributes);
}
/* static CARD32 hashCI (xCharInfo *p); */
#define hashCI(p) \
(CARD32)(((p->leftSideBearing << 27) + (p->leftSideBearing >> 5) + \
@@ -563,53 +572,27 @@ ProcXF86BigfontQueryFont(ClientPtr client)
}
int rc = Success;
char *buf = calloc(1, rlength);
if (!buf) {
x_rpcbuf_t rpcbuf = { .swapped = client->swapped, .err_clear = TRUE };
for (int i = 0; i < nfontprops; i++) {
x_rpcbuf_write_CARD32(&rpcbuf, pFont->info.props[i].name);
x_rpcbuf_write_CARD32(&rpcbuf, pFont->info.props[i].value);
}
if (nCharInfos > 0 && shmid == -1) {
for (int i = 0; i < nUniqCharInfos; i++)
writeCharInfo(&rpcbuf, pCI[pUniqIndex2Index[i]]);
x_rpcbuf_write_CARD16s(&rpcbuf, pIndex2UniqIndex, nCharInfos);
}
if (rpcbuf.error) {
rc = BadAlloc;
goto out;
}
char *p = buf;
{
FontPropPtr pFP;
xFontProp *prFP;
int i;
for (i = 0, pFP = pFont->info.props, prFP = (xFontProp *) p;
i < nfontprops; i++, pFP++, prFP++) {
prFP->name = pFP->name;
prFP->value = pFP->value;
if (client->swapped) {
swapl(&prFP->name);
swapl(&prFP->value);
}
}
p = (char *) prFP;
}
if (nCharInfos > 0 && shmid == -1) {
xCharInfo *pci;
CARD16 *ps;
int i, j;
pci = (xCharInfo *) p;
for (i = 0; i < nUniqCharInfos; i++, pci++) {
*pci = pCI[pUniqIndex2Index[i]];
if (client->swapped)
swapCharInfo(pci);
}
ps = (CARD16 *) pci;
for (j = 0; j < nCharInfos; j++, ps++) {
*ps = pIndex2UniqIndex[j];
if (client->swapped) {
swaps(ps);
}
}
}
WriteToClient(client, sizeof(xXF86BigfontQueryFontReply), &rep);
WriteToClient(client, rlength, buf);
free(buf);
WriteRpcbufToClient(client, &rpcbuf);
out:
if (nCharInfos > 0) {
if (shmid == -1)