From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 11 Jul 2024 09:28:29 +0000 (+0200)
Subject: terminal-util: simplify terminal_set_size_fd() a tiny bit
X-Git-Tag: v257-rc1~873^2~19
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=061b445828fbba3ed9348453c515d73624766815;p=systemd%2F.git

terminal-util: simplify terminal_set_size_fd() a tiny bit
---

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index ffd687c898..4c9816d969 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -908,13 +908,18 @@ unsigned lines(void) {
 int terminal_set_size_fd(int fd, const char *ident, unsigned rows, unsigned cols) {
         struct winsize ws;
 
+        assert(fd >= 0);
+
+        if (!ident)
+                ident = "TTY";
+
         if (rows == UINT_MAX && cols == UINT_MAX)
                 return 0;
 
         if (ioctl(fd, TIOCGWINSZ, &ws) < 0)
                 return log_debug_errno(errno,
                                        "TIOCGWINSZ ioctl for getting %s size failed, not setting terminal size: %m",
-                                       ident ?: "TTY");
+                                       ident);
 
         if (rows == UINT_MAX)
                 rows = ws.ws_row;
@@ -933,7 +938,7 @@ int terminal_set_size_fd(int fd, const char *ident, unsigned rows, unsigned cols
         ws.ws_col = cols;
 
         if (ioctl(fd, TIOCSWINSZ, &ws) < 0)
-                return log_debug_errno(errno, "TIOCSWINSZ ioctl for setting %s size failed: %m", ident ?: "TTY");
+                return log_debug_errno(errno, "TIOCSWINSZ ioctl for setting %s size failed: %m", ident);
 
         return 0;
 }