fix __noreturn__ usage

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/login-utils/chsh.c b/login-utils/chsh.c
index 41acc1ffc1c8f0d6b3bce6851fe8cbe91046981c..22b3350638cf3954032511aa80d7582c38d02f6f 100644 (file)
--- a/login-utils/chsh.c
+++ b/login-utils/chsh.c
@@ -82,7 +82,7 @@ static char *prompt (char *question, char *def_val);
 static int check_shell (char *shell);
 static boolean get_shell_list (char *shell);
 
-static int __attribute__((__noreturn__)) usage (FILE *fp)
+static void __attribute__((__noreturn__)) usage (FILE *fp)
 {
     fprintf (fp,
             _("Usage: %s [ -s shell ] [ --list-shells ] "

diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c
index 9d3547b1a3ab311a5c0c07169bc326bae62846bb..2b3a50b349573410bc66372b841285ba438bda40 100644 (file)
--- a/misc-utils/findmnt.c
+++ b/misc-utils/findmnt.c
@@ -404,7 +404,7 @@ again:
        return fs;
 }
 
-static int __attribute__((__noreturn__)) usage(FILE *out)
+static void __attribute__((__noreturn__)) usage(FILE *out)
 {
        int i;
 
@@ -456,7 +456,7 @@ static int __attribute__((__noreturn__)) usage(FILE *out)
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 
-static int __attribute__((__noreturn__))
+static void __attribute__((__noreturn__))
 errx_mutually_exclusive(const char *opts)
 {
        errx(EXIT_FAILURE, "%s %s", opts, _("options are mutually exclusive"));

diff --git a/misc-utils/lsblk.c b/misc-utils/lsblk.c
index 745a3e615f12d0fcd6712a06976c683c85e29fad..cdfce42f1b0a6db2c4e5ce15501cedd44500d804 100644 (file)
--- a/misc-utils/lsblk.c
+++ b/misc-utils/lsblk.c
@@ -841,7 +841,7 @@ static void parse_excludes(const char *str)
        }
 }
 
-static int __attribute__((__noreturn__)) help(FILE *out)
+static void __attribute__((__noreturn__)) help(FILE *out)
 {
        int i;
 
@@ -874,7 +874,7 @@ static int __attribute__((__noreturn__)) help(FILE *out)
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 
-static int __attribute__((__noreturn__))
+static void __attribute__((__noreturn__))
 errx_mutually_exclusive(const char *opts)
 {
        errx(EXIT_FAILURE, "%s %s", opts, _("options are mutually exclusive"));

diff --git a/mount/sundries.c b/mount/sundries.c
index 4cf308992879fa79d85f43b3b771a8f38a3b5228..7190aca8d52ac08cdf32563f89eb23cd86e8a0c8 100644 (file)
--- a/mount/sundries.c
+++ b/mount/sundries.c
@@ -115,8 +115,8 @@ error (const char *fmt, ...) {
 }
 
 /* Fatal error.  Print message and exit.  */
- __attribute__ ((noreturn)) void
-die(int err, const char *fmt, ...) {
+void __attribute__ ((noreturn)) die(int err, const char *fmt, ...)
+{
        va_list args;
 
        va_start(args, fmt);

diff --git a/partx/partx.c b/partx/partx.c
index 031b285e77d2eb3709edf5d021d1a162b8f8e55d..85590c2b854864cb3ede4c69d38ea61bae69e88a 100644 (file)
--- a/partx/partx.c
+++ b/partx/partx.c
@@ -588,7 +588,7 @@ static blkid_partlist get_partlist(blkid_probe pr,
        return ls;
 }
 
-static int __attribute__((__noreturn__)) usage(FILE *out)
+static void __attribute__((__noreturn__)) usage(FILE *out)
 {
        int i;
 
@@ -622,7 +622,7 @@ static int __attribute__((__noreturn__)) usage(FILE *out)
        exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
 }
 
-static int __attribute__((__noreturn__))
+static void __attribute__((__noreturn__))
 errx_mutually_exclusive(const char *opts)
 {
        errx(EXIT_FAILURE, "%s %s", opts, _("options are mutually exclusive"));

diff --git a/sys-utils/renice.c b/sys-utils/renice.c
index 8a60cd83aa1951d34ee6ff3bd5664feb9dacc37b..6b1a9726b01398339821a4c0bf3e0697af7dc75e 100644 (file)
--- a/sys-utils/renice.c
+++ b/sys-utils/renice.c
@@ -49,7 +49,7 @@
 
 static int donice(int,int,int);
 
-static int __attribute__((__noreturn__)) usage(FILE *out)
+static void __attribute__((__noreturn__)) usage(FILE *out)
 {
        fprintf(out, _(
                "\nUsage:\n"