From f256e48d4ec9515d2bfc0d923d9a0b58d7c4abf1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 27 May 2025 18:12:00 +0200 Subject: [PATCH] basic/terminal-util: drop now-unused default_term_for_tty --- src/basic/terminal-util.c | 4 ---- src/basic/terminal-util.h | 1 - src/test/test-terminal-util.c | 15 --------------- 3 files changed, 20 deletions(-) diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index 9f34148d2a5..c1989cf0b00 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c @@ -1246,10 +1246,6 @@ bool tty_is_vc_resolve(const char *tty) { return tty_is_vc(tty); } -const char* default_term_for_tty(const char *tty) { - return tty && tty_is_vc_resolve(tty) ? "linux" : "vt220"; -} - int fd_columns(int fd) { struct winsize ws = {}; diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h index 8438a3fb210..28694693533 100644 --- a/src/basic/terminal-util.h +++ b/src/basic/terminal-util.h @@ -100,7 +100,6 @@ bool tty_is_vc(const char *tty); bool tty_is_vc_resolve(const char *tty); bool tty_is_console(const char *tty) _pure_; int vtnr_from_tty(const char *tty); -const char* default_term_for_tty(const char *tty); void reset_dev_console_fd(int fd, bool switch_to_text); int lock_dev_console(void); diff --git a/src/test/test-terminal-util.c b/src/test/test-terminal-util.c index 6ab3c7fa164..358d578ccb0 100644 --- a/src/test/test-terminal-util.c +++ b/src/test/test-terminal-util.c @@ -29,21 +29,6 @@ TEST(colors_enabled) { log_info("colors_enabled: %s", yes_no(colors_enabled())); } -TEST(default_term_for_tty) { - puts(default_term_for_tty("/dev/tty23")); - puts(default_term_for_tty("/dev/ttyS23")); - puts(default_term_for_tty("/dev/tty0")); - puts(default_term_for_tty("/dev/pty0")); - puts(default_term_for_tty("/dev/pts/0")); - puts(default_term_for_tty("/dev/console")); - puts(default_term_for_tty("tty23")); - puts(default_term_for_tty("ttyS23")); - puts(default_term_for_tty("tty0")); - puts(default_term_for_tty("pty0")); - puts(default_term_for_tty("pts/0")); - puts(default_term_for_tty("console")); -} - TEST(read_one_char) { _cleanup_fclose_ FILE *file = NULL; char r; -- 2.47.3