diff options
author | William Roberts <william.c.roberts@intel.com> | 2016-11-01 14:23:10 -0700 |
---|---|---|
committer | Stephen Smalley <sds@tycho.nsa.gov> | 2016-11-01 17:29:49 -0400 |
commit | e4f2bcce24181131014dc18d3f948e7e2a65d6cc (patch) | |
tree | 1815eaf23f28abb609ad90a45f46634b9ec30a4a | |
parent | 4c519cd73031a7c1711d87801be11c716e887d44 (diff) | |
download | android_external_selinux-e4f2bcce24181131014dc18d3f948e7e2a65d6cc.tar.gz android_external_selinux-e4f2bcce24181131014dc18d3f948e7e2a65d6cc.tar.bz2 android_external_selinux-e4f2bcce24181131014dc18d3f948e7e2a65d6cc.zip |
libselinux/utils: fix all the noreturn errors
When building with clang, multiple noreturn issues arise,
for instance:
selabel_partial_match.c:11:1: error: function 'usage' could be declared with attribute 'noreturn' [-Werror,-Wmissing-noreturn]
Fix these.
Signed-off-by: William Roberts <william.c.roberts@intel.com>
-rw-r--r-- | libselinux/utils/avcstat.c | 2 | ||||
-rw-r--r-- | libselinux/utils/getconlist.c | 2 | ||||
-rw-r--r-- | libselinux/utils/getdefaultcon.c | 2 | ||||
-rw-r--r-- | libselinux/utils/getsebool.c | 2 | ||||
-rw-r--r-- | libselinux/utils/matchpathcon.c | 2 | ||||
-rw-r--r-- | libselinux/utils/selabel_digest.c | 2 | ||||
-rw-r--r-- | libselinux/utils/selabel_lookup.c | 2 | ||||
-rw-r--r-- | libselinux/utils/selabel_lookup_best_match.c | 2 | ||||
-rw-r--r-- | libselinux/utils/selabel_partial_match.c | 2 | ||||
-rw-r--r-- | libselinux/utils/selinux_check_securetty_context.c | 2 | ||||
-rw-r--r-- | libselinux/utils/selinux_restorecon.c | 2 | ||||
-rw-r--r-- | libselinux/utils/selinuxexeccon.c | 2 | ||||
-rw-r--r-- | libselinux/utils/setenforce.c | 2 | ||||
-rw-r--r-- | libselinux/utils/togglesebool.c | 2 |
14 files changed, 14 insertions, 14 deletions
diff --git a/libselinux/utils/avcstat.c b/libselinux/utils/avcstat.c index 1d4d5c80..70b3109b 100644 --- a/libselinux/utils/avcstat.c +++ b/libselinux/utils/avcstat.c @@ -43,7 +43,7 @@ static char buf[DEF_BUF_SIZE]; /* selinuxfs mount point */ extern char *selinux_mnt; -static __attribute__((__format__(printf,1,2))) void die(const char *msg, ...) +static __attribute__((__format__(printf,1,2),__noreturn__)) void die(const char *msg, ...) { va_list args; diff --git a/libselinux/utils/getconlist.c b/libselinux/utils/getconlist.c index 872ce05f..adec1781 100644 --- a/libselinux/utils/getconlist.c +++ b/libselinux/utils/getconlist.c @@ -9,7 +9,7 @@ #include <selinux/selinux.h> #include <selinux/get_context_list.h> -static void usage(const char *name, const char *detail, int rc) +static __attribute__ ((__noreturn__)) void usage(const char *name, const char *detail, int rc) { fprintf(stderr, "usage: %s [-l level] user [context]\n", name); if (detail) diff --git a/libselinux/utils/getdefaultcon.c b/libselinux/utils/getdefaultcon.c index c6f71516..96a5a8c2 100644 --- a/libselinux/utils/getdefaultcon.c +++ b/libselinux/utils/getdefaultcon.c @@ -9,7 +9,7 @@ #include <selinux/selinux.h> #include <selinux/get_context_list.h> -static void usage(const char *name, const char *detail, int rc) +static __attribute__ ((__noreturn__)) void usage(const char *name, const char *detail, int rc) { fprintf(stderr, "usage: %s [-l level] [-s service] user [fromcon]\n", name); if (detail) diff --git a/libselinux/utils/getsebool.c b/libselinux/utils/getsebool.c index 9ae92430..3c6eba55 100644 --- a/libselinux/utils/getsebool.c +++ b/libselinux/utils/getsebool.c @@ -6,7 +6,7 @@ #include <string.h> #include <selinux/selinux.h> -static void usage(const char *progname) +static __attribute__ ((__noreturn__)) void usage(const char *progname) { fprintf(stderr, "usage: %s -a or %s boolean...\n", progname, progname); exit(1); diff --git a/libselinux/utils/matchpathcon.c b/libselinux/utils/matchpathcon.c index d1f1348b..fca8ee29 100644 --- a/libselinux/utils/matchpathcon.c +++ b/libselinux/utils/matchpathcon.c @@ -12,7 +12,7 @@ #include <limits.h> #include <stdlib.h> -static void usage(const char *progname) +static __attribute__ ((__noreturn__)) void usage(const char *progname) { fprintf(stderr, "usage: %s [-N] [-n] [-f file_contexts] [ -P policy_root_path ] [-p prefix] [-Vq] path...\n", diff --git a/libselinux/utils/selabel_digest.c b/libselinux/utils/selabel_digest.c index e4d84a5a..49408a0b 100644 --- a/libselinux/utils/selabel_digest.c +++ b/libselinux/utils/selabel_digest.c @@ -8,7 +8,7 @@ static size_t digest_len; -static void usage(const char *progname) +static __attribute__ ((__noreturn__)) void usage(const char *progname) { fprintf(stderr, "usage: %s -b backend [-d] [-v] [-B] [-i] [-f file]\n\n" diff --git a/libselinux/utils/selabel_lookup.c b/libselinux/utils/selabel_lookup.c index b678a895..1aef64de 100644 --- a/libselinux/utils/selabel_lookup.c +++ b/libselinux/utils/selabel_lookup.c @@ -6,7 +6,7 @@ #include <selinux/selinux.h> #include <selinux/label.h> -static void usage(const char *progname) +static __attribute__ ((__noreturn__)) void usage(const char *progname) { fprintf(stderr, "usage: %s -b backend [-v] [-r] -k key [-t type] [-f file]\n\n" diff --git a/libselinux/utils/selabel_lookup_best_match.c b/libselinux/utils/selabel_lookup_best_match.c index d74382f6..6a717423 100644 --- a/libselinux/utils/selabel_lookup_best_match.c +++ b/libselinux/utils/selabel_lookup_best_match.c @@ -7,7 +7,7 @@ #include <selinux/selinux.h> #include <selinux/label.h> -static void usage(const char *progname) +static __attribute__ ((__noreturn__)) void usage(const char *progname) { fprintf(stderr, "usage: %s [-v] [-r] -p path [-m mode] [-f file] [link...]\n\n" diff --git a/libselinux/utils/selabel_partial_match.c b/libselinux/utils/selabel_partial_match.c index 017702d9..c5932cb1 100644 --- a/libselinux/utils/selabel_partial_match.c +++ b/libselinux/utils/selabel_partial_match.c @@ -7,7 +7,7 @@ #include <selinux/selinux.h> #include <selinux/label.h> -static void usage(const char *progname) +static __attribute__ ((__noreturn__)) void usage(const char *progname) { fprintf(stderr, "usage: %s [-v] -p <path> [-f file]\n\n" diff --git a/libselinux/utils/selinux_check_securetty_context.c b/libselinux/utils/selinux_check_securetty_context.c index b158eb37..84f59078 100644 --- a/libselinux/utils/selinux_check_securetty_context.c +++ b/libselinux/utils/selinux_check_securetty_context.c @@ -9,7 +9,7 @@ #include <sys/errno.h> #include <selinux/selinux.h> -static void usage(const char *progname) +static __attribute__ ((__noreturn__)) void usage(const char *progname) { fprintf(stderr, "usage: %s tty_context...\n", progname); exit(1); diff --git a/libselinux/utils/selinux_restorecon.c b/libselinux/utils/selinux_restorecon.c index 7aea81f6..4d2b08f8 100644 --- a/libselinux/utils/selinux_restorecon.c +++ b/libselinux/utils/selinux_restorecon.c @@ -34,7 +34,7 @@ static int validate_context(char **contextp) return 0; } -static void usage(const char *progname) +static __attribute__ ((__noreturn__)) void usage(const char *progname) { fprintf(stderr, "\nusage: %s [-FCnRrdmiIaAsl] [-e dir] [-v|-P]\n" diff --git a/libselinux/utils/selinuxexeccon.c b/libselinux/utils/selinuxexeccon.c index e0212e44..b50e7886 100644 --- a/libselinux/utils/selinuxexeccon.c +++ b/libselinux/utils/selinuxexeccon.c @@ -8,7 +8,7 @@ #include <ctype.h> #include <selinux/selinux.h> -static void usage(const char *name, const char *detail, int rc) +static __attribute__ ((__noreturn__)) void usage(const char *name, const char *detail, int rc) { fprintf(stderr, "usage: %s command [ fromcon ]\n", name); if (detail) diff --git a/libselinux/utils/setenforce.c b/libselinux/utils/setenforce.c index df585978..60a20a4b 100644 --- a/libselinux/utils/setenforce.c +++ b/libselinux/utils/setenforce.c @@ -6,7 +6,7 @@ #include <strings.h> #include <selinux/selinux.h> -static void usage(const char *progname) +static __attribute__ ((__noreturn__)) void usage(const char *progname) { fprintf(stderr, "usage: %s [ Enforcing | Permissive | 1 | 0 ]\n", progname); diff --git a/libselinux/utils/togglesebool.c b/libselinux/utils/togglesebool.c index 309f83b1..4a7c830e 100644 --- a/libselinux/utils/togglesebool.c +++ b/libselinux/utils/togglesebool.c @@ -10,7 +10,7 @@ /* Attempt to rollback the transaction. No need to check error codes since this is rolling back something that blew up. */ -static void rollback(int argc, char **argv) +static __attribute__ ((__noreturn__)) void rollback(int argc, char **argv) { int i; |