Prep v221: Update and clean up build system to sync with upstream

[elogind.git] / src / basic / terminal-util.c

diff --git a/src/shared/terminal-util.c b/src/basic/terminal-util.c
similarity index 99%
rename from src/shared/terminal-util.c
rename to src/basic/terminal-util.c
index 042b88f2229ec2bc7143333bcdba59c0bcc1ed72..103643614bd9042ad5c8ea22929e29c7c7db5362 100644 (file)
--- a/src/shared/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -174,6 +174,8 @@ int ask_char(char *ret, const char *replies, const char *text, ...) {
         }
 }
 
+/// UNNEEDED by elogind
+#if 0
 int ask_string(char **ret, const char *text, ...) {
         assert(ret);
         assert(text);
@@ -216,6 +218,7 @@ int ask_string(char **ret, const char *text, ...) {
                 }
         }
 }
+#endif // 0
 
 int reset_terminal_fd(int fd, bool switch_to_text) {
         struct termios termios;
@@ -882,10 +885,13 @@ unsigned lines(void) {
 }
 
 /* intended to be used as a SIGWINCH sighandler */
+/// UNNEEDED by elogind
+#if 0
 void columns_lines_cache_reset(int signum) {
         cached_columns = 0;
         cached_lines = 0;
 }
+#endif // 0
 
 bool on_tty(void) {
         static int cached_on_tty = -1;