XLibre/xserver
1
1
Fork 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-04-14 17:18:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

xext: shm: drop SHM_FD_PASSING

Browse Source 
All platforms supporting sysv shared memory (and thus the shm extension)
also support fd passing, thus no need to check for it.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2025-07-30 14:15:37 +02:00
parent 997ef54f86
commit dc0ec5ec22
3 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Xext/shm.c
View File

@@ -356,9 +356,7 @@ ProcShmAttach(ClientPtr client)
shmdesc = calloc(1, sizeof(ShmDescRec));
if (!shmdesc)
return BadAlloc;
#ifdef SHM_FD_PASSING
shmdesc->is_fd = FALSE;
#endif
shmdesc->addr = shmat(stuff->shmid, 0,
stuff->readOnly ? SHM_RDONLY : 0);
if ((shmdesc->addr == ((char *) -1)) || SHMSTAT(stuff->shmid, &buf)) {
@@ -400,13 +398,11 @@ ShmDetachSegment(void *value, /* must conform to DeleteType */
if (--shmdesc->refcnt)
return TRUE;
#if SHM_FD_PASSING
if (shmdesc->is_fd) {
if (shmdesc->busfault)
busfault_unregister(shmdesc->busfault);
munmap(shmdesc->addr, shmdesc->size);
} else
#endif
shmdt(shmdesc->addr);
for (prev = &Shmsegs; *prev != shmdesc; prev = &(*prev)->next);
*prev = shmdesc->next;
@@ -1126,8 +1122,6 @@ ShmCreatePixmap(ClientPtr client, xShmCreatePixmapReq *stuff)
return BadAlloc;
}
#ifdef SHM_FD_PASSING
static void
ShmBusfaultNotify(void *context)
{
@@ -1332,7 +1326,6 @@ ProcShmCreateSegment(ClientPtr client)
return X_SEND_REPLY_SIMPLE(client, reply);
}
#endif /* SHM_FD_PASSING */
static int
ProcShmDispatch(ClientPtr client)
@@ -1352,12 +1345,10 @@ ProcShmDispatch(ClientPtr client)
return ProcShmGetImage(client);
case X_ShmCreatePixmap:
return ProcShmCreatePixmap(client);
#ifdef SHM_FD_PASSING
case X_ShmAttachFd:
return ProcShmAttachFd(client);
case X_ShmCreateSegment:
return ProcShmCreateSegment(client);
#endif
default:
return BadRequest;
}

8
Xext/shmint.h
View File

@@ -56,15 +56,7 @@ typedef struct _ShmFuncs {
void (*PutImage) (XSHM_PUT_IMAGE_ARGS);
} ShmFuncs, *ShmFuncsPtr;
#if XTRANS_SEND_FDS
#define SHM_FD_PASSING 1
#endif
#ifdef SHM_FD_PASSING
#define SHMDESC_IS_FD(shmdesc) ((shmdesc)->is_fd)
#else
#define SHMDESC_IS_FD(shmdesc) (0)
#endif
_X_EXPORT void ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
_X_EXPORT void ShmRegisterFbFuncs(ScreenPtr pScreen);

4
include/protocol-versions.h
View File

@@ -104,11 +104,7 @@
/* SHM */
#define SERVER_SHM_MAJOR_VERSION 1
#if XTRANS_SEND_FDS
#define SERVER_SHM_MINOR_VERSION 2
#else
#define SERVER_SHM_MINOR_VERSION 1
#endif
/* Sync */
#define SERVER_SYNC_MAJOR_VERSION 3