From: Alejandro Colomar Date: Thu, 7 Aug 2025 12:39:28 +0000 (+0200) Subject: src/: usage(): Use [[noreturn]] X-Git-Tag: 4.19.0-rc1~78 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ce748ee0d427a459b8cf42494e7978214405d64;p=thirdparty%2Fshadow.git src/: usage(): Use [[noreturn]] This silences false-positive diagnostics in Clang. Signed-off-by: Alejandro Colomar --- diff --git a/src/get_subid_owners.c b/src/get_subid_owners.c index abb42ba84..ca6cf99c6 100644 --- a/src/get_subid_owners.c +++ b/src/get_subid_owners.c @@ -4,6 +4,7 @@ #include #include "atoi/getnum.h" +#include "attr.h" #include "prototypes.h" #include "shadowlog.h" #include "stdlib.h" @@ -14,13 +15,8 @@ static const char Prog[] = "get_subid_owners"; -static void usage(void) -{ - fprintf(stderr, "Usage: [-g] %s subuid\n", Prog); - fprintf(stderr, " list uids who own the given subuid\n"); - fprintf(stderr, " pass -g to query a subgid\n"); - exit(EXIT_FAILURE); -} +NORETURN static void usage(void); + int main(int argc, char *argv[]) { @@ -52,3 +48,13 @@ int main(int argc, char *argv[]) free(uids); return 0; } + + +static void +usage(void) +{ + fprintf(stderr, "Usage: [-g] %s subuid\n", Prog); + fprintf(stderr, " list uids who own the given subuid\n"); + fprintf(stderr, " pass -g to query a subgid\n"); + exit(EXIT_FAILURE); +} diff --git a/src/getsubids.c b/src/getsubids.c index 739792e97..9e29879f2 100644 --- a/src/getsubids.c +++ b/src/getsubids.c @@ -4,6 +4,7 @@ #include #include +#include "attr.h" #include "prototypes.h" #include "shadowlog.h" #include "string/strcmp/streq.h" @@ -11,13 +12,9 @@ static const char Prog[] = "getsubids"; -static void usage(void) -{ - fprintf(stderr, "Usage: %s [-g] user\n", Prog); - fprintf(stderr, " list subuid ranges for user\n"); - fprintf(stderr, " pass -g to list subgid ranges\n"); - exit(EXIT_FAILURE); -} + +NORETURN static void usage(void); + int main(int argc, char *argv[]) { @@ -49,3 +46,13 @@ int main(int argc, char *argv[]) subid_free(ranges); return 0; } + + +static void +usage(void) +{ + fprintf(stderr, "Usage: %s [-g] user\n", Prog); + fprintf(stderr, " list subuid ranges for user\n"); + fprintf(stderr, " pass -g to list subgid ranges\n"); + exit(EXIT_FAILURE); +}