ahill/xlibre-xserver
1
0
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-01-26 05:57:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Xext: shm: use REQUEST_HEAD_STRUCT and REQUEST_FIELD_* macros

Browse Source 
Use the new macros to make request struct parsing / field swapping
much easier.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-07-03 19:31:02 +02:00
parent dcb9329b37
commit f122e2bb86
1 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
Xext/shm.c
View File

@ -238,6 +238,8 @@ ShmRegisterFbFuncs(ScreenPtr pScreen)
static int
ProcShmQueryVersion(ClientPtr client)
{
X_REQUEST_HEAD_STRUCT(xShmQueryVersionReq);
xShmQueryVersionReply reply = {
.sharedPixmaps = sharedPixmaps,
.majorVersion = SERVER_SHM_MAJOR_VERSION,
@ -247,8 +249,6 @@ ProcShmQueryVersion(ClientPtr client)
.pixmapFormat = sharedPixmaps ? ZPixmap : 0
};
REQUEST_SIZE_MATCH(xShmQueryVersionReq);
if (client->swapped) {
swaps(&reply.majorVersion);
swaps(&reply.minorVersion);
@ -328,8 +328,9 @@ shm_access(ClientPtr client, SHMPERM_TYPE * perm, int readonly)
static int
ProcShmAttach(ClientPtr client)
{
REQUEST(xShmAttachReq);
REQUEST_SIZE_MATCH(xShmAttachReq);
X_REQUEST_HEAD_STRUCT(xShmAttachReq);
X_REQUEST_FIELD_CARD32(shmseg);
X_REQUEST_FIELD_CARD32(shmid);
if (!client->local)
return BadRequest;
@ -416,8 +417,8 @@ ShmDetachSegment(void *value, /* must conform to DeleteType */
static int
ProcShmDetach(ClientPtr client)
{
REQUEST(xShmDetachReq);
REQUEST_SIZE_MATCH(xShmDetachReq);
X_REQUEST_HEAD_STRUCT(xShmDetachReq);
X_REQUEST_FIELD_CARD32(shmseg);
if (!client->local)
return BadRequest;
@ -688,8 +689,19 @@ ShmGetImage(ClientPtr client, xShmGetImageReq *stuff)
static int
ProcShmPutImage(ClientPtr client)
{
REQUEST(xShmPutImageReq);
REQUEST_SIZE_MATCH(xShmPutImageReq);
X_REQUEST_HEAD_STRUCT(xShmPutImageReq);
X_REQUEST_FIELD_CARD32(drawable);
X_REQUEST_FIELD_CARD32(gc);
X_REQUEST_FIELD_CARD16(totalWidth);
X_REQUEST_FIELD_CARD16(totalHeight);
X_REQUEST_FIELD_CARD16(srcX);
X_REQUEST_FIELD_CARD16(srcY);
X_REQUEST_FIELD_CARD16(srcWidth);
X_REQUEST_FIELD_CARD16(srcHeight);
X_REQUEST_FIELD_CARD16(dstX);
X_REQUEST_FIELD_CARD16(dstY);
X_REQUEST_FIELD_CARD32(shmseg);
X_REQUEST_FIELD_CARD32(offset);
if (!client->local)
return BadRequest;
@ -742,8 +754,15 @@ ProcShmPutImage(ClientPtr client)
static int
ProcShmGetImage(ClientPtr client)
{
REQUEST(xShmGetImageReq);
REQUEST_SIZE_MATCH(xShmGetImageReq);
X_REQUEST_HEAD_STRUCT(xShmGetImageReq);
X_REQUEST_FIELD_CARD32(drawable);
X_REQUEST_FIELD_CARD16(x);
X_REQUEST_FIELD_CARD16(y);
X_REQUEST_FIELD_CARD16(width);
X_REQUEST_FIELD_CARD16(height);
X_REQUEST_FIELD_CARD32(planeMask);
X_REQUEST_FIELD_CARD32(shmseg);
X_REQUEST_FIELD_CARD32(offset);
if (!client->local)
return BadRequest;
@ -887,8 +906,13 @@ ProcShmGetImage(ClientPtr client)
static int
ProcShmCreatePixmap(ClientPtr client)
{
REQUEST(xShmCreatePixmapReq);
REQUEST_SIZE_MATCH(xShmCreatePixmapReq);
X_REQUEST_HEAD_STRUCT(xShmCreatePixmapReq);
X_REQUEST_FIELD_CARD32(pid);
X_REQUEST_FIELD_CARD32(drawable);
X_REQUEST_FIELD_CARD16(width);
X_REQUEST_FIELD_CARD16(height);
X_REQUEST_FIELD_CARD32(shmseg);
X_REQUEST_FIELD_CARD32(offset);
if (!client->local)
return BadRequest;
@ -1119,8 +1143,8 @@ ShmBusfaultNotify(void *context)
static int
ProcShmAttachFd(ClientPtr client)
{
REQUEST(xShmAttachFdReq);
REQUEST_SIZE_MATCH(xShmAttachFdReq);
X_REQUEST_HEAD_STRUCT(xShmAttachFdReq);
X_REQUEST_FIELD_CARD32(shmseg);
if (!client->local)
return BadRequest;
@ -1238,8 +1262,9 @@ shm_tmpfile(void)
static int
ProcShmCreateSegment(ClientPtr client)
{
REQUEST(xShmCreateSegmentReq);
REQUEST_SIZE_MATCH(xShmCreateSegmentReq);
X_REQUEST_HEAD_STRUCT(xShmCreateSegmentReq);
X_REQUEST_FIELD_CARD32(shmseg);
X_REQUEST_FIELD_CARD32(size);
if (!client->local)
return BadRequest;