xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/os-support/bsd/bsd_init.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6eea4f0b8ca384f965eb6110ef5b78c2c0f8a752
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Wed Mar 27 19:04:49 2024 +0100

    xfree86: os-support: bsd: fix warning on discarded const
    
    Fix warnings:
    
    ../hw/xfree86/os-support/bsd/bsd_init.c
    ../hw/xfree86/os-support/bsd/bsd_init.c:91:5: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
       91 |     "pccons (with X support)",
          |     ^~~~~~~~~~~~~~~~~~~~~~~~~
    ../hw/xfree86/os-support/bsd/bsd_init.c:97:5: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
       97 |     "pcvt",
          |     ^~~~~~
    ../hw/xfree86/os-support/bsd/bsd_init.c:100:5: warning: initialization discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
      100 |     "wscons",
          |     ^~~~~~~~
    
    ../hw/xfree86/os-support/bsd/bsd_init.c:462:14: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
      462 |     vtprefix = "/dev/ttyv";
          |              ^
    ../hw/xfree86/os-support/bsd/bsd_init.c:471:18: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
      471 |         vtprefix = "/dev/ttyE";
          |                  ^
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1446>

diff --git a/hw/xfree86/os-support/bsd/bsd_init.c b/hw/xfree86/os-support/bsd/bsd_init.c
index 91ffccdb0..393691be8 100644
--- a/hw/xfree86/os-support/bsd/bsd_init.c
+++ b/hw/xfree86/os-support/bsd/bsd_init.c
@@ -90,7 +90,7 @@ static int initialVT = -1;
 #define CHECK_DRIVER_MSG \
   "Check your kernel's console driver configuration and /dev entries"
 
-static char *supported_drivers[] = {
+static const char *supported_drivers[] = {
 #ifdef PCCONS_SUPPORT
     "pccons (with X support)",
 #endif
@@ -457,7 +457,8 @@ xf86OpenPcvt(void)
     /* This looks much like syscons, since pcvt is API compatible */
     int fd = -1;
     vtmode_t vtmode;
-    char vtname[12], *vtprefix;
+    char vtname[12];
+    const char *vtprefix;
 #ifdef __NetBSD__
     struct pcvtid pcvt_version;
 #endif