From 5a4e541779630c876c5fcc905a0a35bec052f3c8 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 11 Jul 2024 10:26:14 +0200 Subject: [PATCH] =?utf8?q?terminal-util:=20rename=20reset=5Fterminal=5Ffd(?= =?utf8?q?)=20=E2=86=92=20terminal=5Freset=5Fioctl()?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Let's put "terminal_" as prefix, like with the other reset calls, and let's make clear that this only encapsulates the ioctl-based reset logic, not the ANSI sequence based reset logic. --- src/basic/terminal-util.c | 6 +++--- src/basic/terminal-util.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index 5e54d33ae4..9720ac3c37 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c @@ -247,7 +247,7 @@ int ask_string(char **ret, const char *text, ...) { return 0; } -int reset_terminal_fd(int fd, bool switch_to_text) { +int terminal_reset_ioctl(int fd, bool switch_to_text) { struct termios termios; int r; @@ -575,7 +575,7 @@ void reset_dev_console_fd(int fd, bool switch_to_text) { assert(fd >= 0); - r = reset_terminal_fd(fd, switch_to_text); + r = terminal_reset_ioctl(fd, switch_to_text); if (r < 0) log_warning_errno(r, "Failed to reset /dev/console, ignoring: %m"); @@ -1574,7 +1574,7 @@ int terminal_reset_defensive(int fd, bool switch_to_text) { * * The specified fd should be open for *writing*! */ - RET_GATHER(r, reset_terminal_fd(fd, switch_to_text)); + RET_GATHER(r, terminal_reset_ioctl(fd, switch_to_text)); if (terminal_is_pty_fd(fd) == 0) RET_GATHER(r, terminal_reset_ansi_seq(fd)); diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h index 118672b340..46a91904c5 100644 --- a/src/basic/terminal-util.h +++ b/src/basic/terminal-util.h @@ -95,7 +95,7 @@ bool isatty_safe(int fd); -int reset_terminal_fd(int fd, bool switch_to_text); +int terminal_reset_ioctl(int fd, bool switch_to_text); int terminal_reset_ansi_seq(int fd); int terminal_reset_defensive(int fd, bool switch_to_text); -- 2.25.1