xserver: Branch 'master' - 9 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Sat Apr 19 17:09:03 UTC 2025
dix/tables.c | 1 +
hw/xfree86/common/modeline2c.awk | 2 +-
hw/xfree86/drivers/modesetting/driver.c | 2 +-
os/connection.c | 1 +
os/utils.c | 6 ------
render/miindex.c | 5 -----
test/list.c | 4 ++--
test/misc.c | 2 --
xfixes/cursor.c | 1 +
9 files changed, 7 insertions(+), 17 deletions(-)
New commits:
commit 37b7ea8f8aaef3efa9d56fb9bc82adeccba02633
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Apr 13 12:48:25 2025 -0700
render: miindex.c does not need header guard macros
Clears warning from clang 19.1.7:
render/miindex.c:27:9: warning: macro is not used [-Wunused-macros]
27 | #define _MIINDEX_H_
| ^
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1910>
diff --git a/render/miindex.c b/render/miindex.c
index c1926e898..6b0bb2c9b 100644
--- a/render/miindex.c
+++ b/render/miindex.c
@@ -23,9 +23,6 @@
#include <dix-config.h>
-#ifndef _MIINDEX_H_
-#define _MIINDEX_H_
-
#include "dix/colormap_priv.h"
#include "scrnintstr.h"
@@ -328,5 +325,3 @@ miUpdateIndexed(ScreenPtr pScreen,
}
}
}
-
-#endif /* _MIINDEX_H_ */
commit f988558348817314493bf427927b9b12e7e76fb9
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Apr 13 12:44:41 2025 -0700
os: remove unused definition of BUGADDRESS
We stopped including this in error messages back in 2008
Clears warning from clang 19.1.7:
os/utils.c:1338:9: warning: macro is not used [-Wunused-macros]
1338 | #define BUGADDRESS BUILDERADDR
| ^
Fixes: ef77e4c44 ("Remove useless commentary from environment and argument processing.")
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1910>
diff --git a/os/utils.c b/os/utils.c
index fbf91c3c1..99b09e5c9 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1334,12 +1334,6 @@ enum BadCode {
InternalError
};
-#if defined(BUILDERADDR)
-#define BUGADDRESS BUILDERADDR
-#else
-#define BUGADDRESS "xorg at freedesktop.org"
-#endif
-
void
CheckUserParameters(int argc, char **argv, char **envp)
{
commit d1cc5a599fd182210615ac8f01cbf1ab436cc996
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Apr 13 12:37:35 2025 -0700
test: remove extra return
Clears warning from clang 19.1.7:
test/misc.c:239:12: warning: 'return' will never be executed
[-Wunreachable-code-return]
239 | return 0;
Fixes: 46b579e8d ("test: switch the unit tests to something resembling a test suite")
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1910>
diff --git a/test/misc.c b/test/misc.c
index 74329ddf2..5dbe8cade 100644
--- a/test/misc.c
+++ b/test/misc.c
@@ -235,6 +235,4 @@ misc_test(void)
NULL,
};
return testfuncs;
-
- return 0;
}
commit 14e202d6a0cc3221d425e9a4c95c46837972beca
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Apr 13 12:16:42 2025 -0700
xfixes: cursor.c should include header for CursorVisible & EnableCursor
Clears warnings from clang 19.1.7:
xfixes/cursor.c:132:6: warning: no previous extern declaration for
non-static variable 'CursorVisible' [-Wmissing-variable-declarations]
132 | Bool CursorVisible = FALSE;
| ^
xfixes/cursor.c:133:6: warning: no previous extern declaration for
non-static variable 'EnableCursor' [-Wmissing-variable-declarations]
133 | Bool EnableCursor = TRUE;
| ^
Fixes: 2cec3cfbf ("include: move private definitions out of input.h")
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1910>
diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index 0feb46bdf..a2c4159d1 100644
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -46,6 +46,7 @@
#include "dix/cursor_priv.h"
#include "dix/dix_priv.h"
+#include "dix/input_priv.h"
#include "xfixesint.h"
#include "scrnintstr.h"
commit b4905782427b87900ab89d489961ac8c4e83fa3b
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Apr 13 12:12:57 2025 -0700
os: connection.c should include header that defines GrabInProgress
Clears warning from clang 19.1.7:
os/connection.c:133:5: warning: no previous extern declaration for
non-static variable 'GrabInProgress' [-Wmissing-variable-declarations]
133 | int GrabInProgress = 0;
| ^
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1910>
diff --git a/os/connection.c b/os/connection.c
index 07d6cbe8a..d0d7c10c5 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -102,6 +102,7 @@ SOFTWARE.
#include "misc.h" /* for typedef of pointer */
#include "dixstruct_priv.h"
+#include "globals.h"
#include "xace.h"
#ifdef HAVE_GETPEERUCRED
commit 0fefdc6e2993db36a637be60691769267612df47
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Apr 13 12:03:14 2025 -0700
dix: tables.c should include header that defines InitialVector
Clears warning from clang 19.1.7:
dix/tables.c:59:7: warning: no previous extern declaration for non-static
variable 'InitialVector' [-Wmissing-variable-declarations]
59 | int (*InitialVector[3]) (ClientPtr /* client */) = {
| ^
Fixes: bae6cbc8c ("include: move private defs to dixstruct_priv.h")
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1910>
diff --git a/dix/tables.c b/dix/tables.c
index 5da4ffb75..22b44c408 100644
--- a/dix/tables.c
+++ b/dix/tables.c
@@ -51,6 +51,7 @@ SOFTWARE.
#include "windowstr.h"
#include "extnsionst.h"
#include "dixstruct.h"
+#include "dixstruct_priv.h"
#include "dixevents.h"
#include "dispatch.h"
#include "swaprep.h"
commit 062c339519ff9b8267d136e40fa0fbac06801199
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Apr 13 11:51:53 2025 -0700
modesetting: fix typo in XF86ModuleVersionInfo initialization
Found by clang 19.1.7:
hw/xfree86/drivers/modesetting/driver.c:163:21:
warning: initializer overrides prior initialization of this subobject
[-Winitializer-overrides]
163 | ._modinfo1_ = MODINFOSTRING2,
| ^~~~~~~~~~~~~~
hw/xfree86/drivers/modesetting/driver.c:162:21:
note: previous initialization is here
162 | ._modinfo1_ = MODINFOSTRING1,
| ^~~~~~~~~~~~~~
Fixes: 2a10eff6c ("xfree86: modsetting: use explicit field initializers for XF86ModuleData")
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1910>
diff --git a/hw/xfree86/drivers/modesetting/driver.c b/hw/xfree86/drivers/modesetting/driver.c
index 264c6fe33..fe78111e8 100644
--- a/hw/xfree86/drivers/modesetting/driver.c
+++ b/hw/xfree86/drivers/modesetting/driver.c
@@ -160,7 +160,7 @@ static XF86ModuleVersionInfo VersRec = {
.modname = "modesetting",
.vendor = MODULEVENDORSTRING,
._modinfo1_ = MODINFOSTRING1,
- ._modinfo1_ = MODINFOSTRING2,
+ ._modinfo2_ = MODINFOSTRING2,
.xf86version = XORG_VERSION_CURRENT,
.majorversion = XORG_VERSION_MAJOR,
.minorversion = XORG_VERSION_MINOR,
commit 3eaa19d74b5862794c8ffbcc747e90a3fecbd1c2
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Apr 13 11:45:40 2025 -0700
test: remove stray semi-colons after functions
Clears warnings from clang 19.1.7:
test/list.c:95:2: warning: extra ';' outside of a function [-Wextra-semi]
95 | };
| ^
test/list.c:137:2: warning: extra ';' outside of a function [-Wextra-semi]
137 | };
| ^
Fixes: 92788e677 ("test: add some tests for basic list manipulation.")
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1910>
diff --git a/test/list.c b/test/list.c
index dbb7a768d..b93cfd43a 100644
--- a/test/list.c
+++ b/test/list.c
@@ -92,7 +92,7 @@ test_xorg_list_add(void)
c = xorg_list_first_entry(&parent.children, struct child, node);
assert(memcmp(c, &child[2], sizeof(struct child)) == 0);
-};
+}
static void
test_xorg_list_append(void)
@@ -134,7 +134,7 @@ test_xorg_list_append(void)
xorg_list_for_each_entry(c, &parent.children, node) {
assert(memcmp(c, &child[i++], sizeof(struct child)) == 0);
}
-};
+}
static void
test_xorg_list_del(void)
commit f9d25189faa9e91fdf373c93d13866ba2efde20b
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date: Sun Apr 13 11:29:05 2025 -0700
xfree86: make modeline2c.awk put a newline at the end of xf86DefModeSet.c
Clears warning from clang 19.1.7:
hw/xfree86/common/xf86DefModeSet.c:288:62:
warning: no newline at end of file [-Wnewline-eof]
288 | const int xf86NumDefaultModes = ARRAY_SIZE(xf86DefaultModes);
| ^
Fixes: 3bf7ff703 ("Size xf86DefaultModes explicitly.")
Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1910>
diff --git a/hw/xfree86/common/modeline2c.awk b/hw/xfree86/common/modeline2c.awk
index 3c9f602d1..4900d5a44 100644
--- a/hw/xfree86/common/modeline2c.awk
+++ b/hw/xfree86/common/modeline2c.awk
@@ -89,5 +89,5 @@ BEGIN {
END {
print "};"
- printf "const int xf86NumDefaultModes = ARRAY_SIZE(xf86DefaultModes);"
+ print "const int xf86NumDefaultModes = ARRAY_SIZE(xf86DefaultModes);"
}
More information about the xorg-commit
mailing list