From c2b2df604b845b4e1697d0911935e6644323c5a6 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 12 Apr 2021 23:10:21 +0100 Subject: tree-wide: avoid uninitialized warning on _cleanup_ variables With some versions of the compiler, the _cleanup_ attr makes it think the variable might be freed/closed when uninitialized, even though it cannot happen. The added cost is small enough to be worth the benefit, and optimized builds will help reduce it even further. --- src/basic/terminal-util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/basic/terminal-util.c') diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index 1a3f9ccb33..fafdaaa090 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c @@ -52,7 +52,7 @@ static volatile int cached_color_mode = _COLOR_INVALID; static volatile int cached_underline_enabled = -1; int chvt(int vt) { - _cleanup_close_ int fd; + _cleanup_close_ int fd = -1; /* Switch to the specified vt number. If the VT is specified <= 0 switch to the VT the kernel log messages go, * if that's configured. */ @@ -514,7 +514,7 @@ int terminal_vhangup_fd(int fd) { } int terminal_vhangup(const char *name) { - _cleanup_close_ int fd; + _cleanup_close_ int fd = -1; fd = open_terminal(name, O_RDWR|O_NOCTTY|O_CLOEXEC|O_NONBLOCK); if (fd < 0) -- cgit v1.2.1