xserver: Branch 'master' - 16 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Feb 18 11:14:39 UTC 2025
Xext/security.c | 1 +
Xext/shm.c | 1 +
Xext/xace.c | 3 +++
Xext/xtest.c | 1 +
dri3/dri3_request.c | 1 +
glx/glxext.c | 3 +++
hw/kdrive/ephyr/ephyr.c | 1 +
hw/xfree86/dri2/dri2.c | 3 +++
hw/xnest/Display.c | 1 +
hw/xquartz/darwinEvents.c | 1 +
hw/xwayland/xwayland-drm-lease.c | 2 ++
hw/xwayland/xwayland-screen.c | 1 +
hw/xwayland/xwayland.c | 1 +
include/os.h | 39 ---------------------------------------
os/WaitFor.c | 1 +
os/access.c | 2 +-
os/client_priv.h | 25 +++++++++++++++++++++++++
os/connection.c | 1 +
os/io.c | 3 ++-
os/utils.c | 1 +
randr/rrlease.c | 1 +
21 files changed, 52 insertions(+), 41 deletions(-)
New commits:
commit 804b2c081b7d5473cff3b135d56379d0b1eb2fe9
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Feb 14 14:56:21 2025 +0100
os: unexport CloseWellKnownConnections()
Not used by any modules, so no need to keep it public.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1790>
diff --git a/hw/kdrive/ephyr/ephyr.c b/hw/kdrive/ephyr/ephyr.c
index 248aaf1bb..069270219 100644
--- a/hw/kdrive/ephyr/ephyr.c
+++ b/hw/kdrive/ephyr/ephyr.c
@@ -29,6 +29,7 @@
#include <X11/keysym.h>
#include "mi/mipointer_priv.h"
+#include "os/client_priv.h"
#include "os/osdep.h"
#include "ephyr.h"
diff --git a/hw/xnest/Display.c b/hw/xnest/Display.c
index a3e930135..297d9b9c8 100644
--- a/hw/xnest/Display.c
+++ b/hw/xnest/Display.c
@@ -19,6 +19,7 @@ is" without express or implied warranty.
#include <X11/X.h>
#include <X11/Xproto.h>
+#include "os/client_priv.h"
#include "os/osdep.h"
#include "screenint.h"
diff --git a/hw/xwayland/xwayland-screen.c b/hw/xwayland/xwayland-screen.c
index 55304569e..308879213 100644
--- a/hw/xwayland/xwayland-screen.c
+++ b/hw/xwayland/xwayland-screen.c
@@ -39,6 +39,7 @@
#include "dix/input_priv.h"
#include "dix/property_priv.h"
+#include "os/client_priv.h"
#include "os/osdep.h"
#include "os/xserver_poll.h"
diff --git a/include/os.h b/include/os.h
index 51b0201d3..3f2bdfbc0 100644
--- a/include/os.h
+++ b/include/os.h
@@ -91,8 +91,6 @@ extern _X_EXPORT void SetCriticalOutputPending(void);
extern _X_EXPORT int WriteToClient(ClientPtr /*who */ , int /*count */ ,
const void * /*buf */ );
-extern _X_EXPORT void CloseWellKnownConnections(void);
-
typedef void (*NotifyFdProcPtr)(int fd, int ready, void *data);
#define X_NOTIFY_NONE 0x0
diff --git a/os/client_priv.h b/os/client_priv.h
index a0ab14fda..88da283da 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -52,6 +52,7 @@ void ResetOsBuffers(void);
void NotifyParentProcess(void);
void CreateWellKnownSockets(void);
void ResetWellKnownSockets(void);
+void CloseWellKnownConnections(void);
/* exported only for DRI module, but should not be used by external drivers */
_X_EXPORT void ResetCurrentRequest(struct _Client *client);
diff --git a/os/utils.c b/os/utils.c
index 4f74e2d64..fbf91c3c1 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -78,6 +78,7 @@ __stdcall unsigned long GetTickCount(void);
#include <X11/Xtrans/Xtrans.h>
#include "os/audit.h"
+#include "os/client_priv.h"
#include "input.h"
#include "dixfont.h"
commit 0d95b53a20316dc2053d422d897d1896062dd2d7
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Feb 14 14:51:03 2025 +0100
os: unexport ResetWellKnownSockets()
Not used by any modules (and not supposed to be), so should not
be exported at all.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1790>
diff --git a/include/os.h b/include/os.h
index fe39e246d..51b0201d3 100644
--- a/include/os.h
+++ b/include/os.h
@@ -91,8 +91,6 @@ extern _X_EXPORT void SetCriticalOutputPending(void);
extern _X_EXPORT int WriteToClient(ClientPtr /*who */ , int /*count */ ,
const void * /*buf */ );
-extern _X_EXPORT void ResetWellKnownSockets(void);
-
extern _X_EXPORT void CloseWellKnownConnections(void);
typedef void (*NotifyFdProcPtr)(int fd, int ready, void *data);
diff --git a/os/client_priv.h b/os/client_priv.h
index 1d5466d3f..a0ab14fda 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -51,6 +51,7 @@ void FlushIfCriticalOutputPending(void);
void ResetOsBuffers(void);
void NotifyParentProcess(void);
void CreateWellKnownSockets(void);
+void ResetWellKnownSockets(void);
/* exported only for DRI module, but should not be used by external drivers */
_X_EXPORT void ResetCurrentRequest(struct _Client *client);
commit dd05532b38bddd0740d521f9c55e472acf355bf0
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Feb 14 14:43:05 2025 +0100
os: unexport CreateWellKnownSockets()
Not used by any modules (and not supposed to be), so should not
be exported at all.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1790>
diff --git a/include/os.h b/include/os.h
index 6b8ca2a01..fe39e246d 100644
--- a/include/os.h
+++ b/include/os.h
@@ -91,8 +91,6 @@ extern _X_EXPORT void SetCriticalOutputPending(void);
extern _X_EXPORT int WriteToClient(ClientPtr /*who */ , int /*count */ ,
const void * /*buf */ );
-extern _X_EXPORT void CreateWellKnownSockets(void);
-
extern _X_EXPORT void ResetWellKnownSockets(void);
extern _X_EXPORT void CloseWellKnownConnections(void);
diff --git a/os/client_priv.h b/os/client_priv.h
index 9e978be51..1d5466d3f 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -50,6 +50,7 @@ void FlushAllOutput(void);
void FlushIfCriticalOutputPending(void);
void ResetOsBuffers(void);
void NotifyParentProcess(void);
+void CreateWellKnownSockets(void);
/* exported only for DRI module, but should not be used by external drivers */
_X_EXPORT void ResetCurrentRequest(struct _Client *client);
commit 59b39ee6ee430ef5b2804e84c8c7d4704b842ea7
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Feb 14 14:12:54 2025 +0100
os: unexport NotifyParentProcess()
Not used by any modules, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1790>
diff --git a/include/os.h b/include/os.h
index a68564954..6b8ca2a01 100644
--- a/include/os.h
+++ b/include/os.h
@@ -91,8 +91,6 @@ extern _X_EXPORT void SetCriticalOutputPending(void);
extern _X_EXPORT int WriteToClient(ClientPtr /*who */ , int /*count */ ,
const void * /*buf */ );
-extern _X_EXPORT void NotifyParentProcess(void);
-
extern _X_EXPORT void CreateWellKnownSockets(void);
extern _X_EXPORT void ResetWellKnownSockets(void);
diff --git a/os/client_priv.h b/os/client_priv.h
index 17cdc3133..9e978be51 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -49,6 +49,7 @@ Bool InsertFakeRequest(struct _Client *client, char *data, int count);
void FlushAllOutput(void);
void FlushIfCriticalOutputPending(void);
void ResetOsBuffers(void);
+void NotifyParentProcess(void);
/* exported only for DRI module, but should not be used by external drivers */
_X_EXPORT void ResetCurrentRequest(struct _Client *client);
commit c9ee4245a212d38fb920182c97631a31322d5440
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Feb 14 14:11:42 2025 +0100
os: unexport ResetOsBuffers()
Not used by any modules, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1790>
diff --git a/include/os.h b/include/os.h
index 84d4f7b58..a68564954 100644
--- a/include/os.h
+++ b/include/os.h
@@ -91,8 +91,6 @@ extern _X_EXPORT void SetCriticalOutputPending(void);
extern _X_EXPORT int WriteToClient(ClientPtr /*who */ , int /*count */ ,
const void * /*buf */ );
-extern _X_EXPORT void ResetOsBuffers(void);
-
extern _X_EXPORT void NotifyParentProcess(void);
extern _X_EXPORT void CreateWellKnownSockets(void);
diff --git a/os/client_priv.h b/os/client_priv.h
index 0a9ea08bb..17cdc3133 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -48,6 +48,7 @@ int WriteFdToClient(struct _Client *client, int fd, Bool do_close);
Bool InsertFakeRequest(struct _Client *client, char *data, int count);
void FlushAllOutput(void);
void FlushIfCriticalOutputPending(void);
+void ResetOsBuffers(void);
/* exported only for DRI module, but should not be used by external drivers */
_X_EXPORT void ResetCurrentRequest(struct _Client *client);
commit 583dbe832de0727be8ff30c2c6d08d9a68f7877a
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Feb 14 14:09:17 2025 +0100
os: unexport FlushIfCriticalOutputPending()
Not used by any modules, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1790>
diff --git a/include/os.h b/include/os.h
index 2d164563a..84d4f7b58 100644
--- a/include/os.h
+++ b/include/os.h
@@ -86,8 +86,6 @@ typedef struct _NewClientRec *NewClientPtr;
extern _X_EXPORT int ReadFdFromClient(ClientPtr client);
-extern _X_EXPORT void FlushIfCriticalOutputPending(void);
-
extern _X_EXPORT void SetCriticalOutputPending(void);
extern _X_EXPORT int WriteToClient(ClientPtr /*who */ , int /*count */ ,
diff --git a/os/client_priv.h b/os/client_priv.h
index 04649c8d4..0a9ea08bb 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -47,6 +47,7 @@ int ReadRequestFromClient(struct _Client *client);
int WriteFdToClient(struct _Client *client, int fd, Bool do_close);
Bool InsertFakeRequest(struct _Client *client, char *data, int count);
void FlushAllOutput(void);
+void FlushIfCriticalOutputPending(void);
/* exported only for DRI module, but should not be used by external drivers */
_X_EXPORT void ResetCurrentRequest(struct _Client *client);
commit be166167155187b05de67ac7826ccc0b356f17b5
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Feb 14 14:04:33 2025 +0100
os: unexport FlushAllOutput()
Not used by any modules, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1790>
diff --git a/include/os.h b/include/os.h
index facfa7047..2d164563a 100644
--- a/include/os.h
+++ b/include/os.h
@@ -86,8 +86,6 @@ typedef struct _NewClientRec *NewClientPtr;
extern _X_EXPORT int ReadFdFromClient(ClientPtr client);
-extern _X_EXPORT void FlushAllOutput(void);
-
extern _X_EXPORT void FlushIfCriticalOutputPending(void);
extern _X_EXPORT void SetCriticalOutputPending(void);
diff --git a/os/WaitFor.c b/os/WaitFor.c
index 7f64c336b..a616850ab 100644
--- a/os/WaitFor.c
+++ b/os/WaitFor.c
@@ -64,6 +64,7 @@ SOFTWARE.
#include "dix/dix_priv.h"
#include "os/busfault.h"
+#include "os/client_priv.h"
#include "os/screensaver.h"
#include "misc.h"
diff --git a/os/client_priv.h b/os/client_priv.h
index 90f0e1afe..04649c8d4 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -46,6 +46,7 @@ void ListenOnOpenFD(int fd, int noxauth);
int ReadRequestFromClient(struct _Client *client);
int WriteFdToClient(struct _Client *client, int fd, Bool do_close);
Bool InsertFakeRequest(struct _Client *client, char *data, int count);
+void FlushAllOutput(void);
/* exported only for DRI module, but should not be used by external drivers */
_X_EXPORT void ResetCurrentRequest(struct _Client *client);
commit c6b223459cc7bf94682f75cc1e25d872c7a5375d
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Feb 14 13:24:40 2025 +0100
os: unexport ResetCurrentRequest()
Not used by any external modules, so no need to keep it in public API.
Since it's used by DRI, still needs the _X_EXPORT flag, as long as DRI
is a dynamically loaded module.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1790>
diff --git a/Xext/xtest.c b/Xext/xtest.c
index bec191e49..05ac0e967 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -40,6 +40,7 @@
#include "dix/exevents_priv.h"
#include "mi/mi_priv.h"
#include "mi/mipointer_priv.h"
+#include "os/client_priv.h"
#include "os/osdep.h"
#include "misc.h"
diff --git a/glx/glxext.c b/glx/glxext.c
index 467fdd542..216dea98d 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -31,6 +31,9 @@
#include <dix-config.h>
#include <string.h>
+
+#include "os/client_priv.h"
+
#include "glxserver.h"
#include <windowstr.h>
#include <propertyst.h>
diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
index 6eb846187..f4fa19edb 100644
--- a/hw/xfree86/dri2/dri2.c
+++ b/hw/xfree86/dri2/dri2.c
@@ -35,6 +35,9 @@
#endif
#include <errno.h>
+
+#include "os/client_priv.h"
+
#ifdef WITH_LIBDRM
#include <xf86drm.h>
#endif
diff --git a/hw/xwayland/xwayland-drm-lease.c b/hw/xwayland/xwayland-drm-lease.c
index 224ad4c73..30d363b59 100644
--- a/hw/xwayland/xwayland-drm-lease.c
+++ b/hw/xwayland/xwayland-drm-lease.c
@@ -26,6 +26,8 @@
#include <xwayland-config.h>
+#include "os/client_priv.h"
+
#ifdef WITH_LIBDRM
#include <xf86drm.h>
#include <xf86drmMode.h>
diff --git a/include/os.h b/include/os.h
index 668c0e61d..facfa7047 100644
--- a/include/os.h
+++ b/include/os.h
@@ -86,8 +86,6 @@ typedef struct _NewClientRec *NewClientPtr;
extern _X_EXPORT int ReadFdFromClient(ClientPtr client);
-extern _X_EXPORT void ResetCurrentRequest(ClientPtr /*client */ );
-
extern _X_EXPORT void FlushAllOutput(void);
extern _X_EXPORT void FlushIfCriticalOutputPending(void);
diff --git a/os/client_priv.h b/os/client_priv.h
index de18d07cb..90f0e1afe 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -8,6 +8,7 @@
#include <sys/types.h>
#include <X11/Xdefs.h>
+#include <X11/Xfuncproto.h>
/* Client IDs. Use GetClientPid, GetClientCmdName and GetClientCmdArgs
* instead of accessing the fields directly. */
@@ -46,4 +47,7 @@ int ReadRequestFromClient(struct _Client *client);
int WriteFdToClient(struct _Client *client, int fd, Bool do_close);
Bool InsertFakeRequest(struct _Client *client, char *data, int count);
+/* exported only for DRI module, but should not be used by external drivers */
+_X_EXPORT void ResetCurrentRequest(struct _Client *client);
+
#endif /* _XSERVER_DIX_CLIENT_PRIV_H */
commit 189a70dfb2aad95f63757c55467ca97c5474d082
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Thu Feb 13 18:30:39 2025 +0100
os: unexport InsertFakeRequest()
Not used by any modules, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1790>
diff --git a/include/os.h b/include/os.h
index a9ef549cc..668c0e61d 100644
--- a/include/os.h
+++ b/include/os.h
@@ -86,10 +86,6 @@ typedef struct _NewClientRec *NewClientPtr;
extern _X_EXPORT int ReadFdFromClient(ClientPtr client);
-extern _X_EXPORT Bool InsertFakeRequest(ClientPtr /*client */ ,
- char * /*data */ ,
- int /*count */ );
-
extern _X_EXPORT void ResetCurrentRequest(ClientPtr /*client */ );
extern _X_EXPORT void FlushAllOutput(void);
diff --git a/os/client_priv.h b/os/client_priv.h
index c68a65fbe..de18d07cb 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -44,5 +44,6 @@ Bool AddClientOnOpenFD(int fd);
void ListenOnOpenFD(int fd, int noxauth);
int ReadRequestFromClient(struct _Client *client);
int WriteFdToClient(struct _Client *client, int fd, Bool do_close);
+Bool InsertFakeRequest(struct _Client *client, char *data, int count);
#endif /* _XSERVER_DIX_CLIENT_PRIV_H */
commit ba665948f6906668a08aeca171aa8e18e4d614fe
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Thu Feb 13 18:25:56 2025 +0100
os: unexport WriteFdToClient()
Not used by any modules, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1790>
diff --git a/Xext/shm.c b/Xext/shm.c
index a82fbcd39..725cafc33 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -45,6 +45,7 @@ in this Software without prior written authorization from The Open Group.
#include "dix/dix_priv.h"
#include "os/auth.h"
#include "os/busfault.h"
+#include "os/client_priv.h"
#include "os/osdep.h"
#include "misc.h"
diff --git a/dri3/dri3_request.c b/dri3/dri3_request.c
index 91240be45..3da27b68f 100644
--- a/dri3/dri3_request.c
+++ b/dri3/dri3_request.c
@@ -24,6 +24,7 @@
#include <unistd.h>
#include "dix/dix_priv.h"
+#include "os/client_priv.h"
#include "dri3_priv.h"
#include <syncsrv.h>
diff --git a/include/os.h b/include/os.h
index 53f68670e..a9ef549cc 100644
--- a/include/os.h
+++ b/include/os.h
@@ -86,8 +86,6 @@ typedef struct _NewClientRec *NewClientPtr;
extern _X_EXPORT int ReadFdFromClient(ClientPtr client);
-extern _X_EXPORT int WriteFdToClient(ClientPtr client, int fd, Bool do_close);
-
extern _X_EXPORT Bool InsertFakeRequest(ClientPtr /*client */ ,
char * /*data */ ,
int /*count */ );
diff --git a/os/client_priv.h b/os/client_priv.h
index 9e7945a2c..c68a65fbe 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -43,5 +43,6 @@ const char *ClientAuthorized(struct _Client *client,
Bool AddClientOnOpenFD(int fd);
void ListenOnOpenFD(int fd, int noxauth);
int ReadRequestFromClient(struct _Client *client);
+int WriteFdToClient(struct _Client *client, int fd, Bool do_close);
#endif /* _XSERVER_DIX_CLIENT_PRIV_H */
diff --git a/randr/rrlease.c b/randr/rrlease.c
index 4d92b4af9..b6083cd2a 100644
--- a/randr/rrlease.c
+++ b/randr/rrlease.c
@@ -25,6 +25,7 @@
#include "dix/dix_priv.h"
#include "randr/randrstr_priv.h"
+#include "os/client_priv.h"
#include "swaprep.h"
commit effe8d66bd70afd73e1f4f3b8acce6dfeff8b018
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Thu Feb 13 17:15:43 2025 +0100
os: unexport ReadRequestFromClient()
Not used by any modules, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1790>
diff --git a/include/os.h b/include/os.h
index 423346aaa..53f68670e 100644
--- a/include/os.h
+++ b/include/os.h
@@ -84,8 +84,6 @@ typedef struct _NewClientRec *NewClientPtr;
#include <stdio.h>
#include <stdarg.h>
-extern _X_EXPORT int ReadRequestFromClient(ClientPtr /*client */ );
-
extern _X_EXPORT int ReadFdFromClient(ClientPtr client);
extern _X_EXPORT int WriteFdToClient(ClientPtr client, int fd, Bool do_close);
diff --git a/os/client_priv.h b/os/client_priv.h
index fd1d9cea7..9e7945a2c 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -42,5 +42,6 @@ const char *ClientAuthorized(struct _Client *client,
char *auth_string);
Bool AddClientOnOpenFD(int fd);
void ListenOnOpenFD(int fd, int noxauth);
+int ReadRequestFromClient(struct _Client *client);
#endif /* _XSERVER_DIX_CLIENT_PRIV_H */
diff --git a/os/io.c b/os/io.c
index 521c852e4..17fba5602 100644
--- a/os/io.c
+++ b/os/io.c
@@ -75,9 +75,10 @@ SOFTWARE.
#include "dix/dix_priv.h"
#include "os/bug_priv.h"
+#include "os/client_priv.h"
+#include "os/osdep.h"
#include "os.h"
-#include "osdep.h"
#include "opaque.h"
#include "dixstruct.h"
#include "misc.h"
commit 9b0c3c62f2e4bd5b005b63818d2955113e909001
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Thu Feb 13 17:12:22 2025 +0100
os: unexport ListenOnOpenFD()
Not used by any modules, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1790>
diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index 35e33bab1..5aa16ffab 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -47,6 +47,7 @@
#include <X11/Xproto.h>
#include "mi/mi_priv.h"
+#include "os/client_priv.h"
#include "misc.h"
#include "windowstr.h"
diff --git a/include/os.h b/include/os.h
index 909411933..423346aaa 100644
--- a/include/os.h
+++ b/include/os.h
@@ -133,8 +133,6 @@ extern _X_EXPORT void IgnoreClient(ClientPtr /*client */ );
extern _X_EXPORT void AttendClient(ClientPtr /*client */ );
-extern _X_EXPORT void ListenOnOpenFD(int /* fd */ , int /* noxauth */ );
-
extern _X_EXPORT CARD32 GetTimeInMillis(void);
extern _X_EXPORT CARD64 GetTimeInMicros(void);
diff --git a/os/client_priv.h b/os/client_priv.h
index 111276cb9..fd1d9cea7 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -41,5 +41,6 @@ const char *ClientAuthorized(struct _Client *client,
unsigned int string_n,
char *auth_string);
Bool AddClientOnOpenFD(int fd);
+void ListenOnOpenFD(int fd, int noxauth);
#endif /* _XSERVER_DIX_CLIENT_PRIV_H */
commit d637e1d28401f6b264e2007ea53e87f3b11e52d4
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Thu Feb 13 17:10:23 2025 +0100
os: unexport AddClientOnOpenFD()
Not used by any modules, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1790>
diff --git a/hw/xwayland/xwayland.c b/hw/xwayland/xwayland.c
index 4cbe431c7..5e6f376d8 100644
--- a/hw/xwayland/xwayland.c
+++ b/hw/xwayland/xwayland.c
@@ -38,6 +38,7 @@
#include "dix/dix_priv.h"
#include "dix/screenint_priv.h"
#include "os/cmdline.h"
+#include "os/client_priv.h"
#include "os/ddx_priv.h"
#include "os/osdep.h"
#include "os/xserver_poll.h"
diff --git a/include/os.h b/include/os.h
index 0246e4de4..909411933 100644
--- a/include/os.h
+++ b/include/os.h
@@ -135,8 +135,6 @@ extern _X_EXPORT void AttendClient(ClientPtr /*client */ );
extern _X_EXPORT void ListenOnOpenFD(int /* fd */ , int /* noxauth */ );
-extern _X_EXPORT Bool AddClientOnOpenFD(int /* fd */ );
-
extern _X_EXPORT CARD32 GetTimeInMillis(void);
extern _X_EXPORT CARD64 GetTimeInMicros(void);
diff --git a/os/client_priv.h b/os/client_priv.h
index 6006c6571..111276cb9 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -40,5 +40,6 @@ const char *ClientAuthorized(struct _Client *client,
char *auth_proto,
unsigned int string_n,
char *auth_string);
+Bool AddClientOnOpenFD(int fd);
#endif /* _XSERVER_DIX_CLIENT_PRIV_H */
commit a84ae08526880062830aee2962ea7cfe691e9fba
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Thu Feb 13 17:06:29 2025 +0100
os: unexport ClientAuthorized()
Not used by any modules, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1790>
diff --git a/include/os.h b/include/os.h
index af8ffbb40..0246e4de4 100644
--- a/include/os.h
+++ b/include/os.h
@@ -115,12 +115,6 @@ extern _X_EXPORT void ResetWellKnownSockets(void);
extern _X_EXPORT void CloseWellKnownConnections(void);
-extern _X_EXPORT const char *ClientAuthorized(ClientPtr /*client */ ,
- unsigned int /*proto_n */ ,
- char * /*auth_proto */ ,
- unsigned int /*string_n */ ,
- char * /*auth_string */ );
-
typedef void (*NotifyFdProcPtr)(int fd, int ready, void *data);
#define X_NOTIFY_NONE 0x0
diff --git a/os/client_priv.h b/os/client_priv.h
index a74c73fc8..6006c6571 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -35,5 +35,10 @@ const char *GetClientCmdArgs(struct _Client *client);
Bool ClientIsLocal(struct _Client *client);
XID AuthorizationIDOfClient(struct _Client *client);
+const char *ClientAuthorized(struct _Client *client,
+ unsigned int proto_n,
+ char *auth_proto,
+ unsigned int string_n,
+ char *auth_string);
#endif /* _XSERVER_DIX_CLIENT_PRIV_H */
commit c6b8207342b44cc48c0e872bd4c142b99e8918a0
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Thu Feb 13 17:01:44 2025 +0100
os: unexport AuthorizationIDOfClient()
Not used by any modules, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1790>
diff --git a/Xext/security.c b/Xext/security.c
index df4fd922b..b0715e3df 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -35,6 +35,7 @@ in this Software without prior written authorization from The Open Group.
#include "include/extinit_priv.h"
#include "os/audit.h"
#include "os/auth.h"
+#include "os/client_priv.h"
#include "os/osdep.h"
#include "scrnintstr.h"
diff --git a/include/os.h b/include/os.h
index eab28747b..af8ffbb40 100644
--- a/include/os.h
+++ b/include/os.h
@@ -115,8 +115,6 @@ extern _X_EXPORT void ResetWellKnownSockets(void);
extern _X_EXPORT void CloseWellKnownConnections(void);
-extern _X_EXPORT XID AuthorizationIDOfClient(ClientPtr /*client */ );
-
extern _X_EXPORT const char *ClientAuthorized(ClientPtr /*client */ ,
unsigned int /*proto_n */ ,
char * /*auth_proto */ ,
diff --git a/os/client_priv.h b/os/client_priv.h
index abbda2b9d..a74c73fc8 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -34,5 +34,6 @@ const char *GetClientCmdName(struct _Client *client);
const char *GetClientCmdArgs(struct _Client *client);
Bool ClientIsLocal(struct _Client *client);
+XID AuthorizationIDOfClient(struct _Client *client);
#endif /* _XSERVER_DIX_CLIENT_PRIV_H */
diff --git a/os/connection.c b/os/connection.c
index 997d06405..07d6cbe8a 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -97,6 +97,7 @@ SOFTWARE.
#include "dix/dix_priv.h"
#include "os/audit.h"
#include "os/auth.h"
+#include "os/client_priv.h"
#include "os/osdep.h"
#include "misc.h" /* for typedef of pointer */
commit 1f27d3d65315dde0768549a6f01e5268a0448343
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Thu Feb 13 16:58:21 2025 +0100
os: unexport ClientIsLocal()
Not used by any modules, so no need to keep it exported.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1790>
diff --git a/Xext/xace.c b/Xext/xace.c
index 5051b832c..2ceea394d 100644
--- a/Xext/xace.c
+++ b/Xext/xace.c
@@ -20,6 +20,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <dix-config.h>
#include <stdarg.h>
+
+#include "os/client_priv.h"
+
#include "scrnintstr.h"
#include "extnsionst.h"
#include "pixmapstr.h"
diff --git a/include/os.h b/include/os.h
index 560c7bd96..eab28747b 100644
--- a/include/os.h
+++ b/include/os.h
@@ -252,9 +252,6 @@ PrivsElevated(void);
extern _X_EXPORT int
GetClientFd(ClientPtr);
-extern _X_EXPORT Bool
-ClientIsLocal(ClientPtr client);
-
/* stuff for ReplyCallback */
extern _X_EXPORT CallbackListPtr ReplyCallback;
typedef struct {
diff --git a/os/access.c b/os/access.c
index 44d6c2430..98095a5a1 100644
--- a/os/access.c
+++ b/os/access.c
@@ -175,9 +175,9 @@ SOFTWARE.
#include "os/auth.h"
#include "os/client_priv.h"
+#include "os/osdep.h"
#include "dixstruct.h"
-#include "osdep.h"
#include "xace.h"
#include "xdmcp.h"
diff --git a/os/client_priv.h b/os/client_priv.h
index c84cc35ea..abbda2b9d 100644
--- a/os/client_priv.h
+++ b/os/client_priv.h
@@ -7,6 +7,7 @@
#define _XSERVER_DIX_CLIENT_PRIV_H
#include <sys/types.h>
+#include <X11/Xdefs.h>
/* Client IDs. Use GetClientPid, GetClientCmdName and GetClientCmdArgs
* instead of accessing the fields directly. */
@@ -32,4 +33,6 @@ pid_t GetClientPid(struct _Client *client);
const char *GetClientCmdName(struct _Client *client);
const char *GetClientCmdArgs(struct _Client *client);
+Bool ClientIsLocal(struct _Client *client);
+
#endif /* _XSERVER_DIX_CLIENT_PRIV_H */
More information about the xorg-commit
mailing list