From cb2fcfc0a1da3cfac9094abf1d11c23653937395 Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Thu, 21 Sep 2017 13:36:42 +0200 Subject: Add no-return attribute to usage() style functions A common pattern in command line processing is having a usage() function that prints out how to use the command line options and then terminates. The function is typically used inside a switch block for command line options like `-h' or unknown options. In a lot of places, the break keyword is omitted, because the function exits anyway. However, this triggers gcc warnings about implicit fall-through. Rather than adding a phony "/* fall-through */" this patch flags the usage() style function with a gcc attribute, indicating that they do not return and removes further superfluous break statements. Signed-off-by: David Oberhollenzer --- tests/mtd-tests/flash_readtest.c | 2 +- tests/mtd-tests/flash_speed.c | 3 +-- tests/mtd-tests/flash_stress.c | 2 +- tests/mtd-tests/flash_torture.c | 2 +- tests/mtd-tests/nandbiterrs.c | 2 +- tests/mtd-tests/nandpagetest.c | 2 +- tests/mtd-tests/nandsubpagetest.c | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/mtd-tests/flash_readtest.c b/tests/mtd-tests/flash_readtest.c index bc6874a..c5fabc9 100644 --- a/tests/mtd-tests/flash_readtest.c +++ b/tests/mtd-tests/flash_readtest.c @@ -54,7 +54,7 @@ static const struct option options[] = { { NULL, 0, NULL, 0 }, }; -static void usage(int status) +static NORETURN void usage(int status) { fputs( "Usage: "PROGRAM_NAME" [OPTIONS] \n\n" diff --git a/tests/mtd-tests/flash_speed.c b/tests/mtd-tests/flash_speed.c index d5cedba..0058269 100644 --- a/tests/mtd-tests/flash_speed.c +++ b/tests/mtd-tests/flash_speed.c @@ -60,7 +60,7 @@ static const struct option options[] = { { NULL, 0, NULL, 0 }, }; -static void usage(int status) +static NORETURN void usage(int status) { fputs( "Usage: "PROGRAM_NAME" [OPTIONS] \n\n" @@ -100,7 +100,6 @@ static void process_options(int argc, char **argv) switch (c) { case 'h': usage(EXIT_SUCCESS); - break; case 'b': if (peb >= 0) goto failmulti; diff --git a/tests/mtd-tests/flash_stress.c b/tests/mtd-tests/flash_stress.c index f50c664..249d8cb 100644 --- a/tests/mtd-tests/flash_stress.c +++ b/tests/mtd-tests/flash_stress.c @@ -63,7 +63,7 @@ static const struct option options[] = { { NULL, 0, NULL, 0 }, }; -static void usage(int status) +static NORETURN void usage(int status) { fputs( "Usage: "PROGRAM_NAME" [OPTIONS] \n\n" diff --git a/tests/mtd-tests/flash_torture.c b/tests/mtd-tests/flash_torture.c index 21cedf4..5aad8e0 100644 --- a/tests/mtd-tests/flash_torture.c +++ b/tests/mtd-tests/flash_torture.c @@ -67,7 +67,7 @@ static void sighandler(int sig) flags &= ~RUN_FOREVER; } -static void usage(int status) +static NORETURN void usage(int status) { fputs( "Usage: "PROGRAM_NAME" [OPTIONS] \n\n" diff --git a/tests/mtd-tests/nandbiterrs.c b/tests/mtd-tests/nandbiterrs.c index 200fe1c..ef987dc 100644 --- a/tests/mtd-tests/nandbiterrs.c +++ b/tests/mtd-tests/nandbiterrs.c @@ -85,7 +85,7 @@ static const struct option options[] = { { NULL, 0, NULL, 0 }, }; -static void usage(int status) +static NORETURN void usage(int status) { fputs( "Usage: "PROGRAM_NAME" [OPTIONS] \n\n" diff --git a/tests/mtd-tests/nandpagetest.c b/tests/mtd-tests/nandpagetest.c index 86c9005..2b16cc9 100644 --- a/tests/mtd-tests/nandpagetest.c +++ b/tests/mtd-tests/nandpagetest.c @@ -58,7 +58,7 @@ static const struct option options[] = { { NULL, 0, NULL, 0 }, }; -static void usage(int status) +static NORETURN void usage(int status) { fputs( "Usage: "PROGRAM_NAME" [OPTIONS] \n\n" diff --git a/tests/mtd-tests/nandsubpagetest.c b/tests/mtd-tests/nandsubpagetest.c index 04f6c8c..cd7e4e8 100644 --- a/tests/mtd-tests/nandsubpagetest.c +++ b/tests/mtd-tests/nandsubpagetest.c @@ -57,7 +57,7 @@ static const struct option options[] = { { NULL, 0, NULL, 0 }, }; -static void usage(int status) +static NORETURN void usage(int status) { fputs( "Usage: "PROGRAM_NAME" [OPTIONS] \n\n" -- cgit v1.2.3