macro: add DISABLE_WARNING_SHADOW

[elogind.git] / src / vconsole / vconsole-setup.c

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index ee1f3ebdb088e7745dc155b473bcc4dfc085cc7d..0f2b7066e2bcd8279097e1751f3c4a945681323c 100644 (file)
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -189,7 +189,7 @@ static void font_copy_to_all_vcs(int fd) {
 
         for (i = 1; i <= 15; i++) {
                 char vcname[16];
-                int _cleanup_close_ vcfd = -1;
+                _cleanup_close_ int vcfd = -1;
                 struct console_font_op cfo = {};
 
                 if (i == vcs.v_active)
@@ -301,8 +301,7 @@ finish:
         free(vc_font_map);
         free(vc_font_unimap);
 
-        if (fd >= 0)
-                close_nointr_nofail(fd);
+        safe_close(fd);
 
         return r;
 }