xserver: Branch 'master'

[GitLab Mirror]

 config/wscons.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 2d4fa74000229de600c241a628215c7a83a4ba64
Author: Enrico Weigelt, metux IT consult <info at metux.net>
Date:   Thu Mar 28 16:40:30 2024 +0100

    config: wscons: use asprintf() instead of deprecated Xprintf()
    
    The Xprintf() function is deprecated. Most of it's call sites had been moved
    to asprintf(), so also do it for the remaining two ones.
    
    Signed-off-by: Enrico Weigelt, metux IT consult <info at metux.net>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1449>

diff --git a/config/wscons.c b/config/wscons.c
index b90e86819..d55ec350f 100644
--- a/config/wscons.c
+++ b/config/wscons.c
@@ -126,8 +126,7 @@ wscons_add_keyboard(void)
     input_options = input_option_new(input_options, "name", WSCONS_KBD_DEVICE);
     input_options = input_option_new(input_options, "driver", "kbd");
 
-    config_info = Xprintf("wscons:%s", WSCONS_KBD_DEVICE);
-    if (!config_info)
+    if (asprintf(&config_info, "wscons:%s", WSCONS_KBD_DEVICE) == -1)
         goto unwind;
     if (KB_ENCODING(wsenc) == KB_USER) {
         /* Ignore wscons "user" layout */
@@ -190,8 +189,7 @@ wscons_add_pointer(const char *path, const char *driver, int flags)
     char *config_info = NULL;
     int rc;
 
-    config_info = Xprintf("wscons:%s", path);
-    if (!config_info)
+    if (asprintf(&config_info, "wscons:%s", path) == -1)
         return;
 
     input_options = input_option_new(input_options, "_source", "server/wscons");