X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Fbasic%2Fterminal-util.c;h=f6118ebc244c709b85fa5198a2ec22b28d7fdd1b;hb=53e1b683907c2f12330f00feb9630150196f064d;hp=64745e80632c7a6b9b68843280032df2962c5107;hpb=cd4826e0e6f6f2f693a07641154ca3443df39d1e;p=thirdparty%2Fsystemd.git

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 64745e80632..f6118ebc244 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
 /***
   This file is part of systemd.
 
@@ -245,7 +246,6 @@ int ask_string(char **ret, const char *text, ...) {
 
 int reset_terminal_fd(int fd, bool switch_to_text) {
         struct termios termios;
-        _cleanup_free_ char *utf8 = NULL;
         int r = 0;
 
         /* Set terminal to some sane defaults */
@@ -476,7 +476,7 @@ int acquire_terminal(
 
                         l = read(notify, &buffer, sizeof(buffer));
                         if (l < 0) {
-                                if (errno == EINTR || errno == EAGAIN)
+                                if (IN_SET(errno, EINTR, EAGAIN))
                                         continue;
 
                                 r = -errno;