lib/exec_shell: cleanup function attributes

Reported-by: Sami Kerola <kerolasa@iki.fi>
Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/include/exec_shell.h b/include/exec_shell.h
index a2aa757deca6a1554e381ba5f0b0bca2e98422b7..04aa089cc9a6c0c2c9b6aacc813e5e88066c30cf 100644 (file)
--- a/include/exec_shell.h
+++ b/include/exec_shell.h
@@ -1 +1,6 @@
-extern void __attribute__((__noreturn__)) exec_shell(void);
+#ifndef UTIL_LINUX_EXEC_SHELL_H
+#define UTIL_LINUX_EXEC_SHELL_H
+
+extern void exec_shell(void) __attribute__((__noreturn__));
+
+#endif /* UTIL_LINUX_EXEC_SHELL_H */

diff --git a/lib/exec_shell.c b/lib/exec_shell.c
index a7374bd334c7195a19588965238429ea3c8da966..b2f178add285ff86d4db34f89901f67cf9e3117d 100644 (file)
--- a/lib/exec_shell.c
+++ b/lib/exec_shell.c
@@ -30,7 +30,7 @@
 
 #define DEFAULT_SHELL "/bin/sh"
 
-void exec_shell(void)
+void __attribute__((__noreturn__)) exec_shell(void)
 {
        const char *shell = getenv("SHELL");
        char *shellc = xstrdup(shell);