From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 11 Jul 2024 08:26:14 +0000 (+0200)
Subject: terminal-util: rename reset_terminal_fd() → terminal_reset_ioctl()
X-Git-Tag: v257-rc1~873^2~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a4e541779630c876c5fcc905a0a35bec052f3c8;p=thirdparty%2Fsystemd.git

terminal-util: rename reset_terminal_fd() → terminal_reset_ioctl()

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.
---

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 5e54d33ae4d..9720ac3c371 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 118672b340c..46a91904c53 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);