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 ffd687c8984d8f5cd74c13e1c975a4d0d089382d..4c9816d9698617a8b402d67163de447f6c866b9b 100644 (file)
--- 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;
 }