From ed9b67052aae90c0553d5e2c9644b3e692e4d792 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Tue, 27 Jan 2026 12:10:28 +0100 Subject: [PATCH] xfree86: use bool as retval for xf86VTSwitchAway() Prefer stdbool over our own historical Bool. Signed-off-by: Enrico Weigelt, metux IT consult --- hw/xfree86/os-support/bsd/console.c | 8 +++++--- hw/xfree86/os-support/shared/VTsw_noop.c | 5 ++--- hw/xfree86/os-support/shared/VTsw_usl.c | 9 ++++----- hw/xfree86/os-support/solaris/sun_VTsw.c | 9 ++++----- hw/xfree86/os-support/xf86_os_support.h | 3 ++- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/hw/xfree86/os-support/bsd/console.c b/hw/xfree86/os-support/bsd/console.c index a65913ab2..5dbc10c56 100644 --- a/hw/xfree86/os-support/bsd/console.c +++ b/hw/xfree86/os-support/bsd/console.c @@ -4,6 +4,8 @@ */ #include +#include + #include "xf86_console_priv.h" #include "xf86_os_support.h" @@ -13,10 +15,10 @@ void xf86OSRingBell(int loudness, int pitch, int duration) xf86_console_proc_bell(loudness, pitch, duration); } -Bool xf86VTSwitchAway(void) +bool xf86VTSwitchAway(void) { if (xf86_console_proc_switch_away) if (xf86_console_proc_switch_away()) - return TRUE; - return FALSE; + return true; + return false; } diff --git a/hw/xfree86/os-support/shared/VTsw_noop.c b/hw/xfree86/os-support/shared/VTsw_noop.c index 63373939d..facd11e92 100644 --- a/hw/xfree86/os-support/shared/VTsw_noop.c +++ b/hw/xfree86/os-support/shared/VTsw_noop.c @@ -39,10 +39,9 @@ xf86VTSwitchPending(void) return FALSE; } -Bool -xf86VTSwitchAway(void) +bool xf86VTSwitchAway(void) { - return FALSE; + return false; } Bool diff --git a/hw/xfree86/os-support/shared/VTsw_usl.c b/hw/xfree86/os-support/shared/VTsw_usl.c index 21ec884bb..14df253a8 100644 --- a/hw/xfree86/os-support/shared/VTsw_usl.c +++ b/hw/xfree86/os-support/shared/VTsw_usl.c @@ -57,16 +57,15 @@ xf86VTSwitchPending(void) return xf86Info.vtRequestsPending ? TRUE : FALSE; } -Bool -xf86VTSwitchAway(void) +bool xf86VTSwitchAway(void) { xf86Info.vtRequestsPending = FALSE; if (seatd_libseat_controls_session()) - return TRUE; + return true; if (ioctl(xf86Info.consoleFd, VT_RELDISP, 1) < 0) - return FALSE; + return false; else - return TRUE; + return true; } Bool diff --git a/hw/xfree86/os-support/solaris/sun_VTsw.c b/hw/xfree86/os-support/solaris/sun_VTsw.c index 1f14ed1fa..55f4c048d 100644 --- a/hw/xfree86/os-support/solaris/sun_VTsw.c +++ b/hw/xfree86/os-support/solaris/sun_VTsw.c @@ -66,8 +66,7 @@ xf86VTSwitchPending(void) return xf86Info.vtRequestsPending ? TRUE : FALSE; } -Bool -xf86VTSwitchAway(void) +bool xf86VTSwitchAway(void) { int door_fd; vt_cmd_arg_t vt_door_arg; @@ -78,7 +77,7 @@ xf86VTSwitchAway(void) if (xf86VTPruneDoor) { xf86VTPruneDoor = 0; ioctl(xf86Info.consoleFd, VT_RELDISP, 1); - return TRUE; + return true; } vt_door_arg.vt_ev = VT_EV_HOTKEYS; @@ -91,11 +90,11 @@ xf86VTSwitchAway(void) door_arg.desc_num = 0; if ((door_fd = open(VT_DAEMON_DOOR_FILE, O_RDONLY)) < 0) - return FALSE; + return false; if (door_call(door_fd, &door_arg) != 0) { close(door_fd); - return FALSE; + return false; } close(door_fd); diff --git a/hw/xfree86/os-support/xf86_os_support.h b/hw/xfree86/os-support/xf86_os_support.h index e6c573d0e..a9f22e79b 100644 --- a/hw/xfree86/os-support/xf86_os_support.h +++ b/hw/xfree86/os-support/xf86_os_support.h @@ -8,6 +8,7 @@ #ifndef _XSERVER_XF86_OS_SUPPORT #define _XSERVER_XF86_OS_SUPPORT +#include #include #include "os.h" @@ -38,7 +39,7 @@ Bool xf86VTKeepTtyIsSet(void); Bool xf86VTActivate(int vtno); Bool xf86VTSwitchPending(void); -Bool xf86VTSwitchAway(void); +bool xf86VTSwitchAway(void); Bool xf86VTSwitchTo(void); void xf86VTRequest(int sig); int xf86ProcessArgument(int argc, char **argv, int i);