xserver: Branch 'master' - 6 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sun Mar 3 23:23:48 UTC 2024
Xext/security.c | 3 ++-
Xext/xres.c | 4 +++-
Xext/xselinux_hooks.c | 5 +++--
Xext/xselinux_label.c | 3 ++-
Xext/xselinuxint.h | 1 -
dix/dispatch.c | 3 ++-
dix/extension.c | 4 +++-
dix/main.c | 4 +++-
dix/registry.c | 4 +++-
dix/registry_priv.h | 37 +++++++++++++++++++++++++++++++++++++
dix/resource.c | 4 +++-
glx/glxext.c | 1 -
hw/xfree86/sdksyms.sh | 1 -
include/meson.build | 1 -
include/registry.h | 50 --------------------------------------------------
15 files changed, 61 insertions(+), 64 deletions(-)
New commits:
commit dc84331f5d344d3241cb2c30cee43cf016a2d3e8
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Mar 1 12:44:55 2024 +0100
include: drop obsolete registry.h
Now that there's no actual consumer of it left, it can be dropped.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1348>
diff --git a/Xext/security.c b/Xext/security.c
index c76c37f1f..e28c3ef45 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -36,7 +36,6 @@ in this Software without prior written authorization from The Open Group.
#include "propertyst.h"
#include "colormapst.h"
#include "privates.h"
-#include "registry.h"
#include "xacestr.h"
#include "securitysrv.h"
#include <X11/extensions/securproto.h>
diff --git a/Xext/xres.c b/Xext/xres.c
index ff0259bd1..96c1844fd 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -19,7 +19,6 @@
#include "dixstruct.h"
#include "extnsionst.h"
#include "swaprep.h"
-#include "registry.h"
#include <X11/extensions/XResproto.h>
#include "pixmapstr.h"
#include "windowstr.h"
diff --git a/Xext/xselinux_label.c b/Xext/xselinux_label.c
index b71d08266..dd14617b1 100644
--- a/Xext/xselinux_label.c
+++ b/Xext/xselinux_label.c
@@ -25,7 +25,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "dix/registry_priv.h"
-#include "registry.h"
#include "xselinuxint.h"
/* selection and property atom cache */
diff --git a/Xext/xselinuxint.h b/Xext/xselinuxint.h
index 5a5874075..dddae86e2 100644
--- a/Xext/xselinuxint.h
+++ b/Xext/xselinuxint.h
@@ -28,7 +28,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "dixstruct.h"
#include "privates.h"
#include "resource.h"
-#include "registry.h"
#include "inputstr.h"
#include "xselinux.h"
diff --git a/dix/dispatch.c b/dix/dispatch.c
index b947a02d2..6b5de5688 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -128,7 +128,6 @@ Equipment Corporation.
#include "xfixesint.h"
#ifdef XSERVER_DTRACE
-#include "registry.h"
#include "probes.h"
#endif
diff --git a/dix/extension.c b/dix/extension.c
index a970f1b89..dbe6c0a97 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -60,7 +60,6 @@ SOFTWARE.
#include "scrnintstr.h"
#include "dispatch.h"
#include "privates.h"
-#include "registry.h"
#include "xace.h"
#define LAST_ERROR 255
diff --git a/dix/main.c b/dix/main.c
index 74da47b35..637f98b0c 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -106,7 +106,6 @@ Equipment Corporation.
#include "dixfont.h"
#include "extnsionst.h"
#include "privates.h"
-#include "registry.h"
#include "client.h"
#include "exevents.h"
#ifdef PANORAMIX
diff --git a/dix/registry.c b/dix/registry.c
index 0cee10789..a599d8c31 100644
--- a/dix/registry.c
+++ b/dix/registry.c
@@ -29,7 +29,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "dix/registry_priv.h"
#include "resource.h"
-#include "registry.h"
#define BASE_SIZE 16
diff --git a/dix/resource.c b/dix/resource.c
index 0cff04758..f8be25c2c 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -143,7 +143,6 @@ Equipment Corporation.
#endif
#include "xace.h"
#include <assert.h>
-#include "registry.h"
#include "gcstruct.h"
#ifdef XSERVER_DTRACE
diff --git a/glx/glxext.c b/glx/glxext.c
index 99f866104..c3f67a5ec 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -36,7 +36,6 @@
#include "glxserver.h"
#include <windowstr.h>
#include <propertyst.h>
-#include <registry.h>
#include "privates.h"
#include <os.h>
#include "extinit.h"
diff --git a/include/registry.h b/include/registry.h
deleted file mode 100644
index afc8e1c76..000000000
--- a/include/registry.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/***********************************************************
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-******************************************************************/
-
-#ifndef DIX_REGISTRY_H
-#define DIX_REGISTRY_H
-
-#include "resource.h"
-#include "extnsionst.h"
-
-#endif /* DIX_REGISTRY_H */
commit 17ad53c803e06a9e835aae65da057e6c7256c040
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Mar 1 10:37:50 2024 +0100
include: unexport registry.h
This file isn't included by any known modules, so no need to keep it
around in the public api.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1348>
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index 8083ad24b..12b4534f7 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -270,7 +270,6 @@ cat > sdksyms.c << EOF
#include "ptrveloc.h"
#include "region.h"
#include "regionstr.h"
-#include "registry.h"
#include "resource.h"
#include "rgb.h"
#include "screenint.h"
diff --git a/include/meson.build b/include/meson.build
index a7c398468..014dd8932 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -489,7 +489,6 @@ if build_xorg
'ptrveloc.h',
'region.h',
'regionstr.h',
- 'registry.h',
'resource.h',
'rgb.h',
'screenint.h',
commit 5f5d55be88dcca5a229596ae0f64eee66d647266
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Mar 1 10:36:03 2024 +0100
dix: unexport XREGISTRY_UNKNOWN define
It's not used by external modules, thus no need to have it in the
public API.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1348>
diff --git a/dix/registry_priv.h b/dix/registry_priv.h
index f8c12e5ed..0c6a51b12 100644
--- a/dix/registry_priv.h
+++ b/dix/registry_priv.h
@@ -8,6 +8,11 @@
#include "include/extnsionst.h"
#include "include/resource.h"
+/*
+ * Result returned from any unsuccessful lookup
+ */
+#define XREGISTRY_UNKNOWN "<unknown>"
+
/*
* Setup and teardown
*/
diff --git a/include/registry.h b/include/registry.h
index a3b26427e..afc8e1c76 100644
--- a/include/registry.h
+++ b/include/registry.h
@@ -12,11 +12,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifndef DIX_REGISTRY_H
#define DIX_REGISTRY_H
-/*
- * Result returned from any unsuccessful lookup
- */
-#define XREGISTRY_UNKNOWN "<unknown>"
-
#include "resource.h"
#include "extnsionst.h"
commit 4ebb02cdda1612ddd48a45e46bd485b1d9cac0ac
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Mar 1 10:33:53 2024 +0100
dix: unexport extension registry functions
These aren't used by (known) external modules, thus no need to export them.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1348>
diff --git a/Xext/security.c b/Xext/security.c
index 97af836ab..c76c37f1f 100644
--- a/Xext/security.c
+++ b/Xext/security.c
@@ -28,6 +28,8 @@ in this Software without prior written authorization from The Open Group.
#include <dix-config.h>
#endif
+#include "dix/registry_priv.h"
+
#include "scrnintstr.h"
#include "inputstr.h"
#include "windowstr.h"
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 88502709d..b947a02d2 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -101,6 +101,8 @@ Equipment Corporation.
#include <version-config.h>
#endif
+#include "dix/registry_priv.h"
+
#include "windowstr.h"
#include <X11/fonts/fontstruct.h>
#include <X11/fonts/libxfont2.h>
diff --git a/dix/extension.c b/dix/extension.c
index dce6a91da..a970f1b89 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -50,6 +50,9 @@ SOFTWARE.
#include <X11/X.h>
#include <X11/Xproto.h>
+
+#include "dix/registry_priv.h"
+
#include "misc.h"
#include "dixstruct.h"
#include "extnsionst.h"
diff --git a/dix/registry_priv.h b/dix/registry_priv.h
index ac575e142..f8c12e5ed 100644
--- a/dix/registry_priv.h
+++ b/dix/registry_priv.h
@@ -5,6 +5,7 @@
#ifndef _XSERVER_DIX_REGISTRY_H
#define _XSERVER_DIX_REGISTRY_H
+#include "include/extnsionst.h"
#include "include/resource.h"
/*
@@ -18,4 +19,14 @@ void dixCloseRegistry(void);
void RegisterResourceName(RESTYPE type, const char *name);
const char *LookupResourceName(RESTYPE rtype);
+void RegisterExtensionNames(ExtensionEntry * ext);
+
+/*
+ * Lookup functions. The returned string must not be modified or freed.
+ */
+const char *LookupMajorName(int major);
+const char *LookupRequestName(int major, int minor);
+const char *LookupEventName(int event);
+const char *LookupErrorName(int error);
+
#endif /* _XSERVER_DIX_REGISTRY_H */
diff --git a/include/registry.h b/include/registry.h
index aaf49d850..a3b26427e 100644
--- a/include/registry.h
+++ b/include/registry.h
@@ -20,16 +20,4 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "resource.h"
#include "extnsionst.h"
-#ifdef X_REGISTRY_REQUEST
-extern _X_EXPORT void RegisterExtensionNames(ExtensionEntry * ext);
-
-/*
- * Lookup functions. The returned string must not be modified or freed.
- */
-extern _X_EXPORT const char *LookupMajorName(int major);
-extern _X_EXPORT const char *LookupRequestName(int major, int minor);
-extern _X_EXPORT const char *LookupEventName(int event);
-extern _X_EXPORT const char *LookupErrorName(int error);
-#endif
-
#endif /* DIX_REGISTRY_H */
commit 1f5ab6ec2871c4f14e6e227469655a344e0f439d
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Fri Mar 1 09:37:50 2024 +0100
dix: unexport RegisterResourceName() and LookupResourceName()
These aren't used by external modules, thus no need to export them.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1348>
diff --git a/Xext/xres.c b/Xext/xres.c
index 354329802..ff0259bd1 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -11,6 +11,9 @@
#include <X11/X.h>
#include <X11/Xproto.h>
#include <assert.h>
+
+#include "dix/registry_priv.h"
+
#include "misc.h"
#include "os.h"
#include "dixstruct.h"
diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c
index 57b24e452..55fd54a5b 100644
--- a/Xext/xselinux_hooks.c
+++ b/Xext/xselinux_hooks.c
@@ -29,10 +29,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <sys/socket.h>
#include <stdio.h>
#include <stdarg.h>
-
#include <libaudit.h>
-
#include <X11/Xatom.h>
+
+#include "dix/registry_priv.h"
+
#include "selection.h"
#include "inputstr.h"
#include "scrnintstr.h"
diff --git a/Xext/xselinux_label.c b/Xext/xselinux_label.c
index 48414d88a..b71d08266 100644
--- a/Xext/xselinux_label.c
+++ b/Xext/xselinux_label.c
@@ -23,6 +23,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <selinux/label.h>
+#include "dix/registry_priv.h"
+
#include "registry.h"
#include "xselinuxint.h"
diff --git a/dix/registry_priv.h b/dix/registry_priv.h
index 17f05b88d..ac575e142 100644
--- a/dix/registry_priv.h
+++ b/dix/registry_priv.h
@@ -5,6 +5,8 @@
#ifndef _XSERVER_DIX_REGISTRY_H
#define _XSERVER_DIX_REGISTRY_H
+#include "include/resource.h"
+
/*
* Setup and teardown
*/
@@ -12,4 +14,8 @@ void dixResetRegistry(void);
void dixFreeRegistry(void);
void dixCloseRegistry(void);
+/* Functions used by the X-Resource extension */
+void RegisterResourceName(RESTYPE type, const char *name);
+const char *LookupResourceName(RESTYPE rtype);
+
#endif /* _XSERVER_DIX_REGISTRY_H */
diff --git a/dix/resource.c b/dix/resource.c
index 53c4fcfba..0cff04758 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -122,6 +122,9 @@ Equipment Corporation.
#endif
#include <X11/X.h>
+
+#include "dix/registry_priv.h"
+
#include "misc.h"
#include "os.h"
#include "resource.h"
diff --git a/include/registry.h b/include/registry.h
index ba447b6a2..aaf49d850 100644
--- a/include/registry.h
+++ b/include/registry.h
@@ -20,14 +20,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "resource.h"
#include "extnsionst.h"
-/* Internal string registry - for auditing, debugging, security, etc. */
-
-#ifdef X_REGISTRY_RESOURCE
-/* Functions used by the X-Resource extension */
-extern _X_EXPORT void RegisterResourceName(RESTYPE type, const char *name);
-extern _X_EXPORT const char *LookupResourceName(RESTYPE rtype);
-#endif
-
#ifdef X_REGISTRY_REQUEST
extern _X_EXPORT void RegisterExtensionNames(ExtensionEntry * ext);
commit 36e2cf64c849f80d68f4c1fb40380d95d12209c4
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date: Thu Feb 29 20:24:17 2024 +0100
dix: unexport registry setup/teardown functions
these aren't to be called by modules, thus no need to export them.
Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1348>
diff --git a/dix/main.c b/dix/main.c
index 5964120c6..74da47b35 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -82,6 +82,9 @@ Equipment Corporation.
#include <X11/Xos.h> /* for unistd.h */
#include <X11/Xproto.h>
#include <pixman.h>
+
+#include "dix/registry_priv.h"
+
#include "scrnintstr.h"
#include "misc.h"
#include "os.h"
diff --git a/dix/registry.c b/dix/registry.c
index 84d48b4e3..0cee10789 100644
--- a/dix/registry.c
+++ b/dix/registry.c
@@ -25,6 +25,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <string.h>
#include <X11/X.h>
#include <X11/Xproto.h>
+
+#include "dix/registry_priv.h"
+
#include "resource.h"
#include "registry.h"
diff --git a/dix/registry_priv.h b/dix/registry_priv.h
new file mode 100644
index 000000000..17f05b88d
--- /dev/null
+++ b/dix/registry_priv.h
@@ -0,0 +1,15 @@
+/* SPDX-License-Identifier: MIT OR X11
+ *
+ * Copyright © 2024 Enrico Weigelt, metux IT consult <info at metux.net>
+ */
+#ifndef _XSERVER_DIX_REGISTRY_H
+#define _XSERVER_DIX_REGISTRY_H
+
+/*
+ * Setup and teardown
+ */
+void dixResetRegistry(void);
+void dixFreeRegistry(void);
+void dixCloseRegistry(void);
+
+#endif /* _XSERVER_DIX_REGISTRY_H */
diff --git a/include/registry.h b/include/registry.h
index 867a55d3f..ba447b6a2 100644
--- a/include/registry.h
+++ b/include/registry.h
@@ -40,11 +40,4 @@ extern _X_EXPORT const char *LookupEventName(int event);
extern _X_EXPORT const char *LookupErrorName(int error);
#endif
-/*
- * Setup and teardown
- */
-extern _X_EXPORT void dixResetRegistry(void);
-extern _X_EXPORT void dixFreeRegistry(void);
-extern _X_EXPORT void dixCloseRegistry(void);
-
#endif /* DIX_REGISTRY_H */
More information about the xorg-commit
mailing list