frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1449>
This commit is contained in:
Enrico Weigelt, metux IT consult 2024-03-28 16:40:30 +01:00
parent a57b449485
commit 2d4fa74000
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/wscons.c
View File

@ -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, "name", WSCONS_KBD_DEVICE);
input_options = input_option_new(input_options, "driver", "kbd"); input_options = input_option_new(input_options, "driver", "kbd");
config_info = Xprintf("wscons:%s", WSCONS_KBD_DEVICE); if (asprintf(&config_info, "wscons:%s", WSCONS_KBD_DEVICE) == -1)
if (!config_info)
goto unwind; goto unwind;
if (KB_ENCODING(wsenc) == KB_USER) { if (KB_ENCODING(wsenc) == KB_USER) {
/* Ignore wscons "user" layout */ /* Ignore wscons "user" layout */
@ -190,8 +189,7 @@ wscons_add_pointer(const char *path, const char *driver, int flags)
char *config_info = NULL; char *config_info = NULL;
int rc; int rc;
config_info = Xprintf("wscons:%s", path); if (asprintf(&config_info, "wscons:%s", path) == -1)
if (!config_info)
return; return;
input_options = input_option_new(input_options, "_source", "server/wscons"); input_options = input_option_new(input_options, "_source", "server/wscons");