terminal-util: rename set_terminal_cursor_position() → terminal_set_cursor_position()

Let's prefix these functions with the subsystem name, and clean them up
a bit. Specifically, drop the error logging, it's entirely duplicative,
since every single caller does it anyway.

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index fb6c9177d4936167a57cf57ba989612bff84da6e..8c3af0bcb3e94ead28204bf9b23f167ffca09964 100644 (file)
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -1522,19 +1522,13 @@ void get_log_colors(int priority, const char **on, const char **off, const char
         }
 }
 
-int set_terminal_cursor_position(int fd, unsigned int row, unsigned int column) {
-        int r;
-        char cursor_position[STRLEN("\x1B[") + DECIMAL_STR_MAX(int) * 2 + STRLEN(";H") + 1];
-
+int terminal_set_cursor_position(int fd, unsigned row, unsigned column) {
         assert(fd >= 0);
 
+        char cursor_position[STRLEN("\x1B[" ";" "H") + DECIMAL_STR_MAX(unsigned) * 2 + 1];
         xsprintf(cursor_position, "\x1B[%u;%uH", row, column);
 
-        r = loop_write(fd, cursor_position, SIZE_MAX);
-        if (r < 0)
-                return log_warning_errno(r, "Failed to set cursor position, ignoring: %m");
-
-        return 0;
+        return loop_write(fd, cursor_position, SIZE_MAX);
 }
 
 int terminal_reset_ansi_seq(int fd) {

diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h
index 691b37aa51ed89a73184ea353d090b5a6d7bcbab..51569a73f53555be71672387530fdaebb3f7c371 100644 (file)
--- a/src/basic/terminal-util.h
+++ b/src/basic/terminal-util.h
@@ -97,9 +97,10 @@ bool isatty_safe(int fd);
 
 int reset_terminal_fd(int fd, bool switch_to_text);
 int reset_terminal(const char *name);
-int set_terminal_cursor_position(int fd, unsigned int row, unsigned int column);
 int terminal_reset_ansi_seq(int fd);
 
+int terminal_set_cursor_position(int fd, unsigned row, unsigned column);
+
 int open_terminal(const char *name, int mode);
 
 /* Flags for tweaking the way we become the controlling process of a terminal. */

diff --git a/src/journal/bsod.c b/src/journal/bsod.c
index b2889f02eda230739fd54d8d7a51d037bdfd8b9b..2116c498a4b6f35a94126d37dc5e69a112e62659 100644 (file)
--- a/src/journal/bsod.c
+++ b/src/journal/bsod.c
@@ -185,7 +185,7 @@ static int display_emergency_message_fullscreen(const char *message) {
         if (r < 0)
                 log_warning_errno(r, "Failed to clear terminal, ignoring: %m");
 
-        r = set_terminal_cursor_position(fd, 2, 4);
+        r = terminal_set_cursor_position(fd, 2, 4);
         if (r < 0)
                 log_warning_errno(r, "Failed to move terminal cursor position, ignoring: %m");
 
@@ -197,7 +197,7 @@ static int display_emergency_message_fullscreen(const char *message) {
 
         qr_code_start_row = w.ws_row * 3U / 5U;
         qr_code_start_column = w.ws_col * 3U / 4U;
-        r = set_terminal_cursor_position(fd, 4, 4);
+        r = terminal_set_cursor_position(fd, 4, 4);
         if (r < 0)
                 log_warning_errno(r, "Failed to move terminal cursor position, ignoring: %m");
 
@@ -217,7 +217,7 @@ static int display_emergency_message_fullscreen(const char *message) {
         if (r < 0)
                 log_warning_errno(r, "QR code could not be printed, ignoring: %m");
 
-        r = set_terminal_cursor_position(fd, w.ws_row - 1, w.ws_col * 2U / 5U);
+        r = terminal_set_cursor_position(fd, w.ws_row - 1, w.ws_col * 2U / 5U);
         if (r < 0)
                 log_warning_errno(r, "Failed to move terminal cursor position, ignoring: %m");
 

diff --git a/src/shared/qrcode-util.c b/src/shared/qrcode-util.c
index a63e6cac73232fd66b0fe4732d052028604a06da..10ed542df22f56809174df625ae8df7b3a5f7b91 100644 (file)
--- a/src/shared/qrcode-util.c
+++ b/src/shared/qrcode-util.c
@@ -52,7 +52,7 @@ static void print_border(FILE *output, unsigned width, unsigned row, unsigned co
                 if (fd < 0)
                         return (void)log_debug_errno(errno, "Failed to get file descriptor from the file stream: %m");
 
-                r = set_terminal_cursor_position(fd, row, column);
+                r = terminal_set_cursor_position(fd, row, column);
                 if (r < 0)
                         log_warning_errno(r, "Failed to move terminal cursor position, ignoring: %m");
 
@@ -64,7 +64,7 @@ static void print_border(FILE *output, unsigned width, unsigned row, unsigned co
                                 fputs(UNICODE_FULL_BLOCK, output);
 
                         fputs(ANSI_NORMAL "\n", output);
-                        r = set_terminal_cursor_position(fd, row + 1, column);
+                        r = terminal_set_cursor_position(fd, row + 1, column);
                         if (r < 0)
                                 log_warning_errno(r, "Failed to move terminal cursor position, ignoring: %m");
                 }
@@ -96,7 +96,7 @@ static void write_qrcode(FILE *output, QRcode *qr, unsigned int row, unsigned in
                 if (fd < 0)
                         return (void)log_debug_errno(errno, "Failed to get file descriptor from the file stream: %m");
 
-                r = set_terminal_cursor_position(fd, row + move_down, column);
+                r = terminal_set_cursor_position(fd, row + move_down, column);
                 if (r < 0)
                         log_warning_errno(r, "Failed to move terminal cursor position, ignoring: %m");
 
@@ -127,7 +127,7 @@ static void write_qrcode(FILE *output, QRcode *qr, unsigned int row, unsigned in
 
                         for (unsigned x = 0; x < 4; x++)
                                 fputs(UNICODE_FULL_BLOCK, output);
-                        r = set_terminal_cursor_position(fd, row + move_down, column);
+                        r = terminal_set_cursor_position(fd, row + move_down, column);
                         if (r < 0)
                                 log_warning_errno(r, "Failed to move terminal cursor position, ignoring: %m");
                         move_down += 1;
@@ -206,7 +206,7 @@ int print_qrcode_full(FILE *out, const char *header, const char *string, unsigne
                         row = tty_height - (qr_code_height / 2 ) - 1;
 
                 if (header) {
-                        r = set_terminal_cursor_position(fd, row - 2, tty_width - qr_code_width - 2);
+                        r = terminal_set_cursor_position(fd, row - 2, tty_width - qr_code_width - 2);
                         if (r < 0)
                                 log_warning_errno(r, "Failed to move terminal cursor position, ignoring: %m");