diff options
985 files changed, 1083 insertions, 3687 deletions
diff --git a/doc/test-writing-guidelines.txt b/doc/test-writing-guidelines.txt index 203a1eb2c..73e14e6b8 100644 --- a/doc/test-writing-guidelines.txt +++ b/doc/test-writing-guidelines.txt @@ -279,11 +279,9 @@ static void test(void) int main(int argc, char *argv[]) { - const char *msg; int lc; - if ((msg = parse_opts(argc, argv, NULL, NULL))) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); @@ -319,8 +317,24 @@ WARNING: Don't use 'tst_brkm()' in 'cleanup()' unless you really want to exit the cleanup prematurely. See discussion below for further information. -The 'parse_opts()' parses the test command line arguments, it's important to -use it even if the test has no (other than default) parameters. +[source,c] +------------------------------------------------------------------------------- +typedef struct { + char *option; /* Valid option string (one option only) like "a:" */ + int *flag; /* Pointer to location to set true if option given */ + char **arg; /* Pointer to location to place argument, if needed */ +} option_t; + +void tst_parse_opts(int argc, char *argv[], const option_t *user_optarg, + void (*user_help)(void)); +------------------------------------------------------------------------------- + +The 'tst_parse_opts()' parses the test command line arguments, it's important +to use it even if the test has no (other than default) parameters. + +Test specific parameters can be passed to the function by the 'NULL' terminated +'user_optarg' array as far as they don't conflict with the parameters used by +the test library (these can be listed by passing '-h' to a LTP testcase). The last important thing is the 'TEST_LOOPING()' macro, each test has standard options so that it can be executed N times or for M seconds. diff --git a/include/test.h b/include/test.h index f45bb3692..d628eab92 100644 --- a/include/test.h +++ b/include/test.h @@ -120,6 +120,16 @@ pid_t tst_vfork(void); extern int Forker_pids[]; extern int Forker_npids; +typedef struct { + char *option; /* Valid option string (one option only) like "a:" */ + int *flag; /* Pointer to location to set true if option given */ + char **arg; /* Pointer to location to place argument, if needed */ +} option_t; + +/* lib/tst_parse_opts.c */ +void tst_parse_opts(int argc, char *argv[], const option_t *user_optarg, + void (*user_help)(void)); + /* lib/tst_res.c */ const char *strttype(int ttype); void tst_res_(const char *file, const int lineno, int ttype, diff --git a/include/usctest.h b/include/usctest.h index 2de25c2e9..8d9bacbc4 100644 --- a/include/usctest.h +++ b/include/usctest.h @@ -54,24 +54,6 @@ extern int STD_TIMING_ON, /* turned on by -t to print timing stats */ STD_LOOP_COUNT; /* changed by -in to set loop count to n */ -typedef struct { - char *option; /* Valid option string (one option only) like "a:" */ - int *flag; /* Pointer to location to set true if option given */ - char **arg; /* Pointer to location to place argument, if needed */ -} option_t; - -/* - * The parse_opts library routine takes that argc and argv parameters recevied - * by main() and an array of structures defining user options. It parses the - * command line setting flag and argument locations associated with the - * options. The uhf() is a function called to print user defined help. - * - * The function returns a pointer to an error message if an error occurs or in - * case of success NULL. - */ -const char *parse_opts(int ac, char **av, const option_t *user_optarr, void - (*uhf)(void)); - extern long TEST_RETURN; extern int TEST_ERRNO; diff --git a/lib/ltp_priv.h b/lib/ltp_priv.h index 9507e9d35..813df2a13 100644 --- a/lib/ltp_priv.h +++ b/lib/ltp_priv.h @@ -47,4 +47,7 @@ const char *tst_get_startwd(void); #define USC_NO_FUNC_CHECK "USC_NO_FUNC_CHECK" #define USC_LOOP_DELAY "USC_LOOP_DELAY" +const char *parse_opts(int ac, char **av, const option_t *user_optarr, void + (*uhf)(void)); + #endif /* __LTP_PRIV_H__ */ diff --git a/lib/tst_parse_opts.c b/lib/tst_parse_opts.c new file mode 100644 index 000000000..94970e1a8 --- /dev/null +++ b/lib/tst_parse_opts.c @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2015 Cyril Hrubis chrubis@suse.cz + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it would be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * Further, this software is distributed without any warranty that it is + * free of the rightful claim of any third person regarding infringement + * or the like. Any license provided herein, whether implied or + * otherwise, applies only to this software file. Patent licenses, if + * any, provided herein do not apply to combinations of this program with + * other software, or any other product whatsoever. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "test.h" +#include "ltp_priv.h" + +void tst_parse_opts(int argc, char *argv[], const option_t *user_optarg, + void (*user_help)(void)) +{ + const char *msg; + + msg = parse_opts(argc, argv, user_optarg, user_help); + + if (msg) + tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); +} diff --git a/testcases/kernel/containers/mountns/mountns01.c b/testcases/kernel/containers/mountns/mountns01.c index d50cbbada..44403257f 100644 --- a/testcases/kernel/containers/mountns/mountns01.c +++ b/testcases/kernel/containers/mountns/mountns01.c @@ -132,12 +132,9 @@ static void test(void) int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/containers/mountns/mountns02.c b/testcases/kernel/containers/mountns/mountns02.c index 56533c00a..89858e6de 100644 --- a/testcases/kernel/containers/mountns/mountns02.c +++ b/testcases/kernel/containers/mountns/mountns02.c @@ -132,12 +132,9 @@ static void test(void) int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/containers/mountns/mountns03.c b/testcases/kernel/containers/mountns/mountns03.c index 8457faf10..1ac68e217 100644 --- a/testcases/kernel/containers/mountns/mountns03.c +++ b/testcases/kernel/containers/mountns/mountns03.c @@ -149,12 +149,9 @@ static void test(void) int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/containers/mountns/mountns04.c b/testcases/kernel/containers/mountns/mountns04.c index c7a3af50f..5155900ee 100644 --- a/testcases/kernel/containers/mountns/mountns04.c +++ b/testcases/kernel/containers/mountns/mountns04.c @@ -72,12 +72,9 @@ static void test(void) int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/containers/netns/netns_netlink.c b/testcases/kernel/containers/netns/netns_netlink.c index 478536c57..cfa780ea8 100644 --- a/testcases/kernel/containers/netns/netns_netlink.c +++ b/testcases/kernel/containers/netns/netns_netlink.c @@ -167,12 +167,9 @@ static void test(void) int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/containers/pidns/pidns03.c b/testcases/kernel/containers/pidns/pidns03.c index 16d20d73b..ecd2627cd 100644 --- a/testcases/kernel/containers/pidns/pidns03.c +++ b/testcases/kernel/containers/pidns/pidns03.c @@ -107,12 +107,9 @@ static void test(void) int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/containers/sysvipc/msg_comm.c b/testcases/kernel/containers/sysvipc/msg_comm.c index 80409d400..8e21cfdf5 100644 --- a/testcases/kernel/containers/sysvipc/msg_comm.c +++ b/testcases/kernel/containers/sysvipc/msg_comm.c @@ -166,12 +166,9 @@ static void test(void) int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/containers/sysvipc/sem_comm.c b/testcases/kernel/containers/sysvipc/sem_comm.c index b44be6db0..157ba0c63 100644 --- a/testcases/kernel/containers/sysvipc/sem_comm.c +++ b/testcases/kernel/containers/sysvipc/sem_comm.c @@ -174,12 +174,9 @@ static void test(void) int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/containers/sysvipc/shm_comm.c b/testcases/kernel/containers/sysvipc/shm_comm.c index 16823a2b6..6836ebc7d 100644 --- a/testcases/kernel/containers/sysvipc/shm_comm.c +++ b/testcases/kernel/containers/sysvipc/shm_comm.c @@ -154,12 +154,9 @@ static void test(void) int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/controllers/cgroup_xattr/cgroup_xattr.c b/testcases/kernel/controllers/cgroup_xattr/cgroup_xattr.c index bb28e0212..d21656ff2 100644 --- a/testcases/kernel/controllers/cgroup_xattr/cgroup_xattr.c +++ b/testcases/kernel/controllers/cgroup_xattr/cgroup_xattr.c @@ -140,10 +140,7 @@ static void help(void) void setup(int argc, char *argv[]) { - const char *msg; - msg = parse_opts(argc, argv, options, help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, help); tst_require_root(NULL); diff --git a/testcases/kernel/device-drivers/acpi/ltp_acpi.c b/testcases/kernel/device-drivers/acpi/ltp_acpi.c index 74e025f00..47802d23c 100644 --- a/testcases/kernel/device-drivers/acpi/ltp_acpi.c +++ b/testcases/kernel/device-drivers/acpi/ltp_acpi.c @@ -142,10 +142,7 @@ static void test_run(void) int main(int argc, char *argv[]) { - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); tst_require_root(NULL); diff --git a/testcases/kernel/device-drivers/block/block_dev_user/block_dev.c b/testcases/kernel/device-drivers/block/block_dev_user/block_dev.c index c48354492..82bbab6b9 100644 --- a/testcases/kernel/device-drivers/block/block_dev_user/block_dev.c +++ b/testcases/kernel/device-drivers/block/block_dev_user/block_dev.c @@ -57,10 +57,7 @@ static void help(void) void setup(int argc, char *argv[]) { - const char *msg; - msg = parse_opts(argc, argv, options, help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, help); tst_require_root(NULL); diff --git a/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c b/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c index 481f04a2c..d5ef0d817 100644 --- a/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c +++ b/testcases/kernel/device-drivers/cpufreq/cpufreq_boost.c @@ -166,10 +166,7 @@ static void test_run(void) int main(int argc, char *argv[]) { - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/device-drivers/rtc/rtc01.c b/testcases/kernel/device-drivers/rtc/rtc01.c index 2eecc6227..1870526df 100644 --- a/testcases/kernel/device-drivers/rtc/rtc01.c +++ b/testcases/kernel/device-drivers/rtc/rtc01.c @@ -210,10 +210,7 @@ void update_interrupts_test(void) int main(int argc, char *argv[]) { - const char *msg; - msg = parse_opts(argc, argv, options, help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, help); tst_require_root(NULL); diff --git a/testcases/kernel/device-drivers/uaccess/uaccess.c b/testcases/kernel/device-drivers/uaccess/uaccess.c index c7b20c545..45f9d8010 100644 --- a/testcases/kernel/device-drivers/uaccess/uaccess.c +++ b/testcases/kernel/device-drivers/uaccess/uaccess.c @@ -93,10 +93,7 @@ static void tc_write_userspace(void) int main(int argc, char *argv[]) { - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); tst_require_root(NULL); diff --git a/testcases/kernel/firmware/fw_load_user/fw_load.c b/testcases/kernel/firmware/fw_load_user/fw_load.c index 84f55d7a9..f4bc3eae2 100644 --- a/testcases/kernel/firmware/fw_load_user/fw_load.c +++ b/testcases/kernel/firmware/fw_load_user/fw_load.c @@ -102,10 +102,8 @@ static void help(void) void setup(int argc, char *argv[]) { - const char *msg; - msg = parse_opts(argc, argv, options, help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + + tst_parse_opts(argc, argv, options, help); if (nflag) { if (sscanf(narg, "%i", &fw_size) != 1) diff --git a/testcases/kernel/fs/ftest/ftest01.c b/testcases/kernel/fs/ftest/ftest01.c index 099609a31..d3390f0f2 100644 --- a/testcases/kernel/fs/ftest/ftest01.c +++ b/testcases/kernel/fs/ftest/ftest01.c @@ -96,10 +96,8 @@ static int local_flag; int main(int ac, char *av[]) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/fs/ftest/ftest03.c b/testcases/kernel/fs/ftest/ftest03.c index 75aa144d6..10e2a4a98 100644 --- a/testcases/kernel/fs/ftest/ftest03.c +++ b/testcases/kernel/fs/ftest/ftest03.c @@ -102,10 +102,8 @@ static int local_flag; int main(int ac, char *av[]) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/fs/ftest/ftest04.c b/testcases/kernel/fs/ftest/ftest04.c index 31f3e104a..c00fdfc91 100644 --- a/testcases/kernel/fs/ftest/ftest04.c +++ b/testcases/kernel/fs/ftest/ftest04.c @@ -83,10 +83,8 @@ static int local_flag; int main(int ac, char *av[]) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/fs/ftest/ftest05.c b/testcases/kernel/fs/ftest/ftest05.c index 2b7ad1397..13ae676e8 100644 --- a/testcases/kernel/fs/ftest/ftest05.c +++ b/testcases/kernel/fs/ftest/ftest05.c @@ -100,10 +100,8 @@ static int local_flag; int main(int ac, char *av[]) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/fs/ftest/ftest06.c b/testcases/kernel/fs/ftest/ftest06.c index 809b0d70f..780cdbcc8 100644 --- a/testcases/kernel/fs/ftest/ftest06.c +++ b/testcases/kernel/fs/ftest/ftest06.c @@ -103,13 +103,11 @@ int main(int ac, char *av[]) char name[3]; int lc; - const char *msg; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* * Default values for run conditions. diff --git a/testcases/kernel/fs/ftest/ftest07.c b/testcases/kernel/fs/ftest/ftest07.c index 96f48f9ae..a6f36ec80 100644 --- a/testcases/kernel/fs/ftest/ftest07.c +++ b/testcases/kernel/fs/ftest/ftest07.c @@ -108,10 +108,8 @@ static int local_flag; int main(int ac, char *av[]) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/fs/ftest/ftest08.c b/testcases/kernel/fs/ftest/ftest08.c index 2855f46e2..7970ab913 100644 --- a/testcases/kernel/fs/ftest/ftest08.c +++ b/testcases/kernel/fs/ftest/ftest08.c @@ -90,10 +90,8 @@ static int local_flag; int main(int ac, char *av[]) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/fs/proc/proc01.c b/testcases/kernel/fs/proc/proc01.c index e98c63636..f513110ec 100644 --- a/testcases/kernel/fs/proc/proc01.c +++ b/testcases/kernel/fs/proc/proc01.c @@ -429,12 +429,9 @@ static long readproc(const char *obj) int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, options, help); - if (msg != NULL) - tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, help); if (opt_buffsize) { size_t bs; diff --git a/testcases/kernel/fs/stream/stream01.c b/testcases/kernel/fs/stream/stream01.c index c711a8137..af56bca3b 100644 --- a/testcases/kernel/fs/stream/stream01.c +++ b/testcases/kernel/fs/stream/stream01.c @@ -53,13 +53,11 @@ int main(int ac, char *av[]) char buf[10]; int i; int lc; - const char *msg; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); local_flag = PASSED; tst_tmpdir(); diff --git a/testcases/kernel/fs/stream/stream02.c b/testcases/kernel/fs/stream/stream02.c index fb65b5926..98473d86a 100644 --- a/testcases/kernel/fs/stream/stream02.c +++ b/testcases/kernel/fs/stream/stream02.c @@ -52,13 +52,11 @@ int main(int ac, char *av[]) FILE *stream; int fd; int lc; - const char *msg; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); local_flag = PASSED; tst_tmpdir(); diff --git a/testcases/kernel/fs/stream/stream03.c b/testcases/kernel/fs/stream/stream03.c index 47ba944ad..31715f740 100644 --- a/testcases/kernel/fs/stream/stream03.c +++ b/testcases/kernel/fs/stream/stream03.c @@ -54,14 +54,11 @@ int main(int ac, char *av[]) long pos; off_t opos; int lc; - const char *msg; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); local_flag = PASSED; tst_tmpdir(); diff --git a/testcases/kernel/fs/stream/stream04.c b/testcases/kernel/fs/stream/stream04.c index 72a54cf57..3dc679151 100644 --- a/testcases/kernel/fs/stream/stream04.c +++ b/testcases/kernel/fs/stream/stream04.c @@ -59,13 +59,11 @@ int main(int ac, char *av[]) int ret; int lc; - const char *msg; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); tst_tmpdir(); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/fs/stream/stream05.c b/testcases/kernel/fs/stream/stream05.c index 9be61312f..f561744c3 100644 --- a/testcases/kernel/fs/stream/stream05.c +++ b/testcases/kernel/fs/stream/stream05.c @@ -59,13 +59,11 @@ int main(int ac, char *av[]) int nr, fd; int lc; - const char *msg; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); tst_tmpdir(); local_flag = PASSED; diff --git a/testcases/kernel/io/aio/aio01/aio01.c b/testcases/kernel/io/aio/aio01/aio01.c index 41c34fc55..18acb0614 100644 --- a/testcases/kernel/io/aio/aio01/aio01.c +++ b/testcases/kernel/io/aio/aio01/aio01.c @@ -100,7 +100,6 @@ int main(int argc, char **argv) int failflag = 0; int bflag = 0, nflag = 0, Fflag = 0; char *optb, *optn, *optF; - const char *msg; struct io_event event; static struct timespec ts; struct timeval stv, etv; @@ -112,11 +111,7 @@ int main(int argc, char **argv) {NULL, NULL, NULL} }; - msg = parse_opts(argc, argv, options, &help); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - tst_exit(); - } + tst_parse_opts(argc, argv, options, &help); bufsize = (bflag ? atoi(optb) : 8192); nr = (nflag ? atoi(optn) : 10); diff --git a/testcases/kernel/io/direct_io/dma_thread_diotest.c b/testcases/kernel/io/direct_io/dma_thread_diotest.c index 25cbcc9aa..877b7072b 100644 --- a/testcases/kernel/io/direct_io/dma_thread_diotest.c +++ b/testcases/kernel/io/direct_io/dma_thread_diotest.c @@ -228,12 +228,9 @@ static void *fork_thread(void *arg) int main(int argc, char *argv[]) { int i, lc; - const char *msg; workers = sysconf(_SC_NPROCESSORS_ONLN); - msg = parse_opts(argc, argv, options, help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, help); setup(); diff --git a/testcases/kernel/ipc/semaphore/sem02.c b/testcases/kernel/ipc/semaphore/sem02.c index 6377d8bff..6d25569a6 100644 --- a/testcases/kernel/ipc/semaphore/sem02.c +++ b/testcases/kernel/ipc/semaphore/sem02.c @@ -79,14 +79,12 @@ int err_ret; /* This is used to determine PASS/FAIL status */ int main(int argc, char **argv) { int i, rc; - const char *msg; union semun semunion; pthread_t pt[NUMTHREADS]; pthread_attr_t attr; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); /* Create the semaphore set */ sem_id = semget(KEY, 1, 0666 | IPC_CREAT); if (sem_id < 0) { diff --git a/testcases/kernel/logging/kmsg/kmsg01.c b/testcases/kernel/logging/kmsg/kmsg01.c index 3803304be..e761fc588 100644 --- a/testcases/kernel/logging/kmsg/kmsg01.c +++ b/testcases/kernel/logging/kmsg/kmsg01.c @@ -557,11 +557,8 @@ static void test_seek(void) int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/mem/cpuset/cpuset01.c b/testcases/kernel/mem/cpuset/cpuset01.c index 0eb4137e1..b41e0b2c5 100644 --- a/testcases/kernel/mem/cpuset/cpuset01.c +++ b/testcases/kernel/mem/cpuset/cpuset01.c @@ -70,11 +70,8 @@ static long count_cpu(void); int main(int argc, char *argv[]) { - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); ncpus = count_cpu(); if (get_allowed_nodes_arr(NH_MEMS | NH_CPUS, &nnodes, &nodes) < 0) diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c index 58c5d7c5d..071d2d8b8 100644 --- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c +++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap01.c @@ -82,7 +82,6 @@ static void help(void); int main(int ac, char **av) { int lc; - const char *msg; int Hflag = 0; long page_sz = 0; int sflag = 0; @@ -93,10 +92,7 @@ int main(int ac, char **av) {NULL, NULL, NULL} }; - msg = parse_opts(ac, av, options, &help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s," - "use -help", msg); + tst_parse_opts(ac, av, options, &help); if (!Hflag) { tst_tmpdir(); diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c index 1df2c2ec1..e62f8b2e5 100644 --- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c +++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap02.c @@ -79,7 +79,6 @@ static void help(void); int main(int ac, char **av) { int lc; - const char *msg; int Hflag = 0; long page_sz, map_sz; int sflag = 0; @@ -90,10 +89,7 @@ int main(int ac, char **av) {NULL, NULL, NULL} }; - msg = parse_opts(ac, av, options, &help); - if (msg) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s," - " use -help", msg); + tst_parse_opts(ac, av, options, &help); if (!Hflag) { tst_tmpdir(); diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c index d4b801d92..14199eef2 100644 --- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c +++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap04.c @@ -85,7 +85,6 @@ static void help(void); int main(int ac, char **av) { int lc; - const char *msg; int Hflag = 0; int sflag = 0; int huge_pagesize = 0; @@ -96,10 +95,7 @@ int main(int ac, char **av) {NULL, NULL, NULL} }; - msg = parse_opts(ac, av, options, &help); - if (msg) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s," - " use -help", msg); + tst_parse_opts(ac, av, options, &help); if (!Hflag) { tst_tmpdir(); diff --git a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c index 755530cd0..97d7689b5 100644 --- a/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c +++ b/testcases/kernel/mem/hugetlb/hugemmap/hugemmap05.c @@ -112,14 +112,11 @@ static void init_sys_sz_paths(void); int main(int argc, char *argv[]) { int lc; - const char *msg; init_hugepagesize(); init_sys_sz_paths(); - msg = parse_opts(argc, argv, options, usage); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, usage); if (opt_sysfs) { strncpy(path, path_sys_sz_huge, strlen(path_sys_sz_huge) + 1); strncpy(pathover, path_sys_sz_over, diff --git a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c index c306e5cd7..55db08105 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c +++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat01.c @@ -100,11 +100,9 @@ static void check_functionality(int i); int main(int ac, char **av) { int lc, i; - const char *msg; - msg = parse_opts(ac, av, options, &help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); + if (sflag) hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX); diff --git a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c index 6a70be92b..d3d4eb1e8 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c +++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat02.c @@ -90,11 +90,9 @@ struct test_case_t { int main(int ac, char **av) { int lc, i; - const char *msg; - msg = parse_opts(ac, av, options, &help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); + if (sflag) hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX); diff --git a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c index 8456892b7..237e63e78 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c +++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat03.c @@ -80,13 +80,10 @@ static void do_child(void); int main(int ac, char **av) { - const char *msg; int status; pid_t pid; - msg = parse_opts(ac, av, options, &help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); if (sflag) hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX); diff --git a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c index 4ddff567f..7f0fbca62 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c +++ b/testcases/kernel/mem/hugetlb/hugeshmat/hugeshmat04.c @@ -65,11 +65,8 @@ static void shared_hugepage(void); int main(int ac, char **av) { int lc, i; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c index 18a820e54..657f9cb0d 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c +++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c @@ -111,11 +111,9 @@ struct test_case_t { int main(int ac, char **av) { int lc, i; - const char *msg; - msg = parse_opts(ac, av, options, &help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); + if (sflag) hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX); diff --git a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c index 3c819f4b3..3eab880c1 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c +++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c @@ -94,11 +94,9 @@ struct test_case_t { int main(int ac, char **av) { int lc, i; - const char *msg; - msg = parse_opts(ac, av, options, &help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); + if (sflag) hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX); diff --git a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c index dd33be1fd..ae35eb6ea 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c +++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c @@ -99,13 +99,11 @@ static void do_child(void); int main(int ac, char **av) { - const char *msg; pid_t pid; int status; - msg = parse_opts(ac, av, options, &help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); + if (sflag) hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX); diff --git a/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c b/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c index ddd7dac6f..b89a4473b 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c +++ b/testcases/kernel/mem/hugetlb/hugeshmdt/hugeshmdt01.c @@ -84,11 +84,9 @@ static void sighandler(int sig); int main(int ac, char **av) { int lc; - const char *msg; - msg = parse_opts(ac, av, options, &help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); + if (sflag) hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX); diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c index 3b636e884..619a69f6d 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c +++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget01.c @@ -77,12 +77,10 @@ static option_t options[] = { int main(int ac, char **av) { int lc; - const char *msg; struct shmid_ds buf; - msg = parse_opts(ac, av, options, &help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); + if (sflag) hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX); diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c index 30b014059..e6ef51779 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c +++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget02.c @@ -93,12 +93,10 @@ struct test_case_t { int main(int ac, char **av) { int lc, i; - const char *msg; int shm_id_2 = -1; - msg = parse_opts(ac, av, options, &help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); + if (sflag) hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX); diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c index e53666bdd..efeffdab7 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c +++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget03.c @@ -81,11 +81,9 @@ static option_t options[] = { int main(int ac, char **av) { int lc; - const char *msg; - msg = parse_opts(ac, av, options, &help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); + if (sflag) hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX); diff --git a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c index 3a9c77fcf..1190c0d9f 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c +++ b/testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget05.c @@ -82,13 +82,11 @@ static void do_child(void); int main(int ac, char **av) { - const char *msg; pid_t pid; int status; - msg = parse_opts(ac, av, options, &help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); + if (sflag) hugepages = SAFE_STRTOL(NULL, nr_opt, 0, LONG_MAX); diff --git a/testcases/kernel/mem/ksm/ksm01.c b/testcases/kernel/mem/ksm/ksm01.c index 974fccfe3..5adac9eed 100644 --- a/testcases/kernel/mem/ksm/ksm01.c +++ b/testcases/kernel/mem/ksm/ksm01.c @@ -84,12 +84,9 @@ option_t ksm_options[] = { int main(int argc, char *argv[]) { int lc; - const char *msg; int size = 128, num = 3, unit = 1; - msg = parse_opts(argc, argv, ksm_options, ksm_usage); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, ksm_options, ksm_usage); setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { tst_count = 0; diff --git a/testcases/kernel/mem/ksm/ksm02.c b/testcases/kernel/mem/ksm/ksm02.c index 665f1b97f..b11eb51cc 100644 --- a/testcases/kernel/mem/ksm/ksm02.c +++ b/testcases/kernel/mem/ksm/ksm02.c @@ -86,14 +86,11 @@ option_t ksm_options[] = { int main(int argc, char *argv[]) { int lc; - const char *msg; int size = 128, num = 3, unit = 1; unsigned long nmask[MAXNODES / BITS_PER_LONG] = { 0 }; unsigned int node; - msg = parse_opts(argc, argv, ksm_options, ksm_usage); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, ksm_options, ksm_usage); node = get_a_numa_node(tst_exit); set_node(nmask, node); diff --git a/testcases/kernel/mem/ksm/ksm03.c b/testcases/kernel/mem/ksm/ksm03.c index 41730b087..30abbba23 100644 --- a/testcases/kernel/mem/ksm/ksm03.c +++ b/testcases/kernel/mem/ksm/ksm03.c @@ -84,12 +84,9 @@ option_t ksm_options[] = { int main(int argc, char *argv[]) { int lc; - const char *msg; int size = 128, num = 3, unit = 1; - msg = parse_opts(argc, argv, ksm_options, ksm_usage); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, ksm_options, ksm_usage); setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { tst_count = 0; diff --git a/testcases/kernel/mem/ksm/ksm04.c b/testcases/kernel/mem/ksm/ksm04.c index da66ddeae..cd1f320a7 100644 --- a/testcases/kernel/mem/ksm/ksm04.c +++ b/testcases/kernel/mem/ksm/ksm04.c @@ -86,14 +86,11 @@ option_t ksm_options[] = { int main(int argc, char *argv[]) { int lc; - const char *msg; int size = 128, num = 3, unit = 1; unsigned long nmask[MAXNODES / BITS_PER_LONG] = { 0 }; unsigned int node; - msg = parse_opts(argc, argv, ksm_options, ksm_usage); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, ksm_options, ksm_usage); node = get_a_numa_node(tst_exit); set_node(nmask, node); diff --git a/testcases/kernel/mem/ksm/ksm05.c b/testcases/kernel/mem/ksm/ksm05.c index 07d01c77d..12809434c 100644 --- a/testcases/kernel/mem/ksm/ksm05.c +++ b/testcases/kernel/mem/ksm/ksm05.c @@ -81,13 +81,10 @@ int main(int argc, char *argv[]) { int lc, status; long ps; - const char *msg; pid_t pid; void *ptr; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); ps = sysconf(_SC_PAGESIZE); setup(); diff --git a/testcases/kernel/mem/ksm/ksm06.c b/testcases/kernel/mem/ksm/ksm06.c index 8ea8203d6..1cda01fe6 100644 --- a/testcases/kernel/mem/ksm/ksm06.c +++ b/testcases/kernel/mem/ksm/ksm06.c @@ -70,11 +70,9 @@ static void usage(void); int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, options, &usage); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PASING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, &usage); + if (n_flag) nr_pages = SAFE_STRTOUL(NULL, n_opt, 0, ULONG_MAX); else diff --git a/testcases/kernel/mem/mem/mem01.c b/testcases/kernel/mem/mem/mem01.c index 42d94d084..f7642ab24 100644 --- a/testcases/kernel/mem/mem/mem01.c +++ b/testcases/kernel/mem/mem/mem01.c @@ -152,14 +152,12 @@ int main(int argc, char *argv[]) int i; int lc; - const char *msg; char *p, *bigmalloc; int loop_count; /* limited to 16Go on 32 bits systems */ pagesize = sysconf(_SC_PAGESIZE); - if ((msg = parse_opts(argc, argv, options, help)) != NULL) - tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, help); if (m_opt) { memsize = (size_t) atoi(m_copt) * 1024 * 1024; diff --git a/testcases/kernel/mem/oom/oom01.c b/testcases/kernel/mem/oom/oom01.c index f5214ae11..44fa908b6 100644 --- a/testcases/kernel/mem/oom/oom01.c +++ b/testcases/kernel/mem/oom/oom01.c @@ -43,12 +43,9 @@ int TST_TOTAL = 1; int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #if __WORDSIZE == 32 tst_brkm(TCONF, NULL, "test is not designed for 32-bit system."); diff --git a/testcases/kernel/mem/oom/oom02.c b/testcases/kernel/mem/oom/oom02.c index 0d4c7c72a..fce0110e8 100644 --- a/testcases/kernel/mem/oom/oom02.c +++ b/testcases/kernel/mem/oom/oom02.c @@ -47,12 +47,9 @@ int TST_TOTAL = 1; int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #if __WORDSIZE == 32 tst_brkm(TCONF, NULL, "test is not designed for 32-bit system."); diff --git a/testcases/kernel/mem/oom/oom03.c b/testcases/kernel/mem/oom/oom03.c index 8c11ac2dd..c5d20b31c 100644 --- a/testcases/kernel/mem/oom/oom03.c +++ b/testcases/kernel/mem/oom/oom03.c @@ -45,12 +45,9 @@ int TST_TOTAL = 1; int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #if __WORDSIZE == 32 tst_brkm(TCONF, NULL, "test is not designed for 32-bit system."); diff --git a/testcases/kernel/mem/oom/oom04.c b/testcases/kernel/mem/oom/oom04.c index bcd88b5d4..3defe91bc 100644 --- a/testcases/kernel/mem/oom/oom04.c +++ b/testcases/kernel/mem/oom/oom04.c @@ -47,12 +47,9 @@ int TST_TOTAL = 1; int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #if __WORDSIZE == 32 tst_brkm(TCONF, NULL, "test is not designed for 32-bit system."); diff --git a/testcases/kernel/mem/oom/oom05.c b/testcases/kernel/mem/oom/oom05.c index 835c9896b..38f7e14f9 100644 --- a/testcases/kernel/mem/oom/oom05.c +++ b/testcases/kernel/mem/oom/oom05.c @@ -47,13 +47,10 @@ int TST_TOTAL = 1; int main(int argc, char *argv[]) { - const char *msg; int lc; int swap_acc_on = 1; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #if __WORDSIZE == 32 tst_brkm(TCONF, NULL, "test is not designed for 32-bit system."); diff --git a/testcases/kernel/mem/swapping/swapping01.c b/testcases/kernel/mem/swapping/swapping01.c index df11af288..b530ee248 100644 --- a/testcases/kernel/mem/swapping/swapping01.c +++ b/testcases/kernel/mem/swapping/swapping01.c @@ -77,11 +77,8 @@ static pid_t pid; int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #if __WORDSIZE == 32 tst_brkm(TCONF, NULL, "test is not designed for 32-bit system."); diff --git a/testcases/kernel/mem/thp/thp01.c b/testcases/kernel/mem/thp/thp01.c index 459b28cc3..e1eaa5081 100644 --- a/testcases/kernel/mem/thp/thp01.c +++ b/testcases/kernel/mem/thp/thp01.c @@ -65,11 +65,8 @@ int main(int argc, char **argv) { int i, lc, st; pid_t pid; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/mem/thp/thp02.c b/testcases/kernel/mem/thp/thp02.c index e8d5d4259..1470ae68a 100644 --- a/testcases/kernel/mem/thp/thp02.c +++ b/testcases/kernel/mem/thp/thp02.c @@ -65,11 +65,8 @@ static void do_mremap(void); int main(int argc, char **argv) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/mem/thp/thp03.c b/testcases/kernel/mem/thp/thp03.c index 3932df864..8f62d0c35 100644 --- a/testcases/kernel/mem/thp/thp03.c +++ b/testcases/kernel/mem/thp/thp03.c @@ -63,11 +63,8 @@ static long page_size; int main(int argc, char **argv) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/mem/thp/thp04.c b/testcases/kernel/mem/thp/thp04.c index b6e719a18..a80d61468 100644 --- a/testcases/kernel/mem/thp/thp04.c +++ b/testcases/kernel/mem/thp/thp04.c @@ -65,12 +65,9 @@ static char pre_thp_enabled[BUFSIZ]; int main(int argc, char *argv[]) { int lc; - const char *msg; int nr_children = 2, nr_thps = 64; - msg = parse_opts(argc, argv, thp_options, thp_usage); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, thp_options, thp_usage); check_thp_options(&nr_children, &nr_thps); setup(); diff --git a/testcases/kernel/mem/thp/thp05.c b/testcases/kernel/mem/thp/thp05.c index 690039ccf..fb0d8d293 100644 --- a/testcases/kernel/mem/thp/thp05.c +++ b/testcases/kernel/mem/thp/thp05.c @@ -72,9 +72,8 @@ int main(int argc, char *argv[]) char *msg; int nr_children = 2, nr_thps = 64; - msg = parse_opts(argc, argv, thp_options, thp_usage); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, thp_options, thp_usage); + check_thp_options(&nr_children, &nr_thps); setup(); diff --git a/testcases/kernel/mem/tunable/max_map_count.c b/testcases/kernel/mem/tunable/max_map_count.c index 6dc54a5aa..96ec2b8fd 100644 --- a/testcases/kernel/mem/tunable/max_map_count.c +++ b/testcases/kernel/mem/tunable/max_map_count.c @@ -76,12 +76,9 @@ static void max_map_count_test(void); int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR -%s ", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/mem/tunable/min_free_kbytes.c b/testcases/kernel/mem/tunable/min_free_kbytes.c index 8a3ae7d01..7c8038005 100644 --- a/testcases/kernel/mem/tunable/min_free_kbytes.c +++ b/testcases/kernel/mem/tunable/min_free_kbytes.c @@ -66,10 +66,11 @@ static void sighandler(int signo LTP_ATTRIBUTE_UNUSED); int main(int argc, char *argv[]) { - const char *msg; int lc, pid, status; struct sigaction sa; + tst_parse_opts(argc, argv, NULL, NULL); + sa.sa_handler = sighandler; if (sigemptyset(&sa.sa_mask) < 0) tst_brkm(TBROK | TERRNO, cleanup, "sigemptyset"); @@ -77,9 +78,6 @@ int main(int argc, char *argv[]) if (sigaction(SIGUSR1, &sa, NULL) < 0) tst_brkm(TBROK | TERRNO, cleanup, "sigaction"); - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR -s %s", msg); setup(); switch (pid = fork()) { diff --git a/testcases/kernel/mem/tunable/overcommit_memory.c b/testcases/kernel/mem/tunable/overcommit_memory.c index cbc671090..32e0e6450 100644 --- a/testcases/kernel/mem/tunable/overcommit_memory.c +++ b/testcases/kernel/mem/tunable/overcommit_memory.c @@ -110,12 +110,9 @@ static void update_mem(void); int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, options, &usage); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, &usage); #if __WORDSIZE == 32 tst_brkm(TCONF, NULL, "test is not designed for 32-bit system."); diff --git a/testcases/kernel/mem/vma/vma01.c b/testcases/kernel/mem/vma/vma01.c index 79e5f52dd..f800ffaf8 100644 --- a/testcases/kernel/mem/vma/vma01.c +++ b/testcases/kernel/mem/vma/vma01.c @@ -69,12 +69,9 @@ static void *p; int main(int argc, char **argv) { - const char *msg; int lc; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); ps = sysconf(_SC_PAGE_SIZE); setup(); diff --git a/testcases/kernel/mem/vma/vma02.c b/testcases/kernel/mem/vma/vma02.c index eb8cc6ab5..d3c436a5e 100644 --- a/testcases/kernel/mem/vma/vma02.c +++ b/testcases/kernel/mem/vma/vma02.c @@ -68,12 +68,9 @@ int main(int argc, char **argv) int node, err, lc; char buf[BUFSIZ]; struct bitmask *nmask = numa_allocate_nodemask(); - const char *msg; pagesize = getpagesize(); - msg = parse_opts(argc, argv, options, usage); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, usage); if (opt_node) { node = SAFE_STRTOL(NULL, opt_nodestr, 1, LONG_MAX); diff --git a/testcases/kernel/mem/vma/vma03.c b/testcases/kernel/mem/vma/vma03.c index a2f02d759..ad8a7b492 100644 --- a/testcases/kernel/mem/vma/vma03.c +++ b/testcases/kernel/mem/vma/vma03.c @@ -66,7 +66,6 @@ static void cleanup(void); int main(int argc, char *argv[]) { - const char *msg; int lc; void *map, *remap; off_t pgoff; @@ -74,9 +73,7 @@ int main(int argc, char *argv[]) #if __WORDSIZE != 32 tst_brkm(TCONF, NULL, "test is designed for 32-bit system only."); #endif - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); pgsz = sysconf(_SC_PAGE_SIZE); setup(); diff --git a/testcases/kernel/mem/vma/vma04.c b/testcases/kernel/mem/vma/vma04.c index 3ab26815c..f4f38095a 100644 --- a/testcases/kernel/mem/vma/vma04.c +++ b/testcases/kernel/mem/vma/vma04.c @@ -86,11 +86,8 @@ static void usage(void); int main(int argc, char **argv) { int lc, node, err; - const char *msg; - msg = parse_opts(argc, argv, options, usage); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, usage); nmask = numa_allocate_nodemask(); if (opt_node) { diff --git a/testcases/kernel/mem/zram/zram01.c b/testcases/kernel/mem/zram/zram01.c index 34d88589f..a5abb38de 100644 --- a/testcases/kernel/mem/zram/zram01.c +++ b/testcases/kernel/mem/zram/zram01.c @@ -54,11 +54,8 @@ static void dump_info(void); int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/module/create_module/create_module01.c b/testcases/kernel/module/create_module/create_module01.c index d70c15588..49822d504 100644 --- a/testcases/kernel/module/create_module/create_module01.c +++ b/testcases/kernel/module/create_module/create_module01.c @@ -82,11 +82,8 @@ static char modname[20]; /* Name of the module */ int main(int argc, char **argv) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/module/create_module/create_module02.c b/testcases/kernel/module/create_module/create_module02.c index a676509cb..e34a8035e 100644 --- a/testcases/kernel/module/create_module/create_module02.c +++ b/testcases/kernel/module/create_module/create_module02.c @@ -158,11 +158,8 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); int main(int argc, char **argv) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/module/delete_module/delete_module01.c b/testcases/kernel/module/delete_module/delete_module01.c index 5014bb8a5..37e61982c 100644 --- a/testcases/kernel/module/delete_module/delete_module01.c +++ b/testcases/kernel/module/delete_module/delete_module01.c @@ -44,11 +44,8 @@ static int module_loaded; int main(int argc, char **argv) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/module/delete_module/delete_module02.c b/testcases/kernel/module/delete_module/delete_module02.c index fc9894ab7..adc77b37a 100644 --- a/testcases/kernel/module/delete_module/delete_module02.c +++ b/testcases/kernel/module/delete_module/delete_module02.c @@ -82,11 +82,7 @@ int main(int argc, char **argv) int lc; int i; - const char *msg; - - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/module/delete_module/delete_module03.c b/testcases/kernel/module/delete_module/delete_module03.c index 1f6edb86d..2dc56f845 100644 --- a/testcases/kernel/module/delete_module/delete_module03.c +++ b/testcases/kernel/module/delete_module/delete_module03.c @@ -48,11 +48,8 @@ static void cleanup(void); int main(int argc, char **argv) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/module/query_module/query_module01.c b/testcases/kernel/module/query_module/query_module01.c index 753b645ca..4b9c77c12 100644 --- a/testcases/kernel/module/query_module/query_module01.c +++ b/testcases/kernel/module/query_module/query_module01.c @@ -154,12 +154,9 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); int main(int argc, char **argv) { int lc; - const char *msg; size_t buflen = sizeof(out_buf); - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); tst_tmpdir(); setup(); diff --git a/testcases/kernel/module/query_module/query_module02.c b/testcases/kernel/module/query_module/query_module02.c index f2e69949d..fcae25d78 100644 --- a/testcases/kernel/module/query_module/query_module02.c +++ b/testcases/kernel/module/query_module/query_module02.c @@ -140,11 +140,8 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); int main(int argc, char **argv) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/module/query_module/query_module03.c b/testcases/kernel/module/query_module/query_module03.c index 62378840e..8dad51a80 100644 --- a/testcases/kernel/module/query_module/query_module03.c +++ b/testcases/kernel/module/query_module/query_module03.c @@ -151,11 +151,8 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); int main(int argc, char **argv) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); tst_tmpdir(); setup(); diff --git a/testcases/kernel/security/prot_hsymlinks/prot_hsymlinks.c b/testcases/kernel/security/prot_hsymlinks/prot_hsymlinks.c index c074e4495..15f20a27d 100644 --- a/testcases/kernel/security/prot_hsymlinks/prot_hsymlinks.c +++ b/testcases/kernel/security/prot_hsymlinks/prot_hsymlinks.c @@ -190,10 +190,7 @@ int main(int argc, char *argv[]) static void setup(int argc, char *argv[]) { - const char *msg; - msg = parse_opts(argc, argv, options, &help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, &help); tst_require_root(NULL); diff --git a/testcases/kernel/security/smack/smack_set_socket_labels.c b/testcases/kernel/security/smack/smack_set_socket_labels.c index a4950bb8b..7102d1352 100644 --- a/testcases/kernel/security/smack/smack_set_socket_labels.c +++ b/testcases/kernel/security/smack/smack_set_socket_labels.c @@ -42,11 +42,8 @@ static void set_socket_labels(char **); int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/abort/abort01.c b/testcases/kernel/syscalls/abort/abort01.c index da8012c93..3a5dff585 100644 --- a/testcases/kernel/syscalls/abort/abort01.c +++ b/testcases/kernel/syscalls/abort/abort01.c @@ -53,7 +53,6 @@ int main(int argc, char *argv[]) register int i; int status, count, child, kidpid; int sig, ex; - const char *msg; #ifdef WCOREDUMP int core; @@ -61,9 +60,7 @@ int main(int argc, char *argv[]) #endif ex = sig = 0; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, ""); #endif diff --git a/testcases/kernel/syscalls/accept/accept01.c b/testcases/kernel/syscalls/accept/accept01.c index 1b06e563c..e664d6162 100644 --- a/testcases/kernel/syscalls/accept/accept01.c +++ b/testcases/kernel/syscalls/accept/accept01.c @@ -93,11 +93,8 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); int main(int ac, char *av[]) { int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/access/access01.c b/testcases/kernel/syscalls/access/access01.c index 4a7739f75..a31c14862 100644 --- a/testcases/kernel/syscalls/access/access01.c +++ b/testcases/kernel/syscalls/access/access01.c @@ -62,12 +62,9 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; int tc; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/access/access02.c b/testcases/kernel/syscalls/access/access02.c index 55f0e38bc..136ba035c 100644 --- a/testcases/kernel/syscalls/access/access02.c +++ b/testcases/kernel/syscalls/access/access02.c @@ -79,13 +79,10 @@ int main(int ac, char **av) { int lc; int i; - const char *msg; mode_t access_mode; char *file_name; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/access/access03.c b/testcases/kernel/syscalls/access/access03.c index fd7c8f84c..6f5fa70c2 100644 --- a/testcases/kernel/syscalls/access/access03.c +++ b/testcases/kernel/syscalls/access/access03.c @@ -49,11 +49,8 @@ static void *high_addr; int main(int ac, char **av) { int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/access/access04.c b/testcases/kernel/syscalls/access/access04.c index f89120945..d7c084417 100644 --- a/testcases/kernel/syscalls/access/access04.c +++ b/testcases/kernel/syscalls/access/access04.c @@ -55,11 +55,8 @@ int main(int ac, char **av) { struct stat stat_buf; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/access/access05.c b/testcases/kernel/syscalls/access/access05.c index ce9a9e647..923858cab 100644 --- a/testcases/kernel/syscalls/access/access05.c +++ b/testcases/kernel/syscalls/access/access05.c @@ -103,12 +103,9 @@ static char *bad_addr; int main(int ac, char **av) { int lc; - const char *msg; int i; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/access/access06.c b/testcases/kernel/syscalls/access/access06.c index 6e94c585d..1f811df28 100644 --- a/testcases/kernel/syscalls/access/access06.c +++ b/testcases/kernel/syscalls/access/access06.c @@ -63,12 +63,9 @@ int TST_TOTAL = ARRAY_SIZE(test_cases); int main(int ac, char **av) { int lc; - const char *msg; int i; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/acct/acct01.c b/testcases/kernel/syscalls/acct/acct01.c index 05681fa25..240096a27 100644 --- a/testcases/kernel/syscalls/acct/acct01.c +++ b/testcases/kernel/syscalls/acct/acct01.c @@ -86,12 +86,9 @@ static struct passwd *ltpuser; int main(int argc, char *argv[]) { int lc; - const char *msg; int i; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/add_key/add_key01.c b/testcases/kernel/syscalls/add_key/add_key01.c index 8aca19c6b..0e576dcb8 100644 --- a/testcases/kernel/syscalls/add_key/add_key01.c +++ b/testcases/kernel/syscalls/add_key/add_key01.c @@ -52,10 +52,8 @@ static void setup(void) int main(int ac, char **av) { - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/add_key/add_key02.c b/testcases/kernel/syscalls/add_key/add_key02.c index 038c3ef1c..14265ccd2 100644 --- a/testcases/kernel/syscalls/add_key/add_key02.c +++ b/testcases/kernel/syscalls/add_key/add_key02.c @@ -66,10 +66,8 @@ int main(int ac, char **av) { int i; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/adjtimex/adjtimex01.c b/testcases/kernel/syscalls/adjtimex/adjtimex01.c index adefcb627..4cf374f77 100644 --- a/testcases/kernel/syscalls/adjtimex/adjtimex01.c +++ b/testcases/kernel/syscalls/adjtimex/adjtimex01.c @@ -48,10 +48,8 @@ static struct timex tim_save; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/adjtimex/adjtimex02.c b/testcases/kernel/syscalls/adjtimex/adjtimex02.c index be601520c..51e51e168 100644 --- a/testcases/kernel/syscalls/adjtimex/adjtimex02.c +++ b/testcases/kernel/syscalls/adjtimex/adjtimex02.c @@ -139,10 +139,8 @@ int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/alarm/alarm01.c b/testcases/kernel/syscalls/alarm/alarm01.c index bba3671b2..f17207b0a 100644 --- a/testcases/kernel/syscalls/alarm/alarm01.c +++ b/testcases/kernel/syscalls/alarm/alarm01.c @@ -123,10 +123,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/alarm/alarm02.c b/testcases/kernel/syscalls/alarm/alarm02.c index d416a713d..d745e986f 100644 --- a/testcases/kernel/syscalls/alarm/alarm02.c +++ b/testcases/kernel/syscalls/alarm/alarm02.c @@ -106,7 +106,6 @@ int main(int ac, char **av) /* Parameters for usc code */ int lc; - const char *msg; /* Parameters for alarm test */ char *buf[] = { "-1", "ULONG_MAX", "ULONG_MAX+1" }; @@ -114,8 +113,7 @@ int main(int ac, char **av) int exp[] = { 0, 0, 0 }; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/alarm/alarm03.c b/testcases/kernel/syscalls/alarm/alarm03.c index 723d73e8d..5853a29e6 100644 --- a/testcases/kernel/syscalls/alarm/alarm03.c +++ b/testcases/kernel/syscalls/alarm/alarm03.c @@ -109,11 +109,9 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; int status, retval = 0; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/alarm/alarm05.c b/testcases/kernel/syscalls/alarm/alarm05.c index bb4e78aeb..1e93d2554 100644 --- a/testcases/kernel/syscalls/alarm/alarm05.c +++ b/testcases/kernel/syscalls/alarm/alarm05.c @@ -86,7 +86,6 @@ void sigproc(int sig); /* signal catching function */ int main(int ac, char **av) { int lc; - const char *msg; int time_sec1 = 10; /* time for which 1st alarm is set */ int time_sec2 = 5; /* time for which 2st alarm is set */ int ret_val1, ret_val2; /* return values for alarm() calls */ @@ -94,8 +93,7 @@ int main(int ac, char **av) int sleep_time1 = 3; /* waiting time for the signal */ int sleep_time2 = 6; /* waiting time for the signal */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/alarm/alarm06.c b/testcases/kernel/syscalls/alarm/alarm06.c index e93e0b27c..e31a83457 100644 --- a/testcases/kernel/syscalls/alarm/alarm06.c +++ b/testcases/kernel/syscalls/alarm/alarm06.c @@ -84,15 +84,13 @@ void sigproc(int sig); int main(int ac, char **av) { int lc; - const char *msg; int time_sec1 = 10; /* time for which 1st alarm is set */ int time_sec2 = 0; /* time for which 2nd alarm is set */ int ret_val1, ret_val2; /* return values for alarm() calls */ int sleep_time1 = 5; /* waiting time for the 1st signal */ int sleep_time2 = 10; /* waiting time for the 2nd signal */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/alarm/alarm07.c b/testcases/kernel/syscalls/alarm/alarm07.c index d692e7ee4..b270309f6 100644 --- a/testcases/kernel/syscalls/alarm/alarm07.c +++ b/testcases/kernel/syscalls/alarm/alarm07.c @@ -83,14 +83,12 @@ void sigproc(int sig); int main(int ac, char **av) { int lc; - const char *msg; int sleep_time = 5; int status; int time_sec = 3; pid_t cpid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/asyncio/asyncio02.c b/testcases/kernel/syscalls/asyncio/asyncio02.c index e2905f9e8..e97cc4932 100644 --- a/testcases/kernel/syscalls/asyncio/asyncio02.c +++ b/testcases/kernel/syscalls/asyncio/asyncio02.c @@ -143,14 +143,12 @@ int main(int ac, char **av) int ret_val; int eok; /* everything is ok flag */ int lc; - const char *msg; int flag_cnt; Num_flags = sizeof(Flags) / sizeof(int); TST_TOTAL = 3 * Num_flags; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/bdflush/bdflush01.c b/testcases/kernel/syscalls/bdflush/bdflush01.c index de5ca04dc..df739f1ac 100644 --- a/testcases/kernel/syscalls/bdflush/bdflush01.c +++ b/testcases/kernel/syscalls/bdflush/bdflush01.c @@ -104,10 +104,8 @@ void setup(void) int main(int ac, char **av) { long data; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/bind/bind01.c b/testcases/kernel/syscalls/bind/bind01.c index c96663e77..6a3bc5065 100644 --- a/testcases/kernel/syscalls/bind/bind01.c +++ b/testcases/kernel/syscalls/bind/bind01.c @@ -106,12 +106,8 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, 0, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/brk/brk01.c b/testcases/kernel/syscalls/brk/brk01.c index 61ac932e4..90171cc63 100644 --- a/testcases/kernel/syscalls/brk/brk01.c +++ b/testcases/kernel/syscalls/brk/brk01.c @@ -62,14 +62,12 @@ long Beg_brk_val; int main(int ac, char **av) { int lc; - const char *msg; int incr; long nbrkpt; /* new brk point value */ long cur_brk_val; /* current size returned by sbrk */ long aft_brk_val; /* current size returned by sbrk */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/cacheflush/cacheflush01.c b/testcases/kernel/syscalls/cacheflush/cacheflush01.c index 457b2fcbc..f9e0d1e4b 100644 --- a/testcases/kernel/syscalls/cacheflush/cacheflush01.c +++ b/testcases/kernel/syscalls/cacheflush/cacheflush01.c @@ -118,11 +118,8 @@ int main(int ac, char **av) { char *addr = NULL; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/capget/capget01.c b/testcases/kernel/syscalls/capget/capget01.c index 5660cba1b..d0304225a 100644 --- a/testcases/kernel/syscalls/capget/capget01.c +++ b/testcases/kernel/syscalls/capget/capget01.c @@ -85,10 +85,8 @@ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/capget/capget02.c b/testcases/kernel/syscalls/capget/capget02.c index e1b74558a..7a1727937 100644 --- a/testcases/kernel/syscalls/capget/capget02.c +++ b/testcases/kernel/syscalls/capget/capget02.c @@ -120,10 +120,8 @@ int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/capset/capset01.c b/testcases/kernel/syscalls/capset/capset01.c index 6804af115..517fd1455 100644 --- a/testcases/kernel/syscalls/capset/capset01.c +++ b/testcases/kernel/syscalls/capset/capset01.c @@ -98,10 +98,8 @@ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/capset/capset02.c b/testcases/kernel/syscalls/capset/capset02.c index 411d35ca6..146755c3b 100644 --- a/testcases/kernel/syscalls/capset/capset02.c +++ b/testcases/kernel/syscalls/capset/capset02.c @@ -130,10 +130,8 @@ int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&child_func, ""); #endif diff --git a/testcases/kernel/syscalls/chdir/chdir01.c b/testcases/kernel/syscalls/chdir/chdir01.c index f1a3f9da7..1933377a4 100644 --- a/testcases/kernel/syscalls/chdir/chdir01.c +++ b/testcases/kernel/syscalls/chdir/chdir01.c @@ -74,10 +74,8 @@ int main(int ac, char **av) char *filenames[3]; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chdir/chdir02.c b/testcases/kernel/syscalls/chdir/chdir02.c index 1d5834df2..6fc251c5f 100644 --- a/testcases/kernel/syscalls/chdir/chdir02.c +++ b/testcases/kernel/syscalls/chdir/chdir02.c @@ -125,10 +125,8 @@ char *dirs[2] = { "/", "/tmp" }; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chdir/chdir03.c b/testcases/kernel/syscalls/chdir/chdir03.c index a37367541..cc467812e 100644 --- a/testcases/kernel/syscalls/chdir/chdir03.c +++ b/testcases/kernel/syscalls/chdir/chdir03.c @@ -74,13 +74,11 @@ static uid_t nobody_uid, bin_uid; int main(int ac, char **av) { int lc; - const char *msg; pid_t pid, pid1; int status; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chdir/chdir04.c b/testcases/kernel/syscalls/chdir/chdir04.c index 49efb3dfd..9e0a9e9d0 100644 --- a/testcases/kernel/syscalls/chdir/chdir04.c +++ b/testcases/kernel/syscalls/chdir/chdir04.c @@ -107,10 +107,8 @@ int main(int ac, char **av) { int lc; int i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chmod/chmod01.c b/testcases/kernel/syscalls/chmod/chmod01.c index d0d688246..06167056b 100644 --- a/testcases/kernel/syscalls/chmod/chmod01.c +++ b/testcases/kernel/syscalls/chmod/chmod01.c @@ -92,15 +92,12 @@ int main(int ac, char **av) { struct stat stat_buf; int lc; - const char *msg; int i; int mode; TST_TOTAL = sizeof(modes) / sizeof(int); - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chmod/chmod02.c b/testcases/kernel/syscalls/chmod/chmod02.c index d3acd4952..ba580cdd5 100644 --- a/testcases/kernel/syscalls/chmod/chmod02.c +++ b/testcases/kernel/syscalls/chmod/chmod02.c @@ -61,10 +61,8 @@ static void cleanup(void); int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chmod/chmod03.c b/testcases/kernel/syscalls/chmod/chmod03.c index 598d0763f..610930419 100644 --- a/testcases/kernel/syscalls/chmod/chmod03.c +++ b/testcases/kernel/syscalls/chmod/chmod03.c @@ -100,11 +100,9 @@ int main(int ac, char **av) { struct stat stat_buf; int lc; - const char *msg; mode_t file_mode; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chmod/chmod04.c b/testcases/kernel/syscalls/chmod/chmod04.c index 3cd0c71cf..aa706cd60 100644 --- a/testcases/kernel/syscalls/chmod/chmod04.c +++ b/testcases/kernel/syscalls/chmod/chmod04.c @@ -100,11 +100,9 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat struct. */ int lc; - const char *msg; mode_t dir_mode; /* mode permissions set on testdirectory */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chmod/chmod05.c b/testcases/kernel/syscalls/chmod/chmod05.c index 9ce56bb70..b6a70cb6d 100644 --- a/testcases/kernel/syscalls/chmod/chmod05.c +++ b/testcases/kernel/syscalls/chmod/chmod05.c @@ -115,11 +115,9 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat struct */ int lc; - const char *msg; mode_t dir_mode; /* mode permissions set on test directory */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chmod/chmod06.c b/testcases/kernel/syscalls/chmod/chmod06.c index 6bf7ca7cf..b9d9f82ee 100644 --- a/testcases/kernel/syscalls/chmod/chmod06.c +++ b/testcases/kernel/syscalls/chmod/chmod06.c @@ -109,12 +109,9 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; int i; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chmod/chmod07.c b/testcases/kernel/syscalls/chmod/chmod07.c index 44b8e1749..a377efb4f 100644 --- a/testcases/kernel/syscalls/chmod/chmod07.c +++ b/testcases/kernel/syscalls/chmod/chmod07.c @@ -101,10 +101,8 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat(2) struct contents */ int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chown/chown01.c b/testcases/kernel/syscalls/chown/chown01.c index e8a5babe7..f90de4b85 100644 --- a/testcases/kernel/syscalls/chown/chown01.c +++ b/testcases/kernel/syscalls/chown/chown01.c @@ -130,10 +130,8 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chown/chown02.c b/testcases/kernel/syscalls/chown/chown02.c index e205a211a..74d336e9e 100644 --- a/testcases/kernel/syscalls/chown/chown02.c +++ b/testcases/kernel/syscalls/chown/chown02.c @@ -115,15 +115,13 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat(2) struct contents */ int lc; - const char *msg; int i; uid_t user_id; /* user id of the user set for testfile */ gid_t group_id; /* group id of the user set for testfile */ int test_flag; /* test condition specific flag variable */ char *file_name; /* ptr. for test file name */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chown/chown03.c b/testcases/kernel/syscalls/chown/chown03.c index 742d90106..cec3274fb 100644 --- a/testcases/kernel/syscalls/chown/chown03.c +++ b/testcases/kernel/syscalls/chown/chown03.c @@ -99,12 +99,10 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat(2) struct contents */ int lc; - const char *msg; uid_t user_id; /* Owner id of the test file. */ gid_t group_id; /* Group id of the test file. */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chown/chown04.c b/testcases/kernel/syscalls/chown/chown04.c index 07c4b8333..1739583d6 100644 --- a/testcases/kernel/syscalls/chown/chown04.c +++ b/testcases/kernel/syscalls/chown/chown04.c @@ -96,14 +96,11 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; int i; uid_t user_id; gid_t group_id; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chown/chown05.c b/testcases/kernel/syscalls/chown/chown05.c index 423f05318..7331b3612 100644 --- a/testcases/kernel/syscalls/chown/chown05.c +++ b/testcases/kernel/syscalls/chown/chown05.c @@ -103,13 +103,11 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat(2) struct contents */ int lc; - const char *msg; int i; uid_t user_id; /* user id of the user set for testfile */ gid_t group_id; /* group id of the user set for testfile */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chroot/chroot01.c b/testcases/kernel/syscalls/chroot/chroot01.c index 2aa8428d0..bff9bb871 100644 --- a/testcases/kernel/syscalls/chroot/chroot01.c +++ b/testcases/kernel/syscalls/chroot/chroot01.c @@ -64,10 +64,8 @@ void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chroot/chroot02.c b/testcases/kernel/syscalls/chroot/chroot02.c index 26c01a034..c02b44bc5 100644 --- a/testcases/kernel/syscalls/chroot/chroot02.c +++ b/testcases/kernel/syscalls/chroot/chroot02.c @@ -66,11 +66,9 @@ void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; int pid, status, retval; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chroot/chroot03.c b/testcases/kernel/syscalls/chroot/chroot03.c index fbda38e86..937689206 100644 --- a/testcases/kernel/syscalls/chroot/chroot03.c +++ b/testcases/kernel/syscalls/chroot/chroot03.c @@ -101,11 +101,8 @@ int main(int ac, char **av) { int lc; int i; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/chroot/chroot04.c b/testcases/kernel/syscalls/chroot/chroot04.c index 2c56b4de3..6d1d46baa 100644 --- a/testcases/kernel/syscalls/chroot/chroot04.c +++ b/testcases/kernel/syscalls/chroot/chroot04.c @@ -64,10 +64,8 @@ void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/clock_getres/clock_getres01.c b/testcases/kernel/syscalls/clock_getres/clock_getres01.c index 42ff5284c..a6264142b 100644 --- a/testcases/kernel/syscalls/clock_getres/clock_getres01.c +++ b/testcases/kernel/syscalls/clock_getres/clock_getres01.c @@ -77,10 +77,8 @@ int main(int ac, char **av) int i; int lc; struct timespec res; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL))) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c index 45dee6283..312b695ac 100644 --- a/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c +++ b/testcases/kernel/syscalls/clock_nanosleep/clock_nanosleep01.c @@ -362,10 +362,8 @@ int main(int ac, char **av) int result = RESULT_OK; int i; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c b/testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c index 26fc4deb4..04fe7a182 100644 --- a/testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c +++ b/testcases/kernel/syscalls/clock_nanosleep2/clock_nanosleep2_01.c @@ -114,12 +114,9 @@ int main(int ac, char **av) { int i; int lc; - const char *msg; struct timespec ts; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/clone/clone01.c b/testcases/kernel/syscalls/clone/clone01.c index fea478da9..855c1085d 100644 --- a/testcases/kernel/syscalls/clone/clone01.c +++ b/testcases/kernel/syscalls/clone/clone01.c @@ -41,13 +41,10 @@ int TST_TOTAL = 1; int main(int ac, char **av) { - const char *msg; void *child_stack; int status, child_pid; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/clone/clone02.c b/testcases/kernel/syscalls/clone/clone02.c index d477c8f2f..20442b365 100644 --- a/testcases/kernel/syscalls/clone/clone02.c +++ b/testcases/kernel/syscalls/clone/clone02.c @@ -114,13 +114,10 @@ int main(int ac, char **av) { int lc; - const char *msg; void *child_stack; int status, i; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/clone/clone03.c b/testcases/kernel/syscalls/clone/clone03.c index 5a310bc3f..f4216ead8 100644 --- a/testcases/kernel/syscalls/clone/clone03.c +++ b/testcases/kernel/syscalls/clone/clone03.c @@ -57,14 +57,11 @@ int main(int ac, char **av) { int lc; - const char *msg; void *child_stack; char buff[10]; int child_pid, status; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/clone/clone04.c b/testcases/kernel/syscalls/clone/clone04.c index 7994d0fa5..7f862b800 100644 --- a/testcases/kernel/syscalls/clone/clone04.c +++ b/testcases/kernel/syscalls/clone/clone04.c @@ -53,12 +53,9 @@ int TST_TOTAL = sizeof(test_cases) / sizeof(test_cases[0]); int main(int ac, char **av) { int lc, ind; - const char *msg; void *test_stack; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/clone/clone05.c b/testcases/kernel/syscalls/clone/clone05.c index 33a8c6100..a326209dd 100644 --- a/testcases/kernel/syscalls/clone/clone05.c +++ b/testcases/kernel/syscalls/clone/clone05.c @@ -43,12 +43,9 @@ int main(int ac, char **av) { int lc, status; - const char *msg; void *child_stack; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/clone/clone06.c b/testcases/kernel/syscalls/clone/clone06.c index b2846cbab..99e7f3864 100644 --- a/testcases/kernel/syscalls/clone/clone06.c +++ b/testcases/kernel/syscalls/clone/clone06.c @@ -47,14 +47,11 @@ int main(int ac, char **av) { int lc, status; - const char *msg; void *child_stack; char *parent_env; char buff[MAX_LINE_LENGTH]; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/clone/clone07.c b/testcases/kernel/syscalls/clone/clone07.c index bd69ee885..8c723dea0 100644 --- a/testcases/kernel/syscalls/clone/clone07.c +++ b/testcases/kernel/syscalls/clone/clone07.c @@ -49,12 +49,9 @@ int main(int ac, char **av) { int lc, status; - const char *msg; void *child_stack; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/clone/clone08.c b/testcases/kernel/syscalls/clone/clone08.c index 66fc22f21..4c71db43a 100644 --- a/testcases/kernel/syscalls/clone/clone08.c +++ b/testcases/kernel/syscalls/clone/clone08.c @@ -81,12 +81,9 @@ int TST_TOTAL = ARRAY_SIZE(test_cases); int main(int ac, char **av) { - const char *msg; int i, lc; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/syscalls/close/close01.c b/testcases/kernel/syscalls/close/close01.c index 08a909a85..7b119ce44 100644 --- a/testcases/kernel/syscalls/close/close01.c +++ b/testcases/kernel/syscalls/close/close01.c @@ -55,10 +55,8 @@ int main(int ac, char **av) int i; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/close/close02.c b/testcases/kernel/syscalls/close/close02.c index b56569c60..ddda5d9ec 100644 --- a/testcases/kernel/syscalls/close/close02.c +++ b/testcases/kernel/syscalls/close/close02.c @@ -67,11 +67,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/close/close08.c b/testcases/kernel/syscalls/close/close08.c index caa6ad662..f3943db6a 100644 --- a/testcases/kernel/syscalls/close/close08.c +++ b/testcases/kernel/syscalls/close/close08.c @@ -127,11 +127,9 @@ int fd; int main(int ac, char **av) { - const char *msg; int lc; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/cma/process_vm01.c b/testcases/kernel/syscalls/cma/process_vm01.c index 2f34e258a..3473de356 100644 --- a/testcases/kernel/syscalls/cma/process_vm01.c +++ b/testcases/kernel/syscalls/cma/process_vm01.c @@ -82,11 +82,8 @@ static void cma_test_errnos(void); int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, options, &help); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, &help); setup(argv); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/syscalls/cma/process_vm_readv02.c b/testcases/kernel/syscalls/cma/process_vm_readv02.c index fa97aa275..426325e80 100644 --- a/testcases/kernel/syscalls/cma/process_vm_readv02.c +++ b/testcases/kernel/syscalls/cma/process_vm_readv02.c @@ -48,11 +48,8 @@ static void cleanup(void); int main(int argc, char **argv) { int lc, status; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/syscalls/cma/process_vm_readv03.c b/testcases/kernel/syscalls/cma/process_vm_readv03.c index 025557dd9..fe9e5486e 100644 --- a/testcases/kernel/syscalls/cma/process_vm_readv03.c +++ b/testcases/kernel/syscalls/cma/process_vm_readv03.c @@ -63,13 +63,9 @@ static void help(void); int main(int argc, char **argv) { int lc, status; - const char *msg; int *bufsz_arr; - msg = parse_opts(argc, argv, options, &help); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s" - "use -help", msg); + tst_parse_opts(argc, argv, options, &help); setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/syscalls/cma/process_vm_writev02.c b/testcases/kernel/syscalls/cma/process_vm_writev02.c index 301293fb1..9d86c4784 100644 --- a/testcases/kernel/syscalls/cma/process_vm_writev02.c +++ b/testcases/kernel/syscalls/cma/process_vm_writev02.c @@ -58,11 +58,8 @@ static void help(void); int main(int argc, char **argv) { int lc, status; - const char *msg; - msg = parse_opts(argc, argv, options, &help); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, &help); setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/syscalls/confstr/confstr01.c b/testcases/kernel/syscalls/confstr/confstr01.c index 749ff6f0b..0fc4c46d5 100644 --- a/testcases/kernel/syscalls/confstr/confstr01.c +++ b/testcases/kernel/syscalls/confstr/confstr01.c @@ -80,11 +80,8 @@ int main(int argc, char *argv[]) int i; char *buf; int len; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/connect/connect01.c b/testcases/kernel/syscalls/connect/connect01.c index 86a0e2329..af6035435 100644 --- a/testcases/kernel/syscalls/connect/connect01.c +++ b/testcases/kernel/syscalls/connect/connect01.c @@ -118,12 +118,8 @@ static char *argv0; int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX argv0 = argv[0]; maybe_run_child(&do_child, "d", &sfd); diff --git a/testcases/kernel/syscalls/creat/creat01.c b/testcases/kernel/syscalls/creat/creat01.c index fa587adb5..1b6f7082d 100644 --- a/testcases/kernel/syscalls/creat/creat01.c +++ b/testcases/kernel/syscalls/creat/creat01.c @@ -88,10 +88,8 @@ int main(int ac, char **av) { int i; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/creat/creat03.c b/testcases/kernel/syscalls/creat/creat03.c index a02fc6e68..74f3364da 100644 --- a/testcases/kernel/syscalls/creat/creat03.c +++ b/testcases/kernel/syscalls/creat/creat03.c @@ -64,10 +64,8 @@ int main(int ac, char **av) struct stat statbuf; unsigned short filmode; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/creat/creat04.c b/testcases/kernel/syscalls/creat/creat04.c index 280dcdfd0..0268e77be 100644 --- a/testcases/kernel/syscalls/creat/creat04.c +++ b/testcases/kernel/syscalls/creat/creat04.c @@ -85,13 +85,11 @@ int main(int ac, char **av) { int lc; int retval = 0; - const char *msg; pid_t pid, pid1; int i, status, fd; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/creat/creat05.c b/testcases/kernel/syscalls/creat/creat05.c index 468f8768a..c9433ec87 100644 --- a/testcases/kernel/syscalls/creat/creat05.c +++ b/testcases/kernel/syscalls/creat/creat05.c @@ -70,11 +70,8 @@ char fname[40]; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/creat/creat06.c b/testcases/kernel/syscalls/creat/creat06.c index 0989a9905..a48442043 100644 --- a/testcases/kernel/syscalls/creat/creat06.c +++ b/testcases/kernel/syscalls/creat/creat06.c @@ -109,12 +109,9 @@ static struct passwd *ltpuser; int main(int ac, char **av) { int lc; - const char *msg; int i; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/creat/creat07.c b/testcases/kernel/syscalls/creat/creat07.c index bbebf7b63..c3cbd3712 100644 --- a/testcases/kernel/syscalls/creat/creat07.c +++ b/testcases/kernel/syscalls/creat/creat07.c @@ -44,11 +44,9 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; pid_t pid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/creat/creat08.c b/testcases/kernel/syscalls/creat/creat08.c index 0b3f981b2..46dcb2822 100644 --- a/testcases/kernel/syscalls/creat/creat08.c +++ b/testcases/kernel/syscalls/creat/creat08.c @@ -87,13 +87,8 @@ int main(int ac, char **av) int fd; int lc; - const char *msg; - /* - * parse standard options - */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/creat/creat09.c b/testcases/kernel/syscalls/creat/creat09.c index 30c59527a..e52ad34e1 100644 --- a/testcases/kernel/syscalls/creat/creat09.c +++ b/testcases/kernel/syscalls/creat/creat09.c @@ -128,10 +128,8 @@ int fd; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/dup/dup01.c b/testcases/kernel/syscalls/dup/dup01.c index 9d0ff588c..7c0b77a59 100644 --- a/testcases/kernel/syscalls/dup/dup01.c +++ b/testcases/kernel/syscalls/dup/dup01.c @@ -128,10 +128,8 @@ int fd; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/dup/dup02.c b/testcases/kernel/syscalls/dup/dup02.c index 9f0edcf7e..6d7369853 100644 --- a/testcases/kernel/syscalls/dup/dup02.c +++ b/testcases/kernel/syscalls/dup/dup02.c @@ -126,12 +126,10 @@ int Fds[] = { -1, 1500 }; int main(int ac, char **av) { int lc; - const char *msg; int nfds = sizeof(Fds) / sizeof(int); int ind; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/dup/dup03.c b/testcases/kernel/syscalls/dup/dup03.c index a9b61e340..e6775263f 100644 --- a/testcases/kernel/syscalls/dup/dup03.c +++ b/testcases/kernel/syscalls/dup/dup03.c @@ -126,10 +126,8 @@ int nfds = 0; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/dup/dup04.c b/testcases/kernel/syscalls/dup/dup04.c index dd60dfd29..eaaeb78fa 100644 --- a/testcases/kernel/syscalls/dup/dup04.c +++ b/testcases/kernel/syscalls/dup/dup04.c @@ -131,10 +131,8 @@ int fd[2]; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/dup/dup05.c b/testcases/kernel/syscalls/dup/dup05.c index 67a71a1c1..1e9ac05dd 100644 --- a/testcases/kernel/syscalls/dup/dup05.c +++ b/testcases/kernel/syscalls/dup/dup05.c @@ -129,10 +129,8 @@ int fd; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/dup/dup06.c b/testcases/kernel/syscalls/dup/dup06.c index d4082ff56..e3f8070bf 100644 --- a/testcases/kernel/syscalls/dup/dup06.c +++ b/testcases/kernel/syscalls/dup/dup06.c @@ -57,11 +57,9 @@ int main(int ac, char **av) int min; int freefds; int lc; - const char *msg; const char *pfilname = "dup06"; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/dup/dup07.c b/testcases/kernel/syscalls/dup/dup07.c index f89fe73ad..a100f5d58 100644 --- a/testcases/kernel/syscalls/dup/dup07.c +++ b/testcases/kernel/syscalls/dup/dup07.c @@ -52,10 +52,8 @@ int main(int ac, char **av) int duprdo, dupwro, duprdwr; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/dup2/dup201.c b/testcases/kernel/syscalls/dup2/dup201.c index 4435b6606..77251563c 100644 --- a/testcases/kernel/syscalls/dup2/dup201.c +++ b/testcases/kernel/syscalls/dup2/dup201.c @@ -102,10 +102,8 @@ int main(int ac, char **av) { int lc; int i, j; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/dup2/dup202.c b/testcases/kernel/syscalls/dup2/dup202.c index 5e8d14aa8..daff81fc4 100644 --- a/testcases/kernel/syscalls/dup2/dup202.c +++ b/testcases/kernel/syscalls/dup2/dup202.c @@ -86,12 +86,10 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; int i, ofd; struct stat oldbuf, newbuf; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/dup2/dup203.c b/testcases/kernel/syscalls/dup2/dup203.c index b818030e5..4fdc9f4d0 100644 --- a/testcases/kernel/syscalls/dup2/dup203.c +++ b/testcases/kernel/syscalls/dup2/dup203.c @@ -63,10 +63,8 @@ int main(int ac, char **av) char buf[40]; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/dup2/dup204.c b/testcases/kernel/syscalls/dup2/dup204.c index 96234729a..3e447d4a9 100644 --- a/testcases/kernel/syscalls/dup2/dup204.c +++ b/testcases/kernel/syscalls/dup2/dup204.c @@ -63,12 +63,10 @@ int nfd[2]; int main(int ac, char **av) { int lc; - const char *msg; int i; struct stat oldbuf, newbuf; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/dup2/dup205.c b/testcases/kernel/syscalls/dup2/dup205.c index 6cf30e525..14218dd9b 100644 --- a/testcases/kernel/syscalls/dup2/dup205.c +++ b/testcases/kernel/syscalls/dup2/dup205.c @@ -57,12 +57,10 @@ int main(int ac, char *av[]) int serrno; int lc; - const char *msg; ifile = -1; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); local_flag = PASSED; diff --git a/testcases/kernel/syscalls/dup3/dup3_02.c b/testcases/kernel/syscalls/dup3/dup3_02.c index bdbaef694..f33690473 100644 --- a/testcases/kernel/syscalls/dup3/dup3_02.c +++ b/testcases/kernel/syscalls/dup3/dup3_02.c @@ -64,11 +64,8 @@ int main(int ac, char **av) { int lc; int i; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/eventfd/eventfd01.c b/testcases/kernel/syscalls/eventfd/eventfd01.c index 83377ddac..378f61e31 100644 --- a/testcases/kernel/syscalls/eventfd/eventfd01.c +++ b/testcases/kernel/syscalls/eventfd/eventfd01.c @@ -656,11 +656,9 @@ static void overflow_read_test(int evfd) int main(int argc, char **argv) { int lc; - const char *msg; int fd; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/execl/execl01.c b/testcases/kernel/syscalls/execl/execl01.c index 0b986636d..2f68f4888 100644 --- a/testcases/kernel/syscalls/execl/execl01.c +++ b/testcases/kernel/syscalls/execl/execl01.c @@ -130,10 +130,8 @@ int status; /* status returned from waitpid */ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/execle/execle01.c b/testcases/kernel/syscalls/execle/execle01.c index 056beb254..3e742905c 100644 --- a/testcases/kernel/syscalls/execle/execle01.c +++ b/testcases/kernel/syscalls/execle/execle01.c @@ -130,10 +130,8 @@ int status; /* status returned from waitpid */ int main(int ac, char **av, char **environ) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/execlp/execlp01.c b/testcases/kernel/syscalls/execlp/execlp01.c index 50056331c..6f5f4f96e 100644 --- a/testcases/kernel/syscalls/execlp/execlp01.c +++ b/testcases/kernel/syscalls/execlp/execlp01.c @@ -131,10 +131,8 @@ int status; /* status returned from waitpid */ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/execv/execv01.c b/testcases/kernel/syscalls/execv/execv01.c index 3b566f9ca..eb7670ab4 100644 --- a/testcases/kernel/syscalls/execv/execv01.c +++ b/testcases/kernel/syscalls/execv/execv01.c @@ -132,10 +132,8 @@ char *args[2] = { "/bin/test", 0 }; /* argument list for execv call */ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/execve/execve01.c b/testcases/kernel/syscalls/execve/execve01.c index 889b4b9ba..00b8bf83f 100644 --- a/testcases/kernel/syscalls/execve/execve01.c +++ b/testcases/kernel/syscalls/execve/execve01.c @@ -132,10 +132,8 @@ char *args[2] = { "/usr/bin/test", 0 }; /* argument list for execve call */ int main(int ac, char **av, char **environ) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/execve/execve02.c b/testcases/kernel/syscalls/execve/execve02.c index 3a10bca2a..9c6be6df7 100644 --- a/testcases/kernel/syscalls/execve/execve02.c +++ b/testcases/kernel/syscalls/execve/execve02.c @@ -76,11 +76,9 @@ static void do_child(void) int main(int ac, char **av) { int lc; - const char *msg; pid_t pid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/execve/execve03.c b/testcases/kernel/syscalls/execve/execve03.c index 0d6cd4c5d..a3e589e57 100644 --- a/testcases/kernel/syscalls/execve/execve03.c +++ b/testcases/kernel/syscalls/execve/execve03.c @@ -127,11 +127,9 @@ int TST_TOTAL = ARRAY_SIZE(TC); int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/execve/execve04.c b/testcases/kernel/syscalls/execve/execve04.c index 2793121cb..7847470a0 100644 --- a/testcases/kernel/syscalls/execve/execve04.c +++ b/testcases/kernel/syscalls/execve/execve04.c @@ -50,13 +50,11 @@ static void do_child(void); int main(int ac, char **av) { int lc; - const char *msg; pid_t pid; char *argv[2] = {TEST_APP, NULL}; char *env[1] = {NULL}; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, ""); diff --git a/testcases/kernel/syscalls/execve/execve05.c b/testcases/kernel/syscalls/execve/execve05.c index 793cf20ee..444bead23 100644 --- a/testcases/kernel/syscalls/execve/execve05.c +++ b/testcases/kernel/syscalls/execve/execve05.c @@ -73,10 +73,8 @@ int main(int ac, char **av) pid_t pid; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/execvp/execvp01.c b/testcases/kernel/syscalls/execvp/execvp01.c index aa21bc639..e55e52d4c 100644 --- a/testcases/kernel/syscalls/execvp/execvp01.c +++ b/testcases/kernel/syscalls/execvp/execvp01.c @@ -132,10 +132,8 @@ char *args[2] = { "/bin/true", 0 }; /* argument list for execvp call */ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/exit/exit01.c b/testcases/kernel/syscalls/exit/exit01.c index 9ca82a169..1c15f43b0 100644 --- a/testcases/kernel/syscalls/exit/exit01.c +++ b/testcases/kernel/syscalls/exit/exit01.c @@ -40,11 +40,8 @@ int main(int ac, char **av) int pid, npid, sig, nsig, exno, nexno, status; int rval = 0; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, cleanup, "OPTION PARSIkNG ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/exit/exit02.c b/testcases/kernel/syscalls/exit/exit02.c index 38a9290a0..7858c894d 100644 --- a/testcases/kernel/syscalls/exit/exit02.c +++ b/testcases/kernel/syscalls/exit/exit02.c @@ -71,14 +71,11 @@ int main(int ac, char **av) int len, rlen; int rval = 0; int lc; - const char *msg; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup for test */ diff --git a/testcases/kernel/syscalls/exit_group/exit_group01.c b/testcases/kernel/syscalls/exit_group/exit_group01.c index 34dafb5b3..787331631 100644 --- a/testcases/kernel/syscalls/exit_group/exit_group01.c +++ b/testcases/kernel/syscalls/exit_group/exit_group01.c @@ -59,11 +59,8 @@ static void verify_exit_group(void) int main(int ac, char **av) { int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); for (lc = 0; TEST_LOOPING(lc); lc++) verify_exit_group(); diff --git a/testcases/kernel/syscalls/faccessat/faccessat01.c b/testcases/kernel/syscalls/faccessat/faccessat01.c index 485d96bdf..7f0e87a3a 100644 --- a/testcases/kernel/syscalls/faccessat/faccessat01.c +++ b/testcases/kernel/syscalls/faccessat/faccessat01.c @@ -72,7 +72,6 @@ int myfaccessat(int dirfd, const char *filename, int mode) int main(int ac, char **av) { int lc; - const char *msg; int i; /* Disable test if the version of the kernel is less than 2.6.16 */ @@ -82,8 +81,7 @@ int main(int ac, char **av) exit(0); } - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise01.c b/testcases/kernel/syscalls/fadvise/posix_fadvise01.c index 2d719215b..fa966e66d 100644 --- a/testcases/kernel/syscalls/fadvise/posix_fadvise01.c +++ b/testcases/kernel/syscalls/fadvise/posix_fadvise01.c @@ -78,7 +78,6 @@ int TST_TOTAL = defined_advise_total; int main(int ac, char **av) { int lc; - const char *msg; int i; /* Check this system has fadvise64 system which is used @@ -93,8 +92,7 @@ int main(int ac, char **av) /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* * perform global setup for test diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise02.c b/testcases/kernel/syscalls/fadvise/posix_fadvise02.c index 580ae47cc..73ca31125 100644 --- a/testcases/kernel/syscalls/fadvise/posix_fadvise02.c +++ b/testcases/kernel/syscalls/fadvise/posix_fadvise02.c @@ -78,7 +78,6 @@ int TST_TOTAL = sizeof(TC) / sizeof(TC[0]); int main(int ac, char **av) { int lc; - const char *msg; int i; /* Check this system has fadvise64 system which is used @@ -93,8 +92,7 @@ int main(int ac, char **av) /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* * perform global setup for test diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise03.c b/testcases/kernel/syscalls/fadvise/posix_fadvise03.c index 1e77740fe..9d8a08e2a 100644 --- a/testcases/kernel/syscalls/fadvise/posix_fadvise03.c +++ b/testcases/kernel/syscalls/fadvise/posix_fadvise03.c @@ -114,7 +114,6 @@ static int is_defined_advise(int advise) int main(int ac, char **av) { int lc; - const char *msg; int advise; /* Check this system has fadvise64 system which is used @@ -129,8 +128,7 @@ int main(int ac, char **av) /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* * perform global setup for test diff --git a/testcases/kernel/syscalls/fadvise/posix_fadvise04.c b/testcases/kernel/syscalls/fadvise/posix_fadvise04.c index a63c4ea60..af33cf233 100644 --- a/testcases/kernel/syscalls/fadvise/posix_fadvise04.c +++ b/testcases/kernel/syscalls/fadvise/posix_fadvise04.c @@ -77,7 +77,6 @@ int TST_TOTAL = sizeof(TC) / sizeof(TC[0]); int main(int ac, char **av) { int lc; - const char *msg; int i; /* Check this system has fadvise64 system which is used @@ -99,8 +98,7 @@ int main(int ac, char **av) /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* * perform global setup for test diff --git a/testcases/kernel/syscalls/fallocate/fallocate01.c b/testcases/kernel/syscalls/fallocate/fallocate01.c index 356d65745..e72b1236a 100644 --- a/testcases/kernel/syscalls/fallocate/fallocate01.c +++ b/testcases/kernel/syscalls/fallocate/fallocate01.c @@ -200,10 +200,8 @@ int main(int ac, char **av) { loff_t expected_size; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fallocate/fallocate02.c b/testcases/kernel/syscalls/fallocate/fallocate02.c index ad43e06b2..ba3779641 100644 --- a/testcases/kernel/syscalls/fallocate/fallocate02.c +++ b/testcases/kernel/syscalls/fallocate/fallocate02.c @@ -87,11 +87,8 @@ int main(int ac, char **av) { int lc; int i; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fallocate/fallocate03.c b/testcases/kernel/syscalls/fallocate/fallocate03.c index a8e62368f..ae2476ad2 100644 --- a/testcases/kernel/syscalls/fallocate/fallocate03.c +++ b/testcases/kernel/syscalls/fallocate/fallocate03.c @@ -227,13 +227,11 @@ int main(int ac, char **av) { int test_index = 0; int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* perform global test setup, call setup() function */ setup(); diff --git a/testcases/kernel/syscalls/fanotify/fanotify01.c b/testcases/kernel/syscalls/fanotify/fanotify01.c index 7c45df098..31ba417c1 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify01.c +++ b/testcases/kernel/syscalls/fanotify/fanotify01.c @@ -66,10 +66,8 @@ static char event_buf[EVENT_BUF_LEN]; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fanotify/fanotify02.c b/testcases/kernel/syscalls/fanotify/fanotify02.c index d7d22b223..35e73b156 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify02.c +++ b/testcases/kernel/syscalls/fanotify/fanotify02.c @@ -66,10 +66,8 @@ static char event_buf[EVENT_BUF_LEN]; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fanotify/fanotify03.c b/testcases/kernel/syscalls/fanotify/fanotify03.c index 196b97fa3..59f5c47ae 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify03.c +++ b/testcases/kernel/syscalls/fanotify/fanotify03.c @@ -158,11 +158,9 @@ static void check_child(void) int main(int ac, char **av) { int lc; - const char *msg; int fd_notify_backup = -1; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fanotify/fanotify04.c b/testcases/kernel/syscalls/fanotify/fanotify04.c index d38741382..0c58ed88a 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify04.c +++ b/testcases/kernel/syscalls/fanotify/fanotify04.c @@ -201,10 +201,8 @@ static void test_open_symlink(char *file) int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fanotify/fanotify05.c b/testcases/kernel/syscalls/fanotify/fanotify05.c index 735f03ac0..0e32a243c 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify05.c +++ b/testcases/kernel/syscalls/fanotify/fanotify05.c @@ -60,12 +60,9 @@ struct fanotify_event_metadata event; int main(int ac, char **av) { int lc, i; - const char *msg; int len; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fanotify/fanotify06.c b/testcases/kernel/syscalls/fanotify/fanotify06.c index 9421d7192..d32708cea 100644 --- a/testcases/kernel/syscalls/fanotify/fanotify06.c +++ b/testcases/kernel/syscalls/fanotify/fanotify06.c @@ -161,10 +161,8 @@ static void verify_event(int group, struct fanotify_event_metadata *event) int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fchdir/fchdir01.c b/testcases/kernel/syscalls/fchdir/fchdir01.c index f250dc3ca..526dfcaa2 100644 --- a/testcases/kernel/syscalls/fchdir/fchdir01.c +++ b/testcases/kernel/syscalls/fchdir/fchdir01.c @@ -78,12 +78,10 @@ const char *TEST_DIR = "alpha"; int main(int ac, char **av) { int lc; - const char *msg; void check_functionality(void); int r_val; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/fchdir/fchdir02.c b/testcases/kernel/syscalls/fchdir/fchdir02.c index 24882d102..cf11bf6b9 100644 --- a/testcases/kernel/syscalls/fchdir/fchdir02.c +++ b/testcases/kernel/syscalls/fchdir/fchdir02.c @@ -69,10 +69,8 @@ int main(int ac, char **av) { const int bad_fd = -5; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/fchdir/fchdir03.c b/testcases/kernel/syscalls/fchdir/fchdir03.c index 5399cf59e..647b68cd8 100644 --- a/testcases/kernel/syscalls/fchdir/fchdir03.c +++ b/testcases/kernel/syscalls/fchdir/fchdir03.c @@ -77,13 +77,11 @@ static uid_t nobody_uid; int main(int ac, char **av) { int lc; - const char *msg; pid_t pid; int status; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fchmod/fchmod01.c b/testcases/kernel/syscalls/fchmod/fchmod01.c index 3eedb0600..ed6bc44cc 100644 --- a/testcases/kernel/syscalls/fchmod/fchmod01.c +++ b/testcases/kernel/syscalls/fchmod/fchmod01.c @@ -126,10 +126,8 @@ char *buf = "davef"; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fchmod/fchmod02.c b/testcases/kernel/syscalls/fchmod/fchmod02.c index 53535b2ed..c15fd58e9 100644 --- a/testcases/kernel/syscalls/fchmod/fchmod02.c +++ b/testcases/kernel/syscalls/fchmod/fchmod02.c @@ -102,13 +102,8 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat(2) struct contents */ int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fchmod/fchmod03.c b/testcases/kernel/syscalls/fchmod/fchmod03.c index 2b93a44fb..749d70a7e 100644 --- a/testcases/kernel/syscalls/fchmod/fchmod03.c +++ b/testcases/kernel/syscalls/fchmod/fchmod03.c @@ -99,11 +99,9 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat struct. */ int lc; - const char *msg; mode_t file_mode; /* mode permissions set on testfile */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fchmod/fchmod04.c b/testcases/kernel/syscalls/fchmod/fchmod04.c index bfd9cb43c..d15ee7e34 100644 --- a/testcases/kernel/syscalls/fchmod/fchmod04.c +++ b/testcases/kernel/syscalls/fchmod/fchmod04.c @@ -102,11 +102,9 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat struct. */ int lc; - const char *msg; mode_t dir_mode; /* mode permissions set on testdirectory */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fchmod/fchmod05.c b/testcases/kernel/syscalls/fchmod/fchmod05.c index 9fad79cdb..a1c09a4d7 100644 --- a/testcases/kernel/syscalls/fchmod/fchmod05.c +++ b/testcases/kernel/syscalls/fchmod/fchmod05.c @@ -103,14 +103,9 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat struct */ int lc; - const char *msg; mode_t dir_mode; /* mode permissions set on test directory */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fchmod/fchmod06.c b/testcases/kernel/syscalls/fchmod/fchmod06.c index d08cefe7d..10cdc8b69 100644 --- a/testcases/kernel/syscalls/fchmod/fchmod06.c +++ b/testcases/kernel/syscalls/fchmod/fchmod06.c @@ -69,12 +69,9 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; int i; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fchmod/fchmod07.c b/testcases/kernel/syscalls/fchmod/fchmod07.c index bf0bc26ff..8ae3b2859 100644 --- a/testcases/kernel/syscalls/fchmod/fchmod07.c +++ b/testcases/kernel/syscalls/fchmod/fchmod07.c @@ -91,17 +91,12 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat(2) struct contents */ int lc; - const char *msg; int ind; /* counter variable for chmod(2) tests */ int mode; /* file mode permission */ TST_TOTAL = sizeof(Modes) / sizeof(int); - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fchmodat/fchmodat01.c b/testcases/kernel/syscalls/fchmodat/fchmodat01.c index cbbb2ce83..19e9ad537 100644 --- a/testcases/kernel/syscalls/fchmodat/fchmodat01.c +++ b/testcases/kernel/syscalls/fchmodat/fchmodat01.c @@ -72,7 +72,6 @@ int myfchmodat(int dirfd, const char *filename, mode_t mode) int main(int ac, char **av) { int lc; - const char *msg; int i; /* Disable test if the version of the kernel is less than 2.6.16 */ @@ -82,8 +81,7 @@ int main(int ac, char **av) exit(0); } - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fchown/fchown01.c b/testcases/kernel/syscalls/fchown/fchown01.c index db0724ebe..23cc78787 100644 --- a/testcases/kernel/syscalls/fchown/fchown01.c +++ b/testcases/kernel/syscalls/fchown/fchown01.c @@ -54,10 +54,8 @@ static int fd; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fchown/fchown02.c b/testcases/kernel/syscalls/fchown/fchown02.c index 510be37e4..80688e620 100644 --- a/testcases/kernel/syscalls/fchown/fchown02.c +++ b/testcases/kernel/syscalls/fchown/fchown02.c @@ -116,11 +116,8 @@ static void verify_fchown(struct test_case *t) int main(int ac, char **av) { int lc, i; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fchown/fchown03.c b/testcases/kernel/syscalls/fchown/fchown03.c index 6498ad19d..000544393 100644 --- a/testcases/kernel/syscalls/fchown/fchown03.c +++ b/testcases/kernel/syscalls/fchown/fchown03.c @@ -61,13 +61,10 @@ int main(int ac, char **av) { struct stat stat_buf; int lc; - const char *msg; uid_t user_id; gid_t group_id; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fchown/fchown04.c b/testcases/kernel/syscalls/fchown/fchown04.c index 4da77717d..0af3afa67 100644 --- a/testcases/kernel/syscalls/fchown/fchown04.c +++ b/testcases/kernel/syscalls/fchown/fchown04.c @@ -74,12 +74,9 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; int i; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fchown/fchown05.c b/testcases/kernel/syscalls/fchown/fchown05.c index f2107be5d..a490301c4 100644 --- a/testcases/kernel/syscalls/fchown/fchown05.c +++ b/testcases/kernel/syscalls/fchown/fchown05.c @@ -63,13 +63,10 @@ int main(int ac, char **av) { struct stat stat_buf; int i, lc; - const char *msg; uid_t user_id; gid_t group_id; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fchownat/fchownat01.c b/testcases/kernel/syscalls/fchownat/fchownat01.c index 3d76e38d1..b361253da 100644 --- a/testcases/kernel/syscalls/fchownat/fchownat01.c +++ b/testcases/kernel/syscalls/fchownat/fchownat01.c @@ -70,11 +70,9 @@ static void fchownat_verify(const struct test_case_t *); int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fchownat/fchownat02.c b/testcases/kernel/syscalls/fchownat/fchownat02.c index dcd66e98e..30be9e01b 100644 --- a/testcases/kernel/syscalls/fchownat/fchownat02.c +++ b/testcases/kernel/syscalls/fchownat/fchownat02.c @@ -53,12 +53,9 @@ static void fchownat_verify(void); int main(int ac, char **av) { int lc; - const char *msg; int i; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fcntl/fcntl01.c b/testcases/kernel/syscalls/fcntl/fcntl01.c index 0f2f7c5f9..8d20be25e 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl01.c +++ b/testcases/kernel/syscalls/fcntl/fcntl01.c @@ -48,10 +48,8 @@ int main(int ac, char **av) int fd[10], fd2[10]; int mypid, i; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fcntl/fcntl02.c b/testcases/kernel/syscalls/fcntl/fcntl02.c index 75cb5665b..afec24a36 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl02.c +++ b/testcases/kernel/syscalls/fcntl/fcntl02.c @@ -130,10 +130,8 @@ int fd; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fcntl/fcntl03.c b/testcases/kernel/syscalls/fcntl/fcntl03.c index 9b4f7702d..2e9fd5124 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl03.c +++ b/testcases/kernel/syscalls/fcntl/fcntl03.c @@ -130,10 +130,8 @@ int fd; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fcntl/fcntl04.c b/testcases/kernel/syscalls/fcntl/fcntl04.c index af5d9d6b8..ed2c016ec 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl04.c +++ b/testcases/kernel/syscalls/fcntl/fcntl04.c @@ -130,10 +130,8 @@ int fd; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fcntl/fcntl05.c b/testcases/kernel/syscalls/fcntl/fcntl05.c index 975b7515b..fb4a0f9a8 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl05.c +++ b/testcases/kernel/syscalls/fcntl/fcntl05.c @@ -131,10 +131,8 @@ struct flock flocks; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fcntl/fcntl06.c b/testcases/kernel/syscalls/fcntl/fcntl06.c index 2313879db..8dcc04866 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl06.c +++ b/testcases/kernel/syscalls/fcntl/fcntl06.c @@ -73,10 +73,7 @@ int main(int ac, char **av) { int fail = 0; - const char *msg; - - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/fcntl/fcntl07.c b/testcases/kernel/syscalls/fcntl/fcntl07.c index a031e16d2..9108b79c1 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl07.c +++ b/testcases/kernel/syscalls/fcntl/fcntl07.c @@ -140,10 +140,8 @@ static void verify_cloexec(struct tcase *tc) int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, options, &help)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); if (t_opt) exit(test_open(t_opt)); diff --git a/testcases/kernel/syscalls/fcntl/fcntl08.c b/testcases/kernel/syscalls/fcntl/fcntl08.c index 39f9471b4..5241adfe3 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl08.c +++ b/testcases/kernel/syscalls/fcntl/fcntl08.c @@ -55,10 +55,8 @@ static int fd; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fcntl/fcntl09.c b/testcases/kernel/syscalls/fcntl/fcntl09.c index 7162bca63..179a61de2 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl09.c +++ b/testcases/kernel/syscalls/fcntl/fcntl09.c @@ -131,13 +131,11 @@ struct flock flocks; int main(int ac, char **av) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/fcntl/fcntl10.c b/testcases/kernel/syscalls/fcntl/fcntl10.c index c0504da02..78c41ade6 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl10.c +++ b/testcases/kernel/syscalls/fcntl/fcntl10.c @@ -131,13 +131,11 @@ struct flock flocks; int main(int ac, char **av) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/fcntl/fcntl11.c b/testcases/kernel/syscalls/fcntl/fcntl11.c index 006a6c421..fa6ce534f 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl11.c +++ b/testcases/kernel/syscalls/fcntl/fcntl11.c @@ -243,10 +243,8 @@ int main(int ac, char **av) struct flock tl; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, "ddddd", &parent_pipe[0], &parent_pipe[1], &child_pipe[0], &child_pipe[1], &fd); diff --git a/testcases/kernel/syscalls/fcntl/fcntl12.c b/testcases/kernel/syscalls/fcntl/fcntl12.c index 2889fbe0b..a176d5905 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl12.c +++ b/testcases/kernel/syscalls/fcntl/fcntl12.c @@ -56,14 +56,11 @@ void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; pid_t pid; int fd, i, status, max_files; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fcntl/fcntl13.c b/testcases/kernel/syscalls/fcntl/fcntl13.c index 2b482751b..d1fe12cd9 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl13.c +++ b/testcases/kernel/syscalls/fcntl/fcntl13.c @@ -50,13 +50,10 @@ void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; struct flock flock; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fcntl/fcntl14.c b/testcases/kernel/syscalls/fcntl/fcntl14.c index 90b34eab0..3b3657222 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl14.c +++ b/testcases/kernel/syscalls/fcntl/fcntl14.c @@ -976,11 +976,8 @@ static void testcheck_end(int check_fail, char *msg) int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX argv0 = av[0]; diff --git a/testcases/kernel/syscalls/fcntl/fcntl15.c b/testcases/kernel/syscalls/fcntl/fcntl15.c index 8e1ddc5eb..087757605 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl15.c +++ b/testcases/kernel/syscalls/fcntl/fcntl15.c @@ -537,13 +537,10 @@ int run_test(int file_flag, int file_mode, int dup_flag) int main(int ac, char **av) { int lc; - const char *msg; int fail = 0; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&dochild1_uc, "nddds", 1, &uc_file_flag, &uc_file_mode, &parent, tmpname); diff --git a/testcases/kernel/syscalls/fcntl/fcntl16.c b/testcases/kernel/syscalls/fcntl/fcntl16.c index 5c8768054..68c07f04a 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl16.c +++ b/testcases/kernel/syscalls/fcntl/fcntl16.c @@ -655,11 +655,8 @@ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(dochild_uc, "ddddd", &kid_uc, &parent, &test, &thislock, &fd); diff --git a/testcases/kernel/syscalls/fcntl/fcntl17.c b/testcases/kernel/syscalls/fcntl/fcntl17.c index 73b781dd9..5b03e39c7 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl17.c +++ b/testcases/kernel/syscalls/fcntl/fcntl17.c @@ -421,12 +421,9 @@ int main(int ac, char **av) { int ans; int lc; - const char *msg; int fail = 0; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child1, "nddddddddd", 1, &file_fd, &parent_pipe[0], &parent_pipe[1], diff --git a/testcases/kernel/syscalls/fcntl/fcntl18.c b/testcases/kernel/syscalls/fcntl/fcntl18.c index 36e12c463..6b9a7aaec 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl18.c +++ b/testcases/kernel/syscalls/fcntl/fcntl18.c @@ -65,11 +65,7 @@ int main(int ac, char **av) struct flock fl; int pid, status; - const char *msg; - - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/fcntl/fcntl19.c b/testcases/kernel/syscalls/fcntl/fcntl19.c index c98756cfd..a542cfc7e 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl19.c +++ b/testcases/kernel/syscalls/fcntl/fcntl19.c @@ -282,11 +282,8 @@ int main(int ac, char **av) struct flock tl; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, "ddddd", &parent_pipe[0], &parent_pipe[1], &child_pipe[0], &child_pipe[1], &fd); diff --git a/testcases/kernel/syscalls/fcntl/fcntl20.c b/testcases/kernel/syscalls/fcntl/fcntl20.c index f425a8afb..aa06bab05 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl20.c +++ b/testcases/kernel/syscalls/fcntl/fcntl20.c @@ -281,11 +281,8 @@ int main(int ac, char **av) struct flock tl; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, "ddddd", &parent_pipe[0], &parent_pipe[1], &child_pipe[0], &child_pipe[1], &fd); diff --git a/testcases/kernel/syscalls/fcntl/fcntl21.c b/testcases/kernel/syscalls/fcntl/fcntl21.c index 1cc0ef0b8..53070211e 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl21.c +++ b/testcases/kernel/syscalls/fcntl/fcntl21.c @@ -289,11 +289,8 @@ int main(int ac, char **av) struct flock tl; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, "ddddd", &parent_pipe[0], &parent_pipe[1], &child_pipe[0], &child_pipe[1], &fd); diff --git a/testcases/kernel/syscalls/fcntl/fcntl22.c b/testcases/kernel/syscalls/fcntl/fcntl22.c index 7699e2995..7bde4dccd 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl22.c +++ b/testcases/kernel/syscalls/fcntl/fcntl22.c @@ -90,12 +90,9 @@ void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; char *test_desc; /* test specific error message */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); /* setup */ setup(); diff --git a/testcases/kernel/syscalls/fcntl/fcntl23.c b/testcases/kernel/syscalls/fcntl/fcntl23.c index 50314fe52..a80f35a04 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl23.c +++ b/testcases/kernel/syscalls/fcntl/fcntl23.c @@ -107,13 +107,11 @@ int fd; int main(int ac, char **av) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/fcntl/fcntl24.c b/testcases/kernel/syscalls/fcntl/fcntl24.c index d3f672f93..2c7982883 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl24.c +++ b/testcases/kernel/syscalls/fcntl/fcntl24.c @@ -108,13 +108,11 @@ int main(int ac, char **av) { int lc; long type; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/fcntl/fcntl25.c b/testcases/kernel/syscalls/fcntl/fcntl25.c index 83ff36c51..f94347c50 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl25.c +++ b/testcases/kernel/syscalls/fcntl/fcntl25.c @@ -109,13 +109,11 @@ int main(int ac, char **av) { int lc; long type; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/fcntl/fcntl26.c b/testcases/kernel/syscalls/fcntl/fcntl26.c index f0192ca8e..eca788da8 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl26.c +++ b/testcases/kernel/syscalls/fcntl/fcntl26.c @@ -109,13 +109,11 @@ int main(int ac, char **av) { int lc; long type; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/fcntl/fcntl27.c b/testcases/kernel/syscalls/fcntl/fcntl27.c index 5032bc2c1..eeb5d63c9 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl27.c +++ b/testcases/kernel/syscalls/fcntl/fcntl27.c @@ -106,14 +106,11 @@ int fd; int main(int ac, char **av) { - int lc, expected_result = -1; /* loop counter, expected */ - /* result from system call */ - const char *msg; + int lc, expected_result = -1; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/fcntl/fcntl28.c b/testcases/kernel/syscalls/fcntl/fcntl28.c index f239d55a2..4da04c48e 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl28.c +++ b/testcases/kernel/syscalls/fcntl/fcntl28.c @@ -103,14 +103,11 @@ int fd; int main(int ac, char **av) { - int lc, expected_result = -1; /* loop counter, expected resul */ - /* from system call */ - const char *msg; + int lc, expected_result = -1; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/fcntl/fcntl29.c b/testcases/kernel/syscalls/fcntl/fcntl29.c index e9f3e644a..653ac2276 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl29.c +++ b/testcases/kernel/syscalls/fcntl/fcntl29.c @@ -46,11 +46,8 @@ static int test_fd; int main(int ac, char **av) { int lc, dup_fd; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fcntl/fcntl30.c b/testcases/kernel/syscalls/fcntl/fcntl30.c index 5905c642d..4a409b868 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl30.c +++ b/testcases/kernel/syscalls/fcntl/fcntl30.c @@ -44,14 +44,11 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; int pipe_fds[2], test_fd; int orig_pipe_size, new_pipe_size; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fcntl/fcntl31.c b/testcases/kernel/syscalls/fcntl/fcntl31.c index 60ab54578..804d0abac 100644 --- a/testcases/kernel/syscalls/fcntl/fcntl31.c +++ b/testcases/kernel/syscalls/fcntl/fcntl31.c @@ -84,11 +84,8 @@ int TST_TOTAL = ARRAY_SIZE(testfunc); int main(int ac, char **av) { int lc, i; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fdatasync/fdatasync01.c b/testcases/kernel/syscalls/fdatasync/fdatasync01.c index 4caa69440..24a91785c 100644 --- a/testcases/kernel/syscalls/fdatasync/fdatasync01.c +++ b/testcases/kernel/syscalls/fdatasync/fdatasync01.c @@ -82,11 +82,8 @@ int TST_TOTAL = 1; int main(int argc, char **argv) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fdatasync/fdatasync02.c b/testcases/kernel/syscalls/fdatasync/fdatasync02.c index 6e44e2cf1..5f0d492eb 100644 --- a/testcases/kernel/syscalls/fdatasync/fdatasync02.c +++ b/testcases/kernel/syscalls/fdatasync/fdatasync02.c @@ -108,11 +108,8 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); int main(int argc, char **argv) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/flock/flock01.c b/testcases/kernel/syscalls/flock/flock01.c index 3af85dbfe..c0106083c 100644 --- a/testcases/kernel/syscalls/flock/flock01.c +++ b/testcases/kernel/syscalls/flock/flock01.c @@ -91,12 +91,8 @@ LOCK_EX, "Exclusive Lock"},}; int main(int argc, char **argv) { int lc, i; - /* loop counter */ - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); /* global setup */ setup(); diff --git a/testcases/kernel/syscalls/flock/flock02.c b/testcases/kernel/syscalls/flock/flock02.c index b513ccdac..971160d74 100644 --- a/testcases/kernel/syscalls/flock/flock02.c +++ b/testcases/kernel/syscalls/flock/flock02.c @@ -90,10 +90,8 @@ int fd; int main(int argc, char **argv) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/flock/flock03.c b/testcases/kernel/syscalls/flock/flock03.c index f264b44c9..1e519b784 100644 --- a/testcases/kernel/syscalls/flock/flock03.c +++ b/testcases/kernel/syscalls/flock/flock03.c @@ -59,13 +59,11 @@ int TST_TOTAL = 3; int main(int argc, char **argv) { int lc; - const char *msg; pid_t pid; int status; int fd; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX maybe_run_child(&childfunc_uc, "ds", &fd_uc, FILE_NAME); diff --git a/testcases/kernel/syscalls/flock/flock04.c b/testcases/kernel/syscalls/flock/flock04.c index 85d89af81..5dafaa441 100644 --- a/testcases/kernel/syscalls/flock/flock04.c +++ b/testcases/kernel/syscalls/flock/flock04.c @@ -88,11 +88,9 @@ int fd, fd1, status; int main(int argc, char **argv) { int lc, retval; - const char *msg; pid_t pid; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/flock/flock05.c b/testcases/kernel/syscalls/flock/flock05.c index 2512e276d..d9d3d00fb 100644 --- a/testcases/kernel/syscalls/flock/flock05.c +++ b/testcases/kernel/syscalls/flock/flock05.c @@ -88,13 +88,9 @@ int fd, fd1, status; int main(int argc, char **argv) { int lc, retval; - /* loop counter */ - const char *msg; pid_t pid; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); /* global setup */ setup(); diff --git a/testcases/kernel/syscalls/flock/flock06.c b/testcases/kernel/syscalls/flock/flock06.c index bdbb6d714..1f1e9c3f0 100644 --- a/testcases/kernel/syscalls/flock/flock06.c +++ b/testcases/kernel/syscalls/flock/flock06.c @@ -78,11 +78,8 @@ char filename[100]; int main(int argc, char **argv) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fork/fork01.c b/testcases/kernel/syscalls/fork/fork01.c index ab30268fb..00d7c45c4 100644 --- a/testcases/kernel/syscalls/fork/fork01.c +++ b/testcases/kernel/syscalls/fork/fork01.c @@ -163,13 +163,10 @@ static void parent_pid(void) int main(int ac, char **av) { int lc; - const char *msg; int fails; int kid_status, wait_status; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fork/fork02.c b/testcases/kernel/syscalls/fork/fork02.c index 7222649ef..6fe66f823 100644 --- a/testcases/kernel/syscalls/fork/fork02.c +++ b/testcases/kernel/syscalls/fork/fork02.c @@ -57,11 +57,8 @@ int main(int ac, char **av) int pid1, pid2, status; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fork/fork03.c b/testcases/kernel/syscalls/fork/fork03.c index f8f64bb89..25b36c897 100644 --- a/testcases/kernel/syscalls/fork/fork03.c +++ b/testcases/kernel/syscalls/fork/fork03.c @@ -57,11 +57,8 @@ int main(int ac, char **av) int pid1, pid2, status; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fork/fork04.c b/testcases/kernel/syscalls/fork/fork04.c index 00b360ffb..d6b57d990 100644 --- a/testcases/kernel/syscalls/fork/fork04.c +++ b/testcases/kernel/syscalls/fork/fork04.c @@ -274,15 +274,11 @@ void parent_environment(void) int main(int ac, char **av) { int lc; - const char *msg; int kid_status; int wait_status; int fails; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fork/fork06.c b/testcases/kernel/syscalls/fork/fork06.c index 5690fe21a..3bc11b14b 100644 --- a/testcases/kernel/syscalls/fork/fork06.c +++ b/testcases/kernel/syscalls/fork/fork06.c @@ -55,11 +55,8 @@ int main(int ac, char **av) int i, pid, status, childpid, succeed, fail; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fork/fork07.c b/testcases/kernel/syscalls/fork/fork07.c index de251c861..4344fdf4c 100644 --- a/testcases/kernel/syscalls/fork/fork07.c +++ b/testcases/kernel/syscalls/fork/fork07.c @@ -76,14 +76,11 @@ int main(int ac, char **av) int c_pass, c_fail; int lc; - const char *msg; rea = NULL; writ = NULL; - msg = parse_opts(ac, av, options, &help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); if (Nflag) { if (sscanf(Nforkarg, "%i", &Nforks) != 1) diff --git a/testcases/kernel/syscalls/fork/fork08.c b/testcases/kernel/syscalls/fork/fork08.c index 89984ac8f..09c616728 100644 --- a/testcases/kernel/syscalls/fork/fork08.c +++ b/testcases/kernel/syscalls/fork/fork08.c @@ -60,11 +60,8 @@ int main(int ac, char **av) FILE *rea, *writ; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fork/fork09.c b/testcases/kernel/syscalls/fork/fork09.c index 835caadf6..35ba01507 100644 --- a/testcases/kernel/syscalls/fork/fork09.c +++ b/testcases/kernel/syscalls/fork/fork09.c @@ -66,11 +66,8 @@ int main(int ac, char **av) int pid, status, nf; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fork/fork10.c b/testcases/kernel/syscalls/fork/fork10.c index a215c002e..381ce6716 100644 --- a/testcases/kernel/syscalls/fork/fork10.c +++ b/testcases/kernel/syscalls/fork/fork10.c @@ -62,13 +62,10 @@ int main(int ac, char **av) char chilchar[2]; int lc; - const char *msg; fildes = -1; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fork/fork11.c b/testcases/kernel/syscalls/fork/fork11.c index 5d9383876..6afda3a33 100644 --- a/testcases/kernel/syscalls/fork/fork11.c +++ b/testcases/kernel/syscalls/fork/fork11.c @@ -54,11 +54,8 @@ int main(int ac, char **av) int i, pid, cpid, status; int fail = 0; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fork/fork12.c b/testcases/kernel/syscalls/fork/fork12.c index 573217105..711fe9874 100644 --- a/testcases/kernel/syscalls/fork/fork12.c +++ b/testcases/kernel/syscalls/fork/fork12.c @@ -57,11 +57,8 @@ int main(int ac, char **av) int forks, pid1, fork_errno, waitstatus; int ret, status; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fork/fork13.c b/testcases/kernel/syscalls/fork/fork13.c index 4a41765fe..d94e86b9e 100644 --- a/testcases/kernel/syscalls/fork/fork13.c +++ b/testcases/kernel/syscalls/fork/fork13.c @@ -72,12 +72,7 @@ static void check(void); int main(int argc, char *argv[]) { - /* message returned from parse_opts */ - const char *msg; - - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); check(); cleanup(); diff --git a/testcases/kernel/syscalls/fork/fork14.c b/testcases/kernel/syscalls/fork/fork14.c index dd8f96aee..bbc1d3d74 100644 --- a/testcases/kernel/syscalls/fork/fork14.c +++ b/testcases/kernel/syscalls/fork/fork14.c @@ -54,11 +54,8 @@ static int fork_test(void); int main(int ac, char **av) { int lc, reproduced; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* * Tested on ppc64/x86_64/i386/s390x. And only 64bit has this issue. * Since a 32bit program can't mmap so many memory. diff --git a/testcases/kernel/syscalls/fpathconf/fpathconf01.c b/testcases/kernel/syscalls/fpathconf/fpathconf01.c index 8056cd730..d38db401a 100644 --- a/testcases/kernel/syscalls/fpathconf/fpathconf01.c +++ b/testcases/kernel/syscalls/fpathconf/fpathconf01.c @@ -71,11 +71,9 @@ static int fd; int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fstat/fstat01.c b/testcases/kernel/syscalls/fstat/fstat01.c index 53037b9dd..769375599 100644 --- a/testcases/kernel/syscalls/fstat/fstat01.c +++ b/testcases/kernel/syscalls/fstat/fstat01.c @@ -130,10 +130,8 @@ struct stat statter; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fstat/fstat02.c b/testcases/kernel/syscalls/fstat/fstat02.c index 1f0964aed..0f4d74604 100644 --- a/testcases/kernel/syscalls/fstat/fstat02.c +++ b/testcases/kernel/syscalls/fstat/fstat02.c @@ -98,10 +98,8 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat structure buffer */ int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fstat/fstat03.c b/testcases/kernel/syscalls/fstat/fstat03.c index 91ddfff79..45e27b49d 100644 --- a/testcases/kernel/syscalls/fstat/fstat03.c +++ b/testcases/kernel/syscalls/fstat/fstat03.c @@ -73,13 +73,8 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat structure buffer */ int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); /* * Invoke setup function to create a testfile under temporary diff --git a/testcases/kernel/syscalls/fstat/fstat04.c b/testcases/kernel/syscalls/fstat/fstat04.c index e9510c189..347fdb5b6 100644 --- a/testcases/kernel/syscalls/fstat/fstat04.c +++ b/testcases/kernel/syscalls/fstat/fstat04.c @@ -97,10 +97,8 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat structure buffer */ int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fstat/fstat05.c b/testcases/kernel/syscalls/fstat/fstat05.c index 35c03d60c..7809a45ef 100644 --- a/testcases/kernel/syscalls/fstat/fstat05.c +++ b/testcases/kernel/syscalls/fstat/fstat05.c @@ -131,10 +131,8 @@ int main(int ac, char **av) struct stat stat_buf; /* stat structure buffer */ struct stat *ptr_str; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* Buffer points outside user's accessible address space. */ ptr_str = &stat_buf; /* if it was for conformance testing */ diff --git a/testcases/kernel/syscalls/fstatat/fstatat01.c b/testcases/kernel/syscalls/fstatat/fstatat01.c index 33a6b9532..61531c6a9 100644 --- a/testcases/kernel/syscalls/fstatat/fstatat01.c +++ b/testcases/kernel/syscalls/fstatat/fstatat01.c @@ -110,7 +110,6 @@ int myfstatat(int dirfd, const char *filename, struct stat *statbuf, int flags) int main(int ac, char **av) { int lc; - const char *msg; int i; if ((tst_kvercmp(2, 6, 16)) < 0) @@ -118,8 +117,7 @@ int main(int ac, char **av) "This test can only run on kernels that are 2.6.16 and " "higher"); - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fstatfs/fstatfs01.c b/testcases/kernel/syscalls/fstatfs/fstatfs01.c index 99f55d592..96004164b 100644 --- a/testcases/kernel/syscalls/fstatfs/fstatfs01.c +++ b/testcases/kernel/syscalls/fstatfs/fstatfs01.c @@ -69,11 +69,9 @@ int TST_TOTAL = ARRAY_SIZE(tcases); int main(int ac, char **av) { int lc, i; - const char *msg; struct statfs stats; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fstatfs/fstatfs02.c b/testcases/kernel/syscalls/fstatfs/fstatfs02.c index c51b9a843..db2230f82 100644 --- a/testcases/kernel/syscalls/fstatfs/fstatfs02.c +++ b/testcases/kernel/syscalls/fstatfs/fstatfs02.c @@ -57,11 +57,8 @@ int main(int ac, char **av) { int lc; int i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fsync/fsync01.c b/testcases/kernel/syscalls/fsync/fsync01.c index 7c6cecc00..340a8d256 100644 --- a/testcases/kernel/syscalls/fsync/fsync01.c +++ b/testcases/kernel/syscalls/fsync/fsync01.c @@ -130,10 +130,8 @@ char *buf = "davef"; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fsync/fsync02.c b/testcases/kernel/syscalls/fsync/fsync02.c index aad5f7fa0..2673edc9e 100644 --- a/testcases/kernel/syscalls/fsync/fsync02.c +++ b/testcases/kernel/syscalls/fsync/fsync02.c @@ -74,7 +74,6 @@ struct statvfs stat_buf; int main(int ac, char **av) { int lc; - const char *msg; off_t offsetret, offset; char pbuf[BUFSIZ]; @@ -85,8 +84,7 @@ int main(int ac, char **av) int data_blocks = 0; long int random_number; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/fsync/fsync03.c b/testcases/kernel/syscalls/fsync/fsync03.c index b89441260..87c4e5ab4 100644 --- a/testcases/kernel/syscalls/fsync/fsync03.c +++ b/testcases/kernel/syscalls/fsync/fsync03.c @@ -74,11 +74,8 @@ int main(int ac, char **av) { int lc; int i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ftruncate/ftruncate01.c b/testcases/kernel/syscalls/ftruncate/ftruncate01.c index 4c2fe5245..ee0352941 100644 --- a/testcases/kernel/syscalls/ftruncate/ftruncate01.c +++ b/testcases/kernel/syscalls/ftruncate/ftruncate01.c @@ -93,14 +93,9 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat(2) struct contents */ int lc; - const char *msg; off_t file_length; /* test file length */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ftruncate/ftruncate02.c b/testcases/kernel/syscalls/ftruncate/ftruncate02.c index 920039b50..40e4ac608 100644 --- a/testcases/kernel/syscalls/ftruncate/ftruncate02.c +++ b/testcases/kernel/syscalls/ftruncate/ftruncate02.c @@ -95,18 +95,13 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat(2) struct contents */ int lc; - const char *msg; off_t file_length2; /* test file length */ off_t file_length1; /* test file length */ int rbytes, i; /* bytes read from testfile */ int read_len = 0; /* total no. of bytes read from testfile */ int err_flag = 0; /* error indicator flag */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ftruncate/ftruncate04.c b/testcases/kernel/syscalls/ftruncate/ftruncate04.c index 4f2b24a0b..99aebfeff 100644 --- a/testcases/kernel/syscalls/ftruncate/ftruncate04.c +++ b/testcases/kernel/syscalls/ftruncate/ftruncate04.c @@ -72,10 +72,8 @@ static void cleanup(void); int main(int ac, char **av) { int lc, pid; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/futex/futex_wait01.c b/testcases/kernel/syscalls/futex/futex_wait01.c index f57fae373..51a540d9e 100644 --- a/testcases/kernel/syscalls/futex/futex_wait01.c +++ b/testcases/kernel/syscalls/futex/futex_wait01.c @@ -75,10 +75,8 @@ static void verify_futex_wait(struct testcase *tc) int main(int argc, char *argv[]) { int lc, i; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); for (lc = 0; TEST_LOOPING(lc); lc++) { for (i = 0; i < TST_TOTAL; i++) diff --git a/testcases/kernel/syscalls/futex/futex_wait02.c b/testcases/kernel/syscalls/futex/futex_wait02.c index a78a0dc55..2b863fe7c 100644 --- a/testcases/kernel/syscalls/futex/futex_wait02.c +++ b/testcases/kernel/syscalls/futex/futex_wait02.c @@ -84,10 +84,8 @@ static void verify_futex_wait(void) int main(int argc, char *argv[]) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/futex/futex_wait03.c b/testcases/kernel/syscalls/futex/futex_wait03.c index d09ba7058..9683e7650 100644 --- a/testcases/kernel/syscalls/futex/futex_wait03.c +++ b/testcases/kernel/syscalls/futex/futex_wait03.c @@ -77,10 +77,8 @@ static void verify_futex_wait(void) int main(int argc, char *argv[]) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); for (lc = 0; TEST_LOOPING(lc); lc++) verify_futex_wait(); diff --git a/testcases/kernel/syscalls/futex/futex_wait04.c b/testcases/kernel/syscalls/futex/futex_wait04.c index 5d8f8090b..b8360ff80 100644 --- a/testcases/kernel/syscalls/futex/futex_wait04.c +++ b/testcases/kernel/syscalls/futex/futex_wait04.c @@ -55,10 +55,8 @@ static void verify_futex_wait(void) int main(int argc, char *argv[]) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); for (lc = 0; TEST_LOOPING(lc); lc++) verify_futex_wait(); diff --git a/testcases/kernel/syscalls/futex/futex_wait05.c b/testcases/kernel/syscalls/futex/futex_wait05.c index d03aac1cf..eced6e358 100644 --- a/testcases/kernel/syscalls/futex/futex_wait05.c +++ b/testcases/kernel/syscalls/futex/futex_wait05.c @@ -74,12 +74,10 @@ static void verify_futex_wait(clock_t clk_id, int fflags) int main(int argc, char *argv[]) { int lc; - const char *msg; tst_timer_check(CLOCK_MONOTONIC); - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); for (lc = 0; TEST_LOOPING(lc); lc++) verify_futex_wait(CLOCK_MONOTONIC, 0); diff --git a/testcases/kernel/syscalls/futex/futex_wait_bitset01.c b/testcases/kernel/syscalls/futex/futex_wait_bitset01.c index 6e25ff40f..458db39d1 100644 --- a/testcases/kernel/syscalls/futex/futex_wait_bitset01.c +++ b/testcases/kernel/syscalls/futex/futex_wait_bitset01.c @@ -36,12 +36,10 @@ const int TST_TOTAL=1; int main(int argc, char *argv[]) { int lc; - const char *msg; tst_timer_check(CLOCK_MONOTONIC); - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); for (lc = 0; TEST_LOOPING(lc); lc++) verify_futex_wait_bitset(DEFAULT_TIMEOUT_MS, CLOCK_MONOTONIC); diff --git a/testcases/kernel/syscalls/futex/futex_wait_bitset02.c b/testcases/kernel/syscalls/futex/futex_wait_bitset02.c index ccffe9ce9..ee6ba4376 100644 --- a/testcases/kernel/syscalls/futex/futex_wait_bitset02.c +++ b/testcases/kernel/syscalls/futex/futex_wait_bitset02.c @@ -36,12 +36,10 @@ const int TST_TOTAL=1; int main(int argc, char *argv[]) { int lc; - const char *msg; tst_timer_check(CLOCK_REALTIME); - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); for (lc = 0; TEST_LOOPING(lc); lc++) verify_futex_wait_bitset(DEFAULT_TIMEOUT_MS, CLOCK_REALTIME); diff --git a/testcases/kernel/syscalls/futex/futex_wake01.c b/testcases/kernel/syscalls/futex/futex_wake01.c index 679d93b62..b5f19043a 100644 --- a/testcases/kernel/syscalls/futex/futex_wake01.c +++ b/testcases/kernel/syscalls/futex/futex_wake01.c @@ -64,10 +64,8 @@ static void verify_futex_wake(struct testcase *tc) int main(int argc, char *argv[]) { int lc, i; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); for (lc = 0; TEST_LOOPING(lc); lc++) { for (i = 0; i < TST_TOTAL; i++) diff --git a/testcases/kernel/syscalls/futex/futex_wake02.c b/testcases/kernel/syscalls/futex/futex_wake02.c index 4ec858e7a..02ee534d2 100644 --- a/testcases/kernel/syscalls/futex/futex_wake02.c +++ b/testcases/kernel/syscalls/futex/futex_wake02.c @@ -195,10 +195,8 @@ static void verify_futex_wake(void) int main(int argc, char *argv[]) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); for (lc = 0; TEST_LOOPING(lc); lc++) verify_futex_wake(); diff --git a/testcases/kernel/syscalls/futex/futex_wake03.c b/testcases/kernel/syscalls/futex/futex_wake03.c index 2f2a85769..523f32851 100644 --- a/testcases/kernel/syscalls/futex/futex_wake03.c +++ b/testcases/kernel/syscalls/futex/futex_wake03.c @@ -106,10 +106,8 @@ static void verify_futex_wake(void) int main(int argc, char *argv[]) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/futimesat/futimesat01.c b/testcases/kernel/syscalls/futimesat/futimesat01.c index 0549e1226..ae8d4fede 100644 --- a/testcases/kernel/syscalls/futimesat/futimesat01.c +++ b/testcases/kernel/syscalls/futimesat/futimesat01.c @@ -74,7 +74,6 @@ int myfutimesat(int dirfd, const char *filename, struct timeval *times) int main(int ac, char **av) { int lc; - const char *msg; int i; /* Disable test if the version of the kernel is less than 2.6.16 */ @@ -84,8 +83,7 @@ int main(int ac, char **av) exit(0); } - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/get_robust_list/get_robust_list01.c b/testcases/kernel/syscalls/get_robust_list/get_robust_list01.c index ab7972b87..595710996 100644 --- a/testcases/kernel/syscalls/get_robust_list/get_robust_list01.c +++ b/testcases/kernel/syscalls/get_robust_list/get_robust_list01.c @@ -73,12 +73,10 @@ void cleanup(void); int main(int argc, char **argv) { int lc; - const char *msg; struct robust_list_head head; size_t len_ptr; /* size of structure struct robust_list_head */ - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getcontext/getcontext01.c b/testcases/kernel/syscalls/getcontext/getcontext01.c index 5e787b2fe..48e78907f 100644 --- a/testcases/kernel/syscalls/getcontext/getcontext01.c +++ b/testcases/kernel/syscalls/getcontext/getcontext01.c @@ -54,10 +54,8 @@ static void test_getcontext(void) int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getcpu/getcpu01.c b/testcases/kernel/syscalls/getcpu/getcpu01.c index 599d9b1f8..c927512ca 100644 --- a/testcases/kernel/syscalls/getcpu/getcpu01.c +++ b/testcases/kernel/syscalls/getcpu/getcpu01.c @@ -93,7 +93,6 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; unsigned int cpu_id, node_id = 0; unsigned int cpu_set; #ifdef __i386__ @@ -110,8 +109,7 @@ int main(int ac, char **av) exit(0); } - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/getcwd/getcwd01.c b/testcases/kernel/syscalls/getcwd/getcwd01.c index a3cdc9a84..0d0ecdb64 100644 --- a/testcases/kernel/syscalls/getcwd/getcwd01.c +++ b/testcases/kernel/syscalls/getcwd/getcwd01.c @@ -87,12 +87,9 @@ int main(int ac, char **av) { int i; int lc; - const char *msg; /* parse_opts() return message */ char *test_erg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* diff --git a/testcases/kernel/syscalls/getcwd/getcwd02.c b/testcases/kernel/syscalls/getcwd/getcwd02.c index 0fccec977..030474c81 100644 --- a/testcases/kernel/syscalls/getcwd/getcwd02.c +++ b/testcases/kernel/syscalls/getcwd/getcwd02.c @@ -87,11 +87,8 @@ int main(int ac, char **av) FILE *fin; char *cp; int lc; - const char *msg; /* parse_opts() return message */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* diff --git a/testcases/kernel/syscalls/getcwd/getcwd03.c b/testcases/kernel/syscalls/getcwd/getcwd03.c index 2de03ccba..af74608c2 100644 --- a/testcases/kernel/syscalls/getcwd/getcwd03.c +++ b/testcases/kernel/syscalls/getcwd/getcwd03.c @@ -78,11 +78,8 @@ int main(int ac, char **av) char link2[BUFSIZ]; int n; int lc; - const char *msg; /* parse_opts() return message */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getcwd/getcwd04.c b/testcases/kernel/syscalls/getcwd/getcwd04.c index 840863669..1a5461c6d 100644 --- a/testcases/kernel/syscalls/getcwd/getcwd04.c +++ b/testcases/kernel/syscalls/getcwd/getcwd04.c @@ -56,13 +56,10 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int status; - const char *msg; char cur_cwd[PATH_MAX]; pid_t child; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getdents/getdents01.c b/testcases/kernel/syscalls/getdents/getdents01.c index 99ad6bb02..4dadd4bdc 100644 --- a/testcases/kernel/syscalls/getdents/getdents01.c +++ b/testcases/kernel/syscalls/getdents/getdents01.c @@ -82,12 +82,13 @@ struct testcase testcases[] = { int main(int ac, char **av) { int lc; - const char *msg; int rval, fd; struct linux_dirent64 *dirp64; struct linux_dirent *dirp; void *buf; + tst_parse_opts(ac, av, options, &help); + /* The buffer is allocated to make sure it's suitably aligned */ buf = malloc(BUFSIZE); @@ -97,9 +98,6 @@ int main(int ac, char **av) dirp64 = buf; dirp = buf; - if ((msg = parse_opts(ac, av, options, &help)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/syscalls/getdents/getdents02.c b/testcases/kernel/syscalls/getdents/getdents02.c index 536feef80..2c019e5db 100644 --- a/testcases/kernel/syscalls/getdents/getdents02.c +++ b/testcases/kernel/syscalls/getdents/getdents02.c @@ -80,10 +80,8 @@ static void help(void) int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, options, &help)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); setup(); diff --git a/testcases/kernel/syscalls/getdomainname/getdomainname01.c b/testcases/kernel/syscalls/getdomainname/getdomainname01.c index 3be6296f7..d40abc8c9 100644 --- a/testcases/kernel/syscalls/getdomainname/getdomainname01.c +++ b/testcases/kernel/syscalls/getdomainname/getdomainname01.c @@ -80,10 +80,8 @@ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getegid/getegid01.c b/testcases/kernel/syscalls/getegid/getegid01.c index dd8137031..271fbb6b6 100644 --- a/testcases/kernel/syscalls/getegid/getegid01.c +++ b/testcases/kernel/syscalls/getegid/getegid01.c @@ -53,10 +53,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getegid/getegid02.c b/testcases/kernel/syscalls/getegid/getegid02.c index 3a95fd119..60f09501e 100644 --- a/testcases/kernel/syscalls/getegid/getegid02.c +++ b/testcases/kernel/syscalls/getegid/getegid02.c @@ -39,12 +39,10 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; uid_t euid; struct passwd *pwent; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/geteuid/geteuid01.c b/testcases/kernel/syscalls/geteuid/geteuid01.c index 5e6a8b671..d02fb0a8d 100644 --- a/testcases/kernel/syscalls/geteuid/geteuid01.c +++ b/testcases/kernel/syscalls/geteuid/geteuid01.c @@ -53,10 +53,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/geteuid/geteuid02.c b/testcases/kernel/syscalls/geteuid/geteuid02.c index 046744d46..e00f81296 100644 --- a/testcases/kernel/syscalls/geteuid/geteuid02.c +++ b/testcases/kernel/syscalls/geteuid/geteuid02.c @@ -33,11 +33,9 @@ int main(int ac, char **av) { struct passwd *pwent; int lc; - const char *msg; uid_t uid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getgid/getgid01.c b/testcases/kernel/syscalls/getgid/getgid01.c index e30469513..385c4d531 100644 --- a/testcases/kernel/syscalls/getgid/getgid01.c +++ b/testcases/kernel/syscalls/getgid/getgid01.c @@ -52,10 +52,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getgid/getgid03.c b/testcases/kernel/syscalls/getgid/getgid03.c index 0a85cff97..b54fa108f 100644 --- a/testcases/kernel/syscalls/getgid/getgid03.c +++ b/testcases/kernel/syscalls/getgid/getgid03.c @@ -39,12 +39,10 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; uid_t uid; struct passwd *pwent; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getgroups/getgroups01.c b/testcases/kernel/syscalls/getgroups/getgroups01.c index 22966ee38..dc3074b75 100644 --- a/testcases/kernel/syscalls/getgroups/getgroups01.c +++ b/testcases/kernel/syscalls/getgroups/getgroups01.c @@ -68,13 +68,11 @@ static GID_T cmpset[NGROUPS]; int main(int ac, char **av) { int lc; - const char *msg; GID_T group; int i; int entries; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getgroups/getgroups03.c b/testcases/kernel/syscalls/getgroups/getgroups03.c index 28e80f5b9..b7b996513 100644 --- a/testcases/kernel/syscalls/getgroups/getgroups03.c +++ b/testcases/kernel/syscalls/getgroups/getgroups03.c @@ -58,11 +58,9 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; int gidsetsize = NGROUPS; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/gethostbyname_r/gethostbyname_r01.c b/testcases/kernel/syscalls/gethostbyname_r/gethostbyname_r01.c index e0ca7523d..53261ea4d 100644 --- a/testcases/kernel/syscalls/gethostbyname_r/gethostbyname_r01.c +++ b/testcases/kernel/syscalls/gethostbyname_r/gethostbyname_r01.c @@ -44,11 +44,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/gethostid/gethostid01.c b/testcases/kernel/syscalls/gethostid/gethostid01.c index d8945059b..e6b006759 100644 --- a/testcases/kernel/syscalls/gethostid/gethostid01.c +++ b/testcases/kernel/syscalls/gethostid/gethostid01.c @@ -139,16 +139,14 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc, i, j; /* loop counters */ - int bit_64 = 0; /* used when compiled 64bit on some 64bit machines */ - const char *msg; + int bit_64 = 0; char *result; char name[HOSTIDLEN], name2[HOSTIDLEN], hostid[HOSTIDLEN], hostid2[HOSTIDLEN], *hostid3, hex[2] = "0x"; char hex_64[8] = "ffffffff"; FILE *fp; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/gethostname/gethostname01.c b/testcases/kernel/syscalls/gethostname/gethostname01.c index 09046b537..a7cb5417f 100644 --- a/testcases/kernel/syscalls/gethostname/gethostname01.c +++ b/testcases/kernel/syscalls/gethostname/gethostname01.c @@ -122,12 +122,10 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; char hname[100]; /* host name */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getitimer/getitimer01.c b/testcases/kernel/syscalls/getitimer/getitimer01.c index f81ce843a..9f6fc5e8f 100644 --- a/testcases/kernel/syscalls/getitimer/getitimer01.c +++ b/testcases/kernel/syscalls/getitimer/getitimer01.c @@ -45,12 +45,9 @@ int main(int ac, char **av) { int lc; int i; - const char *msg; struct itimerval value; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getitimer/getitimer02.c b/testcases/kernel/syscalls/getitimer/getitimer02.c index 6cc48870c..b9c03143a 100644 --- a/testcases/kernel/syscalls/getitimer/getitimer02.c +++ b/testcases/kernel/syscalls/getitimer/getitimer02.c @@ -42,11 +42,8 @@ static void setup(void); int main(int ac, char **av) { int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getitimer/getitimer03.c b/testcases/kernel/syscalls/getitimer/getitimer03.c index bb28cd376..cc5e83fad 100644 --- a/testcases/kernel/syscalls/getitimer/getitimer03.c +++ b/testcases/kernel/syscalls/getitimer/getitimer03.c @@ -73,12 +73,9 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; struct itimerval *value; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/getpagesize/getpagesize01.c b/testcases/kernel/syscalls/getpagesize/getpagesize01.c index 0397d9e31..0d0465827 100644 --- a/testcases/kernel/syscalls/getpagesize/getpagesize01.c +++ b/testcases/kernel/syscalls/getpagesize/getpagesize01.c @@ -51,14 +51,12 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; int size, ret_sysconf; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getpeername/getpeername01.c b/testcases/kernel/syscalls/getpeername/getpeername01.c index f2356a512..fd5d58d57 100644 --- a/testcases/kernel/syscalls/getpeername/getpeername01.c +++ b/testcases/kernel/syscalls/getpeername/getpeername01.c @@ -83,12 +83,9 @@ int TST_TOTAL = ARRAY_SIZE(test_cases); int main(int argc, char *argv[]) { int lc; - const char *msg; int i; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getpgid/getpgid01.c b/testcases/kernel/syscalls/getpgid/getpgid01.c index 625d745a7..1f5b0f9b1 100644 --- a/testcases/kernel/syscalls/getpgid/getpgid01.c +++ b/testcases/kernel/syscalls/getpgid/getpgid01.c @@ -59,14 +59,12 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; /* message returned by parse_opts */ register int pgid_0, pgid_1; register int my_pid, my_ppid; int ex_stat, fail = 0; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getpgid/getpgid02.c b/testcases/kernel/syscalls/getpgid/getpgid02.c index 7ee694fb6..65ce049aa 100644 --- a/testcases/kernel/syscalls/getpgid/getpgid02.c +++ b/testcases/kernel/syscalls/getpgid/getpgid02.c @@ -77,11 +77,8 @@ int main(int ac, char **av) { int lc; int i; - const char *msg; /* message returned by parse_opts */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getpgrp/getpgrp01.c b/testcases/kernel/syscalls/getpgrp/getpgrp01.c index b9d4dabb4..2adf6b64f 100644 --- a/testcases/kernel/syscalls/getpgrp/getpgrp01.c +++ b/testcases/kernel/syscalls/getpgrp/getpgrp01.c @@ -125,10 +125,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getpid/getpid01.c b/testcases/kernel/syscalls/getpid/getpid01.c index 418f6b72b..b9b069c63 100644 --- a/testcases/kernel/syscalls/getpid/getpid01.c +++ b/testcases/kernel/syscalls/getpid/getpid01.c @@ -123,10 +123,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getpid/getpid02.c b/testcases/kernel/syscalls/getpid/getpid02.c index 9fb697baa..8a4197b8c 100644 --- a/testcases/kernel/syscalls/getpid/getpid02.c +++ b/testcases/kernel/syscalls/getpid/getpid02.c @@ -81,14 +81,12 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; pid_t proc_id; /* process id of the test process */ pid_t pid; /* process id of the child process */ pid_t pproc_id; /* parent process id */ int status; /* exit status of child process */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getppid/getppid01.c b/testcases/kernel/syscalls/getppid/getppid01.c index d05be6d8e..a86f82561 100644 --- a/testcases/kernel/syscalls/getppid/getppid01.c +++ b/testcases/kernel/syscalls/getppid/getppid01.c @@ -125,10 +125,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getppid/getppid02.c b/testcases/kernel/syscalls/getppid/getppid02.c index b2df4246e..60181e9e0 100644 --- a/testcases/kernel/syscalls/getppid/getppid02.c +++ b/testcases/kernel/syscalls/getppid/getppid02.c @@ -57,10 +57,8 @@ int main(int ac, char **av) int lc; int status; pid_t pid, ppid; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getpriority/getpriority01.c b/testcases/kernel/syscalls/getpriority/getpriority01.c index d1c252517..e9ff05b8d 100644 --- a/testcases/kernel/syscalls/getpriority/getpriority01.c +++ b/testcases/kernel/syscalls/getpriority/getpriority01.c @@ -86,17 +86,12 @@ int prio_which[] = { PRIO_PROCESS, PRIO_PGRP, PRIO_USER }; int main(int ac, char **av) { int lc; - const char *msg; int ind; int which; /* scheduling priority category */ TST_TOTAL = sizeof(prio_which) / sizeof(int); - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getpriority/getpriority02.c b/testcases/kernel/syscalls/getpriority/getpriority02.c index aad692242..b253a008b 100644 --- a/testcases/kernel/syscalls/getpriority/getpriority02.c +++ b/testcases/kernel/syscalls/getpriority/getpriority02.c @@ -104,17 +104,12 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; int ind; /* counter variable for test case looping */ char *test_desc; /* test specific error message */ int which; /* process priority category */ uid_t who; /* process uid of the test process */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getresgid/getresgid01.c b/testcases/kernel/syscalls/getresgid/getresgid01.c index bb8328cfb..51e01be7c 100644 --- a/testcases/kernel/syscalls/getresgid/getresgid01.c +++ b/testcases/kernel/syscalls/getresgid/getresgid01.c @@ -86,15 +86,10 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; gid_t real_gid, /* real/eff./saved user id from getresgid() */ eff_gid, sav_gid; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getresgid/getresgid02.c b/testcases/kernel/syscalls/getresgid/getresgid02.c index 406c25736..0fc5ae462 100644 --- a/testcases/kernel/syscalls/getresgid/getresgid02.c +++ b/testcases/kernel/syscalls/getresgid/getresgid02.c @@ -90,15 +90,10 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; gid_t real_gid, /* real/eff./saved user id from getresgid() */ eff_gid, sav_gid; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getresgid/getresgid03.c b/testcases/kernel/syscalls/getresgid/getresgid03.c index 2764ed5cd..adf1695e2 100644 --- a/testcases/kernel/syscalls/getresgid/getresgid03.c +++ b/testcases/kernel/syscalls/getresgid/getresgid03.c @@ -91,15 +91,10 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; gid_t real_gid, /* real/eff./saved user id from getresgid() */ eff_gid, sav_gid; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getresuid/getresuid01.c b/testcases/kernel/syscalls/getresuid/getresuid01.c index 6e7e71e1c..28e970a09 100644 --- a/testcases/kernel/syscalls/getresuid/getresuid01.c +++ b/testcases/kernel/syscalls/getresuid/getresuid01.c @@ -85,15 +85,10 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; uid_t real_uid, /* real/eff./saved user id from getresuid() */ eff_uid, sav_uid; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getresuid/getresuid02.c b/testcases/kernel/syscalls/getresuid/getresuid02.c index 0ffd21e5b..2c8664197 100644 --- a/testcases/kernel/syscalls/getresuid/getresuid02.c +++ b/testcases/kernel/syscalls/getresuid/getresuid02.c @@ -90,15 +90,10 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; uid_t real_uid, /* real/eff./saved user id from getresuid() */ eff_uid, sav_uid; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getresuid/getresuid03.c b/testcases/kernel/syscalls/getresuid/getresuid03.c index c23c53fd9..96ff0a696 100644 --- a/testcases/kernel/syscalls/getresuid/getresuid03.c +++ b/testcases/kernel/syscalls/getresuid/getresuid03.c @@ -90,15 +90,10 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; uid_t real_uid, /* real/eff./saved user id from getresuid() */ eff_uid, sav_uid; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getrlimit/getrlimit01.c b/testcases/kernel/syscalls/getrlimit/getrlimit01.c index b0c441a97..68e8bf818 100644 --- a/testcases/kernel/syscalls/getrlimit/getrlimit01.c +++ b/testcases/kernel/syscalls/getrlimit/getrlimit01.c @@ -67,11 +67,8 @@ int main(int ac, char **av) { int i; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getrlimit/getrlimit02.c b/testcases/kernel/syscalls/getrlimit/getrlimit02.c index ac462b5ea..f477e209e 100644 --- a/testcases/kernel/syscalls/getrlimit/getrlimit02.c +++ b/testcases/kernel/syscalls/getrlimit/getrlimit02.c @@ -103,11 +103,8 @@ int main(int ac, char **av) { int i; int lc; - const char *msg; /* parse_opts() return message */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); /* Do initial setup */ setup(); diff --git a/testcases/kernel/syscalls/getrusage/getrusage01.c b/testcases/kernel/syscalls/getrusage/getrusage01.c index 56ec0c8e9..ef8df586d 100644 --- a/testcases/kernel/syscalls/getrusage/getrusage01.c +++ b/testcases/kernel/syscalls/getrusage/getrusage01.c @@ -81,11 +81,9 @@ int main(int ac, char **av) { int lc, i; - const char *msg; struct rusage usage; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getrusage/getrusage02.c b/testcases/kernel/syscalls/getrusage/getrusage02.c index 49433b432..8077606a2 100644 --- a/testcases/kernel/syscalls/getrusage/getrusage02.c +++ b/testcases/kernel/syscalls/getrusage/getrusage02.c @@ -102,10 +102,8 @@ int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getrusage/getrusage03.c b/testcases/kernel/syscalls/getrusage/getrusage03.c index 82ac1fcee..54cdc8322 100644 --- a/testcases/kernel/syscalls/getrusage/getrusage03.c +++ b/testcases/kernel/syscalls/getrusage/getrusage03.c @@ -68,11 +68,8 @@ static void cleanup(void); int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getrusage/getrusage03_child.c b/testcases/kernel/syscalls/getrusage/getrusage03_child.c index c729fd126..24a6f33ed 100644 --- a/testcases/kernel/syscalls/getrusage/getrusage03_child.c +++ b/testcases/kernel/syscalls/getrusage/getrusage03_child.c @@ -64,11 +64,8 @@ int main(int argc, char *argv[]) long maxrss_self, maxrss_children, delta; long consume_nr, grand_consume_nr, self_nr, child_nr; struct rusage ru; - const char *msg; - msg = parse_opts(argc, argv, child_options, usage); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, child_options, usage); setup(); diff --git a/testcases/kernel/syscalls/getrusage/getrusage04.c b/testcases/kernel/syscalls/getrusage/getrusage04.c index c2f34f406..a5b3f6583 100644 --- a/testcases/kernel/syscalls/getrusage/getrusage04.c +++ b/testcases/kernel/syscalls/getrusage/getrusage04.c @@ -84,12 +84,9 @@ int main(int argc, char *argv[]) struct rusage usage; unsigned long ulast, udelta, slast, sdelta; int i, lc; - const char *msg; char msg_string[BUFSIZ]; - msg = parse_opts(argc, argv, child_options, fusage); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, child_options, fusage); #if (__powerpc__) || (__powerpc64__) || (__s390__) || (__s390x__) tst_brkm(TCONF, NULL, "This test is not designed for current system"); diff --git a/testcases/kernel/syscalls/getsid/getsid01.c b/testcases/kernel/syscalls/getsid/getsid01.c index 5b0970ffd..5d5282b1f 100644 --- a/testcases/kernel/syscalls/getsid/getsid01.c +++ b/testcases/kernel/syscalls/getsid/getsid01.c @@ -73,12 +73,9 @@ pid_t p_sid; int main(int ac, char **av) { int lc; - const char *msg; pid_t pid, c_pid, c_sid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/getsid/getsid02.c b/testcases/kernel/syscalls/getsid/getsid02.c index 13887cb74..b5ab339e2 100644 --- a/testcases/kernel/syscalls/getsid/getsid02.c +++ b/testcases/kernel/syscalls/getsid/getsid02.c @@ -35,10 +35,8 @@ static void setup(void); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getsockname/getsockname01.c b/testcases/kernel/syscalls/getsockname/getsockname01.c index c8378bf47..c4b6e9b1a 100644 --- a/testcases/kernel/syscalls/getsockname/getsockname01.c +++ b/testcases/kernel/syscalls/getsockname/getsockname01.c @@ -104,12 +104,8 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getsockopt/getsockopt01.c b/testcases/kernel/syscalls/getsockopt/getsockopt01.c index 867a5407d..1195306a0 100644 --- a/testcases/kernel/syscalls/getsockopt/getsockopt01.c +++ b/testcases/kernel/syscalls/getsockopt/getsockopt01.c @@ -129,12 +129,8 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/gettid/gettid01.c b/testcases/kernel/syscalls/gettid/gettid01.c index e53c9b2e1..7e5b6b175 100644 --- a/testcases/kernel/syscalls/gettid/gettid01.c +++ b/testcases/kernel/syscalls/gettid/gettid01.c @@ -48,10 +48,8 @@ pid_t my_gettid(void) int main(int ac, char **av) { int lc; - const char *msg; /* parse_opts() return message */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c index 8a93d4c59..583d8f7b9 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday01.c @@ -54,12 +54,9 @@ void setup(void); int main(int ac, char **av) { int lc; - const char *msg; int ret; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c index 98dd0aeaa..8cb1f5498 100644 --- a/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c +++ b/testcases/kernel/syscalls/gettimeofday/gettimeofday02.c @@ -80,11 +80,8 @@ void help(void) int main(int ac, char **av) { struct timeval tv1, tv2; - const char *msg; - if ((msg = parse_opts(ac, av, opts, help)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, opts, help); tst_sig(NOFORK, DEF_HANDLER, cleanup); TEST_PAUSE; diff --git a/testcases/kernel/syscalls/getuid/getuid01.c b/testcases/kernel/syscalls/getuid/getuid01.c index 224ca0e5b..50fe1ec31 100644 --- a/testcases/kernel/syscalls/getuid/getuid01.c +++ b/testcases/kernel/syscalls/getuid/getuid01.c @@ -51,10 +51,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getuid/getuid03.c b/testcases/kernel/syscalls/getuid/getuid03.c index d92d5e86e..7c81c628e 100644 --- a/testcases/kernel/syscalls/getuid/getuid03.c +++ b/testcases/kernel/syscalls/getuid/getuid03.c @@ -40,11 +40,9 @@ int main(int ac, char **av) { struct passwd *pwent; int lc; - const char *msg; uid_t uid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getxattr/getxattr01.c b/testcases/kernel/syscalls/getxattr/getxattr01.c index 347260f2f..91d14fa8a 100644 --- a/testcases/kernel/syscalls/getxattr/getxattr01.c +++ b/testcases/kernel/syscalls/getxattr/getxattr01.c @@ -99,11 +99,8 @@ int main(int argc, char *argv[]) { int lc; int i; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getxattr/getxattr02.c b/testcases/kernel/syscalls/getxattr/getxattr02.c index 65430ab20..7a772b844 100644 --- a/testcases/kernel/syscalls/getxattr/getxattr02.c +++ b/testcases/kernel/syscalls/getxattr/getxattr02.c @@ -81,12 +81,9 @@ int main(int argc, char *argv[]) int lc; int i; int exp_eno; - const char *msg; char buf[BUFSIZ]; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/getxattr/getxattr03.c b/testcases/kernel/syscalls/getxattr/getxattr03.c index e91ac4283..eccfdf236 100644 --- a/testcases/kernel/syscalls/getxattr/getxattr03.c +++ b/testcases/kernel/syscalls/getxattr/getxattr03.c @@ -59,11 +59,8 @@ int TST_TOTAL = 1; int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/inotify/inotify01.c b/testcases/kernel/syscalls/inotify/inotify01.c index ee9436c7b..3d84551eb 100644 --- a/testcases/kernel/syscalls/inotify/inotify01.c +++ b/testcases/kernel/syscalls/inotify/inotify01.c @@ -69,10 +69,8 @@ static char event_buf[EVENT_BUF_LEN]; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/inotify/inotify02.c b/testcases/kernel/syscalls/inotify/inotify02.c index 3ccb657aa..74fd7dd8b 100644 --- a/testcases/kernel/syscalls/inotify/inotify02.c +++ b/testcases/kernel/syscalls/inotify/inotify02.c @@ -80,11 +80,9 @@ static char event_buf[EVENT_BUF_LEN]; int main(int ac, char **av) { int lc; - const char *msg; unsigned int stored_cookie = UINT_MAX; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/inotify/inotify03.c b/testcases/kernel/syscalls/inotify/inotify03.c index bb68920d2..36803d804 100644 --- a/testcases/kernel/syscalls/inotify/inotify03.c +++ b/testcases/kernel/syscalls/inotify/inotify03.c @@ -78,13 +78,10 @@ static const char *fs_type; int main(int argc, char *argv[]) { - const char *msg; int ret; int len, i, test_num; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/inotify/inotify04.c b/testcases/kernel/syscalls/inotify/inotify04.c index c77a7e623..1b6c6d23d 100644 --- a/testcases/kernel/syscalls/inotify/inotify04.c +++ b/testcases/kernel/syscalls/inotify/inotify04.c @@ -149,15 +149,12 @@ static void setup(void) int main(int argc, char **argv) { - const char *msg; int i, test_num, len; i = 0; test_num = 0; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/inotify/inotify05.c b/testcases/kernel/syscalls/inotify/inotify05.c index bce5d8b43..bc621b860 100644 --- a/testcases/kernel/syscalls/inotify/inotify05.c +++ b/testcases/kernel/syscalls/inotify/inotify05.c @@ -64,12 +64,9 @@ static char event_buf[EVENT_BUF_LEN]; int main(int ac, char **av) { int lc, i; - const char *msg; int len, stop; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/inotify_init/inotify_init1_01.c b/testcases/kernel/syscalls/inotify_init/inotify_init1_01.c index 1ffa18897..45928f952 100644 --- a/testcases/kernel/syscalls/inotify_init/inotify_init1_01.c +++ b/testcases/kernel/syscalls/inotify_init/inotify_init1_01.c @@ -123,10 +123,8 @@ int main(int argc, char *argv[]) { int fd, coe; int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); if ((tst_kvercmp(2, 6, 27)) < 0) { tst_brkm(TCONF, NULL, diff --git a/testcases/kernel/syscalls/inotify_init/inotify_init1_02.c b/testcases/kernel/syscalls/inotify_init/inotify_init1_02.c index 5fc365e88..2d68eaa41 100644 --- a/testcases/kernel/syscalls/inotify_init/inotify_init1_02.c +++ b/testcases/kernel/syscalls/inotify_init/inotify_init1_02.c @@ -120,10 +120,8 @@ int main(int argc, char *argv[]) { int fd, fl; int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); if ((tst_kvercmp(2, 6, 27)) < 0) { tst_brkm(TCONF, NULL, diff --git a/testcases/kernel/syscalls/io_cancel/io_cancel01.c b/testcases/kernel/syscalls/io_cancel/io_cancel01.c index 3407edc37..8d7ca2607 100644 --- a/testcases/kernel/syscalls/io_cancel/io_cancel01.c +++ b/testcases/kernel/syscalls/io_cancel/io_cancel01.c @@ -67,14 +67,12 @@ static void setup(void) int main(int argc, char *argv[]) { int lc; - const char *msg; io_context_t ctx; memset(&ctx, 0, sizeof(ctx)); - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/io_destroy/io_destroy01.c b/testcases/kernel/syscalls/io_destroy/io_destroy01.c index cbc5f7107..9de4987f4 100644 --- a/testcases/kernel/syscalls/io_destroy/io_destroy01.c +++ b/testcases/kernel/syscalls/io_destroy/io_destroy01.c @@ -62,14 +62,12 @@ static void setup(void) int main(int argc, char *argv[]) { int lc; - const char *msg; io_context_t ctx; memset(&ctx, 0xff, sizeof(ctx)); - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/io_getevents/io_getevents01.c b/testcases/kernel/syscalls/io_getevents/io_getevents01.c index b0a28e171..0f31ece32 100644 --- a/testcases/kernel/syscalls/io_getevents/io_getevents01.c +++ b/testcases/kernel/syscalls/io_getevents/io_getevents01.c @@ -67,14 +67,12 @@ static void setup(void) int main(int argc, char *argv[]) { int lc; - const char *msg; io_context_t ctx; memset(&ctx, 0, sizeof(ctx)); - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/io_setup/io_setup01.c b/testcases/kernel/syscalls/io_setup/io_setup01.c index b727a4a40..829cef516 100644 --- a/testcases/kernel/syscalls/io_setup/io_setup01.c +++ b/testcases/kernel/syscalls/io_setup/io_setup01.c @@ -55,13 +55,11 @@ static void setup(void) int main(int argc, char *argv[]) { int lc; - const char *msg; io_context_t ctx; int expected_return; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/io_submit/io_submit01.c b/testcases/kernel/syscalls/io_submit/io_submit01.c index 3b15faef4..fd01e6ede 100644 --- a/testcases/kernel/syscalls/io_submit/io_submit01.c +++ b/testcases/kernel/syscalls/io_submit/io_submit01.c @@ -87,7 +87,6 @@ static void check_result(long exp, long act) int main(int argc, char *argv[]) { int lc; - const char *msg; int rval, fd; char buf[256]; @@ -95,8 +94,7 @@ int main(int argc, char *argv[]) struct iocb *iocbs[1]; io_context_t ctx; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ioctl/ioctl01.c b/testcases/kernel/syscalls/ioctl/ioctl01.c index a73c1339d..4822d8d29 100644 --- a/testcases/kernel/syscalls/ioctl/ioctl01.c +++ b/testcases/kernel/syscalls/ioctl/ioctl01.c @@ -99,7 +99,6 @@ static struct test_case_t { static int Devflag; static char *devname; -/* for test specific parse_opts options - in this case "-D" */ static option_t options[] = { {"D:", &Devflag, &devname}, {NULL, NULL, NULL} @@ -109,11 +108,8 @@ int main(int ac, char **av) { int lc; int i; - const char *msg; - msg = parse_opts(ac, av, options, &help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); if (!Devflag) tst_brkm(TBROK, NULL, "You must specify a tty device with " diff --git a/testcases/kernel/syscalls/ioctl/ioctl02.c b/testcases/kernel/syscalls/ioctl/ioctl02.c index 739abedf1..47102ca9c 100644 --- a/testcases/kernel/syscalls/ioctl/ioctl02.c +++ b/testcases/kernel/syscalls/ioctl/ioctl02.c @@ -96,7 +96,6 @@ static void sigterm_handler(void); static int Devflag; static char *devname; -/* for test specific parse_opts options - in this case "-D" */ static option_t options[] = { {"D:", &Devflag, &devname}, {NULL, NULL, NULL} @@ -106,11 +105,9 @@ int main(int ac, char **av) { int lc; int rval; - const char *msg; - msg = parse_opts(ac, av, options, &help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); + #ifdef UCLINUX maybe_run_child(&do_child_uclinux, "dS", &parentpid, &childtty); #endif diff --git a/testcases/kernel/syscalls/ioperm/ioperm01.c b/testcases/kernel/syscalls/ioperm/ioperm01.c index 8816d9700..8807b6993 100644 --- a/testcases/kernel/syscalls/ioperm/ioperm01.c +++ b/testcases/kernel/syscalls/ioperm/ioperm01.c @@ -90,10 +90,8 @@ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ioperm/ioperm02.c b/testcases/kernel/syscalls/ioperm/ioperm02.c index 61eeef3f4..7e39fc059 100644 --- a/testcases/kernel/syscalls/ioperm/ioperm02.c +++ b/testcases/kernel/syscalls/ioperm/ioperm02.c @@ -109,10 +109,8 @@ struct test_cases_t *test_cases; int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/iopl/iopl01.c b/testcases/kernel/syscalls/iopl/iopl01.c index c44fc9a5c..ff0057b2d 100644 --- a/testcases/kernel/syscalls/iopl/iopl01.c +++ b/testcases/kernel/syscalls/iopl/iopl01.c @@ -84,10 +84,8 @@ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/iopl/iopl02.c b/testcases/kernel/syscalls/iopl/iopl02.c index dc4522c69..398dca84b 100644 --- a/testcases/kernel/syscalls/iopl/iopl02.c +++ b/testcases/kernel/syscalls/iopl/iopl02.c @@ -106,10 +106,8 @@ int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl01.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl01.c index e6be4c26c..18389627d 100644 --- a/testcases/kernel/syscalls/ipc/msgctl/msgctl01.c +++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl01.c @@ -70,10 +70,8 @@ struct msqid_ds qs_buf; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c index 68b0ee2da..1b3909197 100644 --- a/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c +++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl02.c @@ -72,10 +72,8 @@ unsigned long int new_bytes; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl03.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl03.c index 13b14cff5..4693b89b6 100644 --- a/testcases/kernel/syscalls/ipc/msgctl/msgctl03.c +++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl03.c @@ -68,10 +68,8 @@ struct msqid_ds qs_buf; int main(int ac, char **av) { - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl04.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl04.c index 8e6def75d..a8151cb6a 100644 --- a/testcases/kernel/syscalls/ipc/msgctl/msgctl04.c +++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl04.c @@ -101,11 +101,9 @@ struct test_case_t { /* This allows testing of many negative */ int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c index a8bbdc09c..e737fc893 100644 --- a/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c +++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl05.c @@ -72,12 +72,10 @@ struct msqid_ds q_buf; int main(int ac, char **av) { - const char *msg; pid_t pid; void do_child(void); - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl07.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl07.c index a20565b36..ac1215cf2 100644 --- a/testcases/kernel/syscalls/ipc/msgctl/msgctl07.c +++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl07.c @@ -76,10 +76,8 @@ int main(int argc, char *argv[]) sighandler_t alrm(); #ifdef UCLINUX - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); maybe_run_child(&do_child_1, "ndd", 1, &msqid, &c1_msgp.type); maybe_run_child(&do_child_2, "ndddd", 2, &msqid, &c1_msgp.type, diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl08.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl08.c index 08cd02cf2..eca50c56f 100644 --- a/testcases/kernel/syscalls/ipc/msgctl/msgctl08.c +++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl08.c @@ -82,12 +82,10 @@ int main(int argc, char **argv) struct sigaction act; #ifdef UCLINUX - const char *msg; argv0 = argv[0]; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); maybe_run_child(&do_child_1_uclinux, "ndd", 1, &key_uclinux, &i_uclinux); diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl09.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl09.c index 22fc89514..8dc75cf1a 100644 --- a/testcases/kernel/syscalls/ipc/msgctl/msgctl09.c +++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl09.c @@ -85,12 +85,10 @@ int main(int argc, char **argv) int count, status; #ifdef UCLINUX - const char *msg; argv0 = argv[0]; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); maybe_run_child(&do_child_1_uclinux, "ndd", 1, &key_uclinux, &i_uclinux); diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl10.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl10.c index 137fa26be..475fb73ac 100644 --- a/testcases/kernel/syscalls/ipc/msgctl/msgctl10.c +++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl10.c @@ -79,12 +79,10 @@ int main(int argc, char **argv) struct sigaction act; #ifdef UCLINUX - const char *msg; argv0 = argv[0]; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); maybe_run_child(&do_child_1_uclinux, "ndd", 1, &key_uclinux, &i_uclinux); diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c index beeb16567..8fcefff78 100644 --- a/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c +++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl11.c @@ -88,12 +88,10 @@ int main(int argc, char **argv) int i, j, ok; #ifdef UCLINUX - const char *msg; argv0 = argv[0]; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); maybe_run_child(&do_child_1_uclinux, "ndd", 1, &key_uclinux, &i_uclinux); diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl12.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl12.c index c14171029..2621f8040 100644 --- a/testcases/kernel/syscalls/ipc/msgctl/msgctl12.c +++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl12.c @@ -49,12 +49,9 @@ int TST_TOTAL = ARRAY_SIZE(test_cases); int main(int argc, char *argv[]) { int lc; - const char *msg; int i; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ipc/msgctl/msgctl13.c b/testcases/kernel/syscalls/ipc/msgctl/msgctl13.c index d7eb1164b..e170d6b24 100644 --- a/testcases/kernel/syscalls/ipc/msgctl/msgctl13.c +++ b/testcases/kernel/syscalls/ipc/msgctl/msgctl13.c @@ -33,11 +33,8 @@ static void msgctl_verify(void); int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget01.c b/testcases/kernel/syscalls/ipc/msgget/msgget01.c index a29abbe07..e8208b718 100644 --- a/testcases/kernel/syscalls/ipc/msgget/msgget01.c +++ b/testcases/kernel/syscalls/ipc/msgget/msgget01.c @@ -67,11 +67,9 @@ int msg_q_1 = -1; /* to hold the message queue ID */ int main(int ac, char **av) { int lc; - const char *msg; void check_functionality(void); - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget02.c b/testcases/kernel/syscalls/ipc/msgget/msgget02.c index 3b76713ca..be9bc6188 100644 --- a/testcases/kernel/syscalls/ipc/msgget/msgget02.c +++ b/testcases/kernel/syscalls/ipc/msgget/msgget02.c @@ -81,12 +81,10 @@ int msg_q_1 = -1; /* The message queue id created in setup */ int main(int ac, char **av) { int lc; - const char *msg; int i; key_t key; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget03.c b/testcases/kernel/syscalls/ipc/msgget/msgget03.c index 7c1527d89..2eda25269 100644 --- a/testcases/kernel/syscalls/ipc/msgget/msgget03.c +++ b/testcases/kernel/syscalls/ipc/msgget/msgget03.c @@ -67,11 +67,9 @@ int num_queue = 0; /* count the queues created */ int main(int ac, char **av) { int lc; - const char *msg; int msg_q; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/msgget/msgget04.c b/testcases/kernel/syscalls/ipc/msgget/msgget04.c index 939c169e2..516df182e 100644 --- a/testcases/kernel/syscalls/ipc/msgget/msgget04.c +++ b/testcases/kernel/syscalls/ipc/msgget/msgget04.c @@ -70,11 +70,9 @@ int test_flags[] = { MSG_RD, MSG_WR, MSG_RD | MSG_WR }; int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c index 95b52bced..375d262bc 100644 --- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c +++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv01.c @@ -79,12 +79,10 @@ pid_t c_pid; int main(int ac, char **av) { int lc; - const char *msg; void check_functionality(void); int status, e_code; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, "d", &msg_q_1); diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c index 61bc26ae0..36cc82926 100644 --- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c +++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv02.c @@ -92,11 +92,9 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c index 93dbfed95..762b4d51b 100644 --- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c +++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv03.c @@ -80,11 +80,9 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c index e0fb83724..833ad1aec 100644 --- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c +++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv04.c @@ -91,11 +91,9 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c index 6b4acb428..7a8b680b9 100644 --- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c +++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv05.c @@ -81,10 +81,8 @@ pid_t c_pid; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child_uclinux, "d", &msg_q_1); diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c index 39dab580e..a27d093be 100644 --- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c +++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv06.c @@ -83,10 +83,8 @@ pid_t c_pid; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child_uclinux, "d", &msg_q_1); diff --git a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv07.c b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv07.c index 2f09f409c..44f1c1d91 100644 --- a/testcases/kernel/syscalls/ipc/msgrcv/msgrcv07.c +++ b/testcases/kernel/syscalls/ipc/msgrcv/msgrcv07.c @@ -44,12 +44,9 @@ int TST_TOTAL = ARRAY_SIZE(testfunc); int main(int ac, char **av) { int lc; - const char *msg; int i; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c index 0caff557e..0ca2be023 100644 --- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c +++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd01.c @@ -75,10 +75,8 @@ struct msqid_ds qs_buf; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd02.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd02.c index e68b7c6cf..8b23f83ba 100644 --- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd02.c +++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd02.c @@ -83,11 +83,9 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd03.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd03.c index 35e0657bb..ef6e58e60 100644 --- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd03.c +++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd03.c @@ -89,11 +89,9 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd04.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd04.c index 95d46a6fd..4432d670a 100644 --- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd04.c +++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd04.c @@ -68,10 +68,8 @@ MSGBUF msg_buf; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd05.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd05.c index ffecc754d..16d62f86e 100644 --- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd05.c +++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd05.c @@ -84,11 +84,9 @@ MSGBUF msg_buf; int main(int ac, char **av) { int lc; - const char *msg; pid_t c_pid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child_uclinux, "d", &msg_q_1); diff --git a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c index 71bcb8ae8..42f6e79ce 100644 --- a/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c +++ b/testcases/kernel/syscalls/ipc/msgsnd/msgsnd06.c @@ -78,12 +78,10 @@ MSGBUF msg_buf; int main(int ac, char **av) { int lc; - const char *msg; pid_t c_pid; int status, e_code; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX #define PIPE_NAME "msgsnd06" diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl01.c b/testcases/kernel/syscalls/ipc/semctl/semctl01.c index 3a9ea01e1..9a516ed5e 100644 --- a/testcases/kernel/syscalls/ipc/semctl/semctl01.c +++ b/testcases/kernel/syscalls/ipc/semctl/semctl01.c @@ -123,12 +123,9 @@ static struct test_case_t { int main(int argc, char *argv[]) { int lc; - const char *msg; int i, j; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX argv0 = argv[0]; diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl02.c b/testcases/kernel/syscalls/ipc/semctl/semctl02.c index fb95e1885..10d48dadc 100644 --- a/testcases/kernel/syscalls/ipc/semctl/semctl02.c +++ b/testcases/kernel/syscalls/ipc/semctl/semctl02.c @@ -64,13 +64,11 @@ int sem_id_1 = -1; int main(int ac, char **av) { int lc; - const char *msg; struct semid_ds sem_ds; union semun un_arg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl03.c b/testcases/kernel/syscalls/ipc/semctl/semctl03.c index 13ec17885..c1006509e 100644 --- a/testcases/kernel/syscalls/ipc/semctl/semctl03.c +++ b/testcases/kernel/syscalls/ipc/semctl/semctl03.c @@ -96,11 +96,9 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl04.c b/testcases/kernel/syscalls/ipc/semctl/semctl04.c index 93e33d9eb..d02cd7766 100644 --- a/testcases/kernel/syscalls/ipc/semctl/semctl04.c +++ b/testcases/kernel/syscalls/ipc/semctl/semctl04.c @@ -74,12 +74,10 @@ int TC[] = { IPC_SET, IPC_RMID }; int main(int ac, char **av) { - const char *msg; pid_t pid; void do_child(void); - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl05.c b/testcases/kernel/syscalls/ipc/semctl/semctl05.c index 6e49516e4..865305484 100644 --- a/testcases/kernel/syscalls/ipc/semctl/semctl05.c +++ b/testcases/kernel/syscalls/ipc/semctl/semctl05.c @@ -95,11 +95,9 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/semctl/semctl06.c b/testcases/kernel/syscalls/ipc/semctl/semctl06.c index 08b151ff8..c29834537 100644 --- a/testcases/kernel/syscalls/ipc/semctl/semctl06.c +++ b/testcases/kernel/syscalls/ipc/semctl/semctl06.c @@ -104,9 +104,8 @@ int main(int argc, char **argv) int count, child, status, nwait; #ifdef UCLINUX - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + + tst_parse_opts(argc, argv, NULL, NULL); argv0 = argv[0]; maybe_run_child(&do_child, "dS", &id_uclinux, &maxsemstring); diff --git a/testcases/kernel/syscalls/ipc/semget/semget01.c b/testcases/kernel/syscalls/ipc/semget/semget01.c index dfc075559..a6cdd2d20 100644 --- a/testcases/kernel/syscalls/ipc/semget/semget01.c +++ b/testcases/kernel/syscalls/ipc/semget/semget01.c @@ -66,11 +66,9 @@ int sem_id_1 = -1; int main(int ac, char **av) { int lc; - const char *msg; void check_functionality(void); - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/semget/semget02.c b/testcases/kernel/syscalls/ipc/semget/semget02.c index 1e2448b61..9ba1fb97e 100644 --- a/testcases/kernel/syscalls/ipc/semget/semget02.c +++ b/testcases/kernel/syscalls/ipc/semget/semget02.c @@ -77,11 +77,9 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/semget/semget03.c b/testcases/kernel/syscalls/ipc/semget/semget03.c index a4c3b7147..976c78a52 100644 --- a/testcases/kernel/syscalls/ipc/semget/semget03.c +++ b/testcases/kernel/syscalls/ipc/semget/semget03.c @@ -60,10 +60,8 @@ int sem_id_1 = -1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/semget/semget05.c b/testcases/kernel/syscalls/ipc/semget/semget05.c index e55044310..976769619 100644 --- a/testcases/kernel/syscalls/ipc/semget/semget05.c +++ b/testcases/kernel/syscalls/ipc/semget/semget05.c @@ -66,11 +66,9 @@ int num_sems = 0; /* count the semaphores created */ int main(int ac, char **av) { int lc; - const char *msg; FILE *fp; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* Set the MAXIDS for the specific machine by reading the system limit * for SEMMNI - The maximum number of sempahore sets diff --git a/testcases/kernel/syscalls/ipc/semget/semget06.c b/testcases/kernel/syscalls/ipc/semget/semget06.c index def90b822..858006d80 100644 --- a/testcases/kernel/syscalls/ipc/semget/semget06.c +++ b/testcases/kernel/syscalls/ipc/semget/semget06.c @@ -65,11 +65,9 @@ int num_sems[] = { LARGENUM, SMALLNUM }; int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/semop/semop01.c b/testcases/kernel/syscalls/ipc/semop/semop01.c index 55f532a3f..ea05c53eb 100644 --- a/testcases/kernel/syscalls/ipc/semop/semop01.c +++ b/testcases/kernel/syscalls/ipc/semop/semop01.c @@ -67,12 +67,10 @@ struct sembuf sops[PSEMS]; int main(int ac, char **av) { int lc; - const char *msg; int i; int fail = 0; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ipc/semop/semop02.c b/testcases/kernel/syscalls/ipc/semop/semop02.c index deb163085..6d3b3ec93 100644 --- a/testcases/kernel/syscalls/ipc/semop/semop02.c +++ b/testcases/kernel/syscalls/ipc/semop/semop02.c @@ -68,12 +68,9 @@ int TST_TOTAL = ARRAY_SIZE(TC); int main(int ac, char **av) { int lc; - const char *msg; int i; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ipc/semop/semop03.c b/testcases/kernel/syscalls/ipc/semop/semop03.c index afae9ee9b..a904e9943 100644 --- a/testcases/kernel/syscalls/ipc/semop/semop03.c +++ b/testcases/kernel/syscalls/ipc/semop/semop03.c @@ -64,11 +64,9 @@ int TC[] = { -1, PSEMS + 1 }; /* negative and too many "primitive" semas */ int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/semop/semop04.c b/testcases/kernel/syscalls/ipc/semop/semop04.c index 3a82f1102..bf425b54b 100644 --- a/testcases/kernel/syscalls/ipc/semop/semop04.c +++ b/testcases/kernel/syscalls/ipc/semop/semop04.c @@ -77,13 +77,11 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; int val; /* value for SETVAL */ int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/semop/semop05.c b/testcases/kernel/syscalls/ipc/semop/semop05.c index 733f4f525..34bb4da35 100644 --- a/testcases/kernel/syscalls/ipc/semop/semop05.c +++ b/testcases/kernel/syscalls/ipc/semop/semop05.c @@ -102,13 +102,11 @@ static int i_uclinux; int main(int ac, char **av) { int lc; - const char *msg; int i; pid_t pid; void do_child(); - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child_uclinux, "dd", &i_uclinux, &sem_id_1); diff --git a/testcases/kernel/syscalls/ipc/shmat/shmat01.c b/testcases/kernel/syscalls/ipc/shmat/shmat01.c index d3a3a9937..6de187243 100644 --- a/testcases/kernel/syscalls/ipc/shmat/shmat01.c +++ b/testcases/kernel/syscalls/ipc/shmat/shmat01.c @@ -70,12 +70,9 @@ static void check_functionality(int); int main(int argc, char *argv[]) { int lc, i; - const char *msg; void *attchaddr; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ipc/shmat/shmat02.c b/testcases/kernel/syscalls/ipc/shmat/shmat02.c index cf5c1b182..699a39226 100644 --- a/testcases/kernel/syscalls/ipc/shmat/shmat02.c +++ b/testcases/kernel/syscalls/ipc/shmat/shmat02.c @@ -101,15 +101,12 @@ static void setup_tc(int i, struct test_case_t *tc) int main(int ac, char **av) { int lc; - const char *msg; int i; struct test_case_t *tc; tc = NULL; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); tc = malloc(sizeof(struct test_case_t)); if (tc == NULL) diff --git a/testcases/kernel/syscalls/ipc/shmat/shmat03.c b/testcases/kernel/syscalls/ipc/shmat/shmat03.c index 4c2542f53..35f14d1c1 100644 --- a/testcases/kernel/syscalls/ipc/shmat/shmat03.c +++ b/testcases/kernel/syscalls/ipc/shmat/shmat03.c @@ -72,12 +72,9 @@ static void do_child(void); int main(int ac, char **av) { - const char *msg; int pid; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c b/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c index 9c85a8e71..ac66ceb83 100644 --- a/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c +++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl01.c @@ -129,12 +129,9 @@ static int stat_i; int main(int argc, char *argv[]) { int lc; - const char *msg; int i; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX argv0 = argv[0]; maybe_run_child(do_child, "ddd", &stat_i, &stat_time, &shm_id_1); diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl02.c b/testcases/kernel/syscalls/ipc/shmctl/shmctl02.c index af2551b0e..755959021 100644 --- a/testcases/kernel/syscalls/ipc/shmctl/shmctl02.c +++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl02.c @@ -102,11 +102,9 @@ int TST_TOTAL = ARRAY_SIZE(TC); int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c b/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c index bb5d7cd81..5cb2ad5e5 100644 --- a/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c +++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl03.c @@ -89,12 +89,10 @@ int TST_TOTAL = ARRAY_SIZE(TC); int main(int ac, char **av) { - const char *msg; int pid; void do_child(void); - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/shmctl/shmctl04.c b/testcases/kernel/syscalls/ipc/shmctl/shmctl04.c index 9b0353bc6..c9d13d46e 100644 --- a/testcases/kernel/syscalls/ipc/shmctl/shmctl04.c +++ b/testcases/kernel/syscalls/ipc/shmctl/shmctl04.c @@ -57,10 +57,8 @@ int max_ids; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ipc/shmdt/shmdt01.c b/testcases/kernel/syscalls/ipc/shmdt/shmdt01.c index 3d162765c..fc167e7fd 100644 --- a/testcases/kernel/syscalls/ipc/shmdt/shmdt01.c +++ b/testcases/kernel/syscalls/ipc/shmdt/shmdt01.c @@ -78,11 +78,9 @@ sigjmp_buf env; int main(int ac, char **av) { int lc; - const char *msg; void check_functionality(void); - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/shmdt/shmdt02.c b/testcases/kernel/syscalls/ipc/shmdt/shmdt02.c index aad826c37..5cab2596b 100644 --- a/testcases/kernel/syscalls/ipc/shmdt/shmdt02.c +++ b/testcases/kernel/syscalls/ipc/shmdt/shmdt02.c @@ -57,11 +57,9 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; int unshared; /* a local variable to use to produce *//* the error in the shmdt() call */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget01.c b/testcases/kernel/syscalls/ipc/shmget/shmget01.c index e5d022f71..ae63baf6f 100644 --- a/testcases/kernel/syscalls/ipc/shmget/shmget01.c +++ b/testcases/kernel/syscalls/ipc/shmget/shmget01.c @@ -66,11 +66,9 @@ int shm_id_1 = -1; int main(int ac, char **av) { int lc; - const char *msg; struct shmid_ds buf; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget02.c b/testcases/kernel/syscalls/ipc/shmget/shmget02.c index 91920d106..71d161614 100644 --- a/testcases/kernel/syscalls/ipc/shmget/shmget02.c +++ b/testcases/kernel/syscalls/ipc/shmget/shmget02.c @@ -89,11 +89,9 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget03.c b/testcases/kernel/syscalls/ipc/shmget/shmget03.c index e1d98619b..b9ff1a4e6 100644 --- a/testcases/kernel/syscalls/ipc/shmget/shmget03.c +++ b/testcases/kernel/syscalls/ipc/shmget/shmget03.c @@ -69,10 +69,8 @@ int shm_id_arr[MAXIDS]; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget04.c b/testcases/kernel/syscalls/ipc/shmget/shmget04.c index fdf8d59ee..47fccb763 100644 --- a/testcases/kernel/syscalls/ipc/shmget/shmget04.c +++ b/testcases/kernel/syscalls/ipc/shmget/shmget04.c @@ -63,10 +63,8 @@ int shm_id_1 = -1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/ipc/shmget/shmget05.c b/testcases/kernel/syscalls/ipc/shmget/shmget05.c index 444be4459..ef3bb136f 100644 --- a/testcases/kernel/syscalls/ipc/shmget/shmget05.c +++ b/testcases/kernel/syscalls/ipc/shmget/shmget05.c @@ -70,12 +70,10 @@ char *ltp_user = "nobody"; int main(int ac, char **av) { - const char *msg; int pid; void do_child(void); - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/keyctl/keyctl01.c b/testcases/kernel/syscalls/keyctl/keyctl01.c index f45424f66..30503ffe9 100644 --- a/testcases/kernel/syscalls/keyctl/keyctl01.c +++ b/testcases/kernel/syscalls/keyctl/keyctl01.c @@ -59,10 +59,8 @@ int main(int ac, char **av) int ret; int lc; int32_t ne_key; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/kill/kill01.c b/testcases/kernel/syscalls/kill/kill01.c index 9d3490caf..0aa77b967 100644 --- a/testcases/kernel/syscalls/kill/kill01.c +++ b/testcases/kernel/syscalls/kill/kill01.c @@ -73,13 +73,10 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; pid_t pid; int exno, status, nsig; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, ""); #endif diff --git a/testcases/kernel/syscalls/kill/kill02.c b/testcases/kernel/syscalls/kill/kill02.c index c918e62c3..9d6cc684c 100644 --- a/testcases/kernel/syscalls/kill/kill02.c +++ b/testcases/kernel/syscalls/kill/kill02.c @@ -212,10 +212,8 @@ void childB_rout_uclinux(); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX argv0 = av[0]; diff --git a/testcases/kernel/syscalls/kill/kill03.c b/testcases/kernel/syscalls/kill/kill03.c index 3f8d151ae..5770ae08c 100644 --- a/testcases/kernel/syscalls/kill/kill03.c +++ b/testcases/kernel/syscalls/kill/kill03.c @@ -73,13 +73,10 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; pid_t pid; int exno, status; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, ""); #endif diff --git a/testcases/kernel/syscalls/kill/kill04.c b/testcases/kernel/syscalls/kill/kill04.c index f5bad039b..f3bec1367 100644 --- a/testcases/kernel/syscalls/kill/kill04.c +++ b/testcases/kernel/syscalls/kill/kill04.c @@ -73,12 +73,9 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; pid_t fake_pid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/kill/kill05.c b/testcases/kernel/syscalls/kill/kill05.c index f6ea53a58..510bcee2c 100644 --- a/testcases/kernel/syscalls/kill/kill05.c +++ b/testcases/kernel/syscalls/kill/kill05.c @@ -100,12 +100,10 @@ extern int getipckey(); int main(int ac, char **av) { - const char *msg; pid_t pid; int status; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, ""); #endif diff --git a/testcases/kernel/syscalls/kill/kill06.c b/testcases/kernel/syscalls/kill/kill06.c index 889c3fa5e..aa6ba5d54 100644 --- a/testcases/kernel/syscalls/kill/kill06.c +++ b/testcases/kernel/syscalls/kill/kill06.c @@ -74,13 +74,10 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; pid_t pid1, pid2; int exno, status, nsig, i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, ""); #endif diff --git a/testcases/kernel/syscalls/kill/kill07.c b/testcases/kernel/syscalls/kill/kill07.c index 17212332d..b71064a0f 100644 --- a/testcases/kernel/syscalls/kill/kill07.c +++ b/testcases/kernel/syscalls/kill/kill07.c @@ -86,14 +86,11 @@ extern void rm_shm(int); int main(int ac, char **av) { int lc; - const char *msg; pid_t pid; int exno, status, nsig, asig, ret; struct sigaction my_act, old_act; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, ""); #endif diff --git a/testcases/kernel/syscalls/kill/kill08.c b/testcases/kernel/syscalls/kill/kill08.c index f64327984..b0826c2e5 100644 --- a/testcases/kernel/syscalls/kill/kill08.c +++ b/testcases/kernel/syscalls/kill/kill08.c @@ -74,13 +74,10 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; pid_t pid1, pid2; int exno, status, nsig, i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, ""); #endif diff --git a/testcases/kernel/syscalls/kill/kill09.c b/testcases/kernel/syscalls/kill/kill09.c index b60dea9ae..c5878923c 100644 --- a/testcases/kernel/syscalls/kill/kill09.c +++ b/testcases/kernel/syscalls/kill/kill09.c @@ -131,11 +131,9 @@ int fork_pid; int main(int ac, char **av) { int lc; - const char *msg; int status; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, ""); diff --git a/testcases/kernel/syscalls/kill/kill10.c b/testcases/kernel/syscalls/kill/kill10.c index 9df912608..982d9da87 100644 --- a/testcases/kernel/syscalls/kill/kill10.c +++ b/testcases/kernel/syscalls/kill/kill10.c @@ -204,7 +204,6 @@ pid_t mypid = 0; char *narg, *garg, *darg; int nflag = 0, gflag = 0, dflag = 0; -/* for test specific parse_opts options */ option_t options[] = { {"n:", &nflag, &narg}, /* -n #procs */ {"g:", &gflag, &garg}, /* -g #pgrps */ @@ -215,12 +214,9 @@ option_t options[] = { int main(int ac, char **av) { int lc; - const char *msg; int cnt; - if ((msg = parse_opts(ac, av, options, &help))) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, options, &help); if (nflag) { if (sscanf(narg, "%i", &num_procs) != 1) { diff --git a/testcases/kernel/syscalls/kill/kill11.c b/testcases/kernel/syscalls/kill/kill11.c index 744165030..83fba5beb 100644 --- a/testcases/kernel/syscalls/kill/kill11.c +++ b/testcases/kernel/syscalls/kill/kill11.c @@ -162,10 +162,8 @@ int main(int argc, char **argv) { int lc; unsigned int i; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, "dd", &sig); diff --git a/testcases/kernel/syscalls/kill/kill12.c b/testcases/kernel/syscalls/kill/kill12.c index 9f2ad8e9f..7a47a4ab3 100644 --- a/testcases/kernel/syscalls/kill/kill12.c +++ b/testcases/kernel/syscalls/kill/kill12.c @@ -86,11 +86,8 @@ int main(int argc, char **argv) void chsig(); #ifdef UCLINUX - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); maybe_run_child(&do_child, "dd", &temp, &sig); #endif diff --git a/testcases/kernel/syscalls/lchown/lchown01.c b/testcases/kernel/syscalls/lchown/lchown01.c index 261ceb99a..37fa70f09 100644 --- a/testcases/kernel/syscalls/lchown/lchown01.c +++ b/testcases/kernel/syscalls/lchown/lchown01.c @@ -72,11 +72,9 @@ int main(int argc, char *argv[]) { struct stat stat_buf; int lc; - const char *msg; int i; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/lchown/lchown02.c b/testcases/kernel/syscalls/lchown/lchown02.c index baccd28e7..ce0a69f1f 100644 --- a/testcases/kernel/syscalls/lchown/lchown02.c +++ b/testcases/kernel/syscalls/lchown/lchown02.c @@ -108,13 +108,11 @@ static void cleanup(void); int main(int argc, char *argv[]) { int lc; - const char *msg; uid_t user_id; gid_t group_id; int i; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/lchown/lchown03.c b/testcases/kernel/syscalls/lchown/lchown03.c index 25c9e3609..f08ad2f84 100644 --- a/testcases/kernel/syscalls/lchown/lchown03.c +++ b/testcases/kernel/syscalls/lchown/lchown03.c @@ -68,11 +68,8 @@ int main(int argc, char *argv[]) { int lc; int i; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/link/link02.c b/testcases/kernel/syscalls/link/link02.c index b9a32f110..9f8cd7632 100644 --- a/testcases/kernel/syscalls/link/link02.c +++ b/testcases/kernel/syscalls/link/link02.c @@ -84,10 +84,8 @@ static void verify_link(void) int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/link/link03.c b/testcases/kernel/syscalls/link/link03.c index 10a8d02bf..b6c48098f 100644 --- a/testcases/kernel/syscalls/link/link03.c +++ b/testcases/kernel/syscalls/link/link03.c @@ -68,13 +68,11 @@ option_t options[] = { int main(int ac, char **av) { int lc; - const char *msg; struct stat buf; int i, links; char lname[255]; - if ((msg = parse_opts(ac, av, options, &help)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); if (links_arg) { nlinks = atoi(links_arg); diff --git a/testcases/kernel/syscalls/link/link04.c b/testcases/kernel/syscalls/link/link04.c index 4bdc54798..8296ebabb 100644 --- a/testcases/kernel/syscalls/link/link04.c +++ b/testcases/kernel/syscalls/link/link04.c @@ -102,13 +102,11 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; char *fname1, *fname2; char *desc1, *desc2; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/link/link05.c b/testcases/kernel/syscalls/link/link05.c index d83c6e79d..38676324d 100644 --- a/testcases/kernel/syscalls/link/link05.c +++ b/testcases/kernel/syscalls/link/link05.c @@ -69,13 +69,11 @@ static int nlinks = 1000; int main(int ac, char **av) { int lc; - const char *msg; struct stat fbuf, lbuf; int cnt; char lname[255]; - if ((msg = parse_opts(ac, av, options, &help)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); if (links_arg) { nlinks = atoi(links_arg); diff --git a/testcases/kernel/syscalls/link/link06.c b/testcases/kernel/syscalls/link/link06.c index 41c69ec89..2b3f3808a 100644 --- a/testcases/kernel/syscalls/link/link06.c +++ b/testcases/kernel/syscalls/link/link06.c @@ -54,10 +54,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/link/link07.c b/testcases/kernel/syscalls/link/link07.c index 163fdaf09..70fefa637 100644 --- a/testcases/kernel/syscalls/link/link07.c +++ b/testcases/kernel/syscalls/link/link07.c @@ -54,10 +54,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/link/link08.c b/testcases/kernel/syscalls/link/link08.c index 477702a3b..7d7c2bb2e 100644 --- a/testcases/kernel/syscalls/link/link08.c +++ b/testcases/kernel/syscalls/link/link08.c @@ -82,11 +82,8 @@ int TST_TOTAL = ARRAY_SIZE(test_cases); int main(int ac, char **av) { int i, lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/linkat/linkat01.c b/testcases/kernel/syscalls/linkat/linkat01.c index f378f70a1..fc0687b6a 100644 --- a/testcases/kernel/syscalls/linkat/linkat01.c +++ b/testcases/kernel/syscalls/linkat/linkat01.c @@ -209,7 +209,6 @@ static int mylinkat(int olddirfd, const char *oldfilename, int newdirfd, int main(int ac, char **av) { int lc; - const char *msg; int i; if ((tst_kvercmp(2, 6, 16)) < 0) { @@ -218,8 +217,7 @@ int main(int ac, char **av) exit(0); } - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/linkat/linkat02.c b/testcases/kernel/syscalls/linkat/linkat02.c index 0ddf23498..1b0d8c55d 100644 --- a/testcases/kernel/syscalls/linkat/linkat02.c +++ b/testcases/kernel/syscalls/linkat/linkat02.c @@ -87,12 +87,9 @@ static void linkat_verify(const struct test_struct *); int main(int ac, char **av) { int lc; - const char *msg; int i; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/listen/listen01.c b/testcases/kernel/syscalls/listen/listen01.c index 1fdb24147..e421bb46d 100644 --- a/testcases/kernel/syscalls/listen/listen01.c +++ b/testcases/kernel/syscalls/listen/listen01.c @@ -84,12 +84,8 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/llseek/llseek01.c b/testcases/kernel/syscalls/llseek/llseek01.c index a8e44a8db..b956dbf0d 100644 --- a/testcases/kernel/syscalls/llseek/llseek01.c +++ b/testcases/kernel/syscalls/llseek/llseek01.c @@ -101,11 +101,9 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; loff_t offset; /* Ret value from llseek */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); offset = -1; diff --git a/testcases/kernel/syscalls/llseek/llseek02.c b/testcases/kernel/syscalls/llseek/llseek02.c index 1c9366181..9227f70ed 100644 --- a/testcases/kernel/syscalls/llseek/llseek02.c +++ b/testcases/kernel/syscalls/llseek/llseek02.c @@ -118,17 +118,12 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; int fildes; /* file handle for testfile */ int whence; /* position of file handle in the file */ char *test_desc; /* test specific error message */ int ind; /* counter to test different test conditions */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/llseek/llseek03.c b/testcases/kernel/syscalls/llseek/llseek03.c index d06c6f6e2..4c08a8e3a 100644 --- a/testcases/kernel/syscalls/llseek/llseek03.c +++ b/testcases/kernel/syscalls/llseek/llseek03.c @@ -62,11 +62,8 @@ static size_t file_size; int main(int ac, char **av) { int i, lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/lseek/lseek01.c b/testcases/kernel/syscalls/lseek/lseek01.c index 1649ae96c..9135a8792 100644 --- a/testcases/kernel/syscalls/lseek/lseek01.c +++ b/testcases/kernel/syscalls/lseek/lseek01.c @@ -131,7 +131,6 @@ int Whence[] = { SEEK_SET, SEEK_CUR, SEEK_END, -1 }; int main(int ac, char **av) { int lc; - const char *msg; int ind; int offset; @@ -139,10 +138,7 @@ int main(int ac, char **av) /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/lseek/lseek02.c b/testcases/kernel/syscalls/lseek/lseek02.c index 3b984410e..8d11bdb1b 100644 --- a/testcases/kernel/syscalls/lseek/lseek02.c +++ b/testcases/kernel/syscalls/lseek/lseek02.c @@ -131,15 +131,11 @@ int Whence[] = { SEEK_SET, SEEK_CUR, SEEK_END, -1 }; int main(int ac, char **av) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/lseek/lseek03.c b/testcases/kernel/syscalls/lseek/lseek03.c index d9e41ca55..02b94fbae 100644 --- a/testcases/kernel/syscalls/lseek/lseek03.c +++ b/testcases/kernel/syscalls/lseek/lseek03.c @@ -53,10 +53,8 @@ int TST_TOTAL = ARRAY_SIZE(whences); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/lseek/lseek04.c b/testcases/kernel/syscalls/lseek/lseek04.c index 7693ad517..a07cc5f95 100644 --- a/testcases/kernel/syscalls/lseek/lseek04.c +++ b/testcases/kernel/syscalls/lseek/lseek04.c @@ -130,15 +130,11 @@ int Fd; int main(int ac, char **av) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/lseek/lseek05.c b/testcases/kernel/syscalls/lseek/lseek05.c index 9068d045a..daf15e59b 100644 --- a/testcases/kernel/syscalls/lseek/lseek05.c +++ b/testcases/kernel/syscalls/lseek/lseek05.c @@ -131,15 +131,11 @@ int Fd; int main(int ac, char **av) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/lseek/lseek06.c b/testcases/kernel/syscalls/lseek/lseek06.c index 53fcf723d..056eb406c 100644 --- a/testcases/kernel/syscalls/lseek/lseek06.c +++ b/testcases/kernel/syscalls/lseek/lseek06.c @@ -92,11 +92,9 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; char read_buf[1]; /* data read from temp. file */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/lseek/lseek07.c b/testcases/kernel/syscalls/lseek/lseek07.c index 4ae1bceb1..6dfcab5aa 100644 --- a/testcases/kernel/syscalls/lseek/lseek07.c +++ b/testcases/kernel/syscalls/lseek/lseek07.c @@ -95,12 +95,10 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; char read_buf[BUFSIZ]; /* data read from temp. file */ off_t offset; /* byte position in temporary file */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/lseek/lseek08.c b/testcases/kernel/syscalls/lseek/lseek08.c index 200c58412..49e787a95 100644 --- a/testcases/kernel/syscalls/lseek/lseek08.c +++ b/testcases/kernel/syscalls/lseek/lseek08.c @@ -92,11 +92,9 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; char read_buf[1]; /* data read from temp. file */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/lseek/lseek09.c b/testcases/kernel/syscalls/lseek/lseek09.c index 20e6a8767..38b123415 100644 --- a/testcases/kernel/syscalls/lseek/lseek09.c +++ b/testcases/kernel/syscalls/lseek/lseek09.c @@ -94,11 +94,9 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; char read_buf[BUFSIZ]; /* data read from temp. file */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/lseek/lseek10.c b/testcases/kernel/syscalls/lseek/lseek10.c index 0616ad097..7ee25af43 100644 --- a/testcases/kernel/syscalls/lseek/lseek10.c +++ b/testcases/kernel/syscalls/lseek/lseek10.c @@ -122,14 +122,12 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; int fildes; /* file handle for testfile */ int whence; /* position of file handle in the file */ char *test_desc; /* test specific error message */ int ind; /* counter to test different test conditions */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/lstat/lstat01.c b/testcases/kernel/syscalls/lstat/lstat01.c index 136f2566a..cd5263f16 100644 --- a/testcases/kernel/syscalls/lstat/lstat01.c +++ b/testcases/kernel/syscalls/lstat/lstat01.c @@ -130,13 +130,11 @@ struct stat statter; int main(int ac, char **av) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/lstat/lstat02.c b/testcases/kernel/syscalls/lstat/lstat02.c index 3b2c45abb..64bd37b68 100644 --- a/testcases/kernel/syscalls/lstat/lstat02.c +++ b/testcases/kernel/syscalls/lstat/lstat02.c @@ -91,11 +91,8 @@ int main(int ac, char **av) { int lc; int i; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/lstat/lstat03.c b/testcases/kernel/syscalls/lstat/lstat03.c index a2a42b0d9..9e1c30ba5 100644 --- a/testcases/kernel/syscalls/lstat/lstat03.c +++ b/testcases/kernel/syscalls/lstat/lstat03.c @@ -62,11 +62,8 @@ int main(int ac, char **av) { struct stat stat_buf; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/madvise/madvise01.c b/testcases/kernel/syscalls/madvise/madvise01.c index bd139ec70..4b1286ddd 100644 --- a/testcases/kernel/syscalls/madvise/madvise01.c +++ b/testcases/kernel/syscalls/madvise/madvise01.c @@ -47,15 +47,11 @@ int main(int argc, char *argv[]) int i = 0; char *file = NULL; struct stat stat; - - const char *msg = NULL; char filename[64]; char *progname = NULL; char *str_for_file = "abcdefghijklmnopqrstuvwxyz12345\n"; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/madvise/madvise02.c b/testcases/kernel/syscalls/madvise/madvise02.c index 5417470e2..b9eb77de2 100644 --- a/testcases/kernel/syscalls/madvise/madvise02.c +++ b/testcases/kernel/syscalls/madvise/madvise02.c @@ -103,11 +103,8 @@ int main(int argc, char *argv[]) { int lc; int i; - const char *msg = NULL; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/madvise/madvise03.c b/testcases/kernel/syscalls/madvise/madvise03.c index d59edac57..3da2bb272 100644 --- a/testcases/kernel/syscalls/madvise/madvise03.c +++ b/testcases/kernel/syscalls/madvise/madvise03.c @@ -55,15 +55,11 @@ int main(int argc, char *argv[]) struct stat stat; void *addr1; long shm_size = 0; - - const char *msg = NULL; char filename[64]; char *progname = NULL; char *str_for_file = "abcdefghijklmnopqrstuvwxyz12345\n"; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/madvise/madvise04.c b/testcases/kernel/syscalls/madvise/madvise04.c index db5b92b5d..e89babcac 100644 --- a/testcases/kernel/syscalls/madvise/madvise04.c +++ b/testcases/kernel/syscalls/madvise/madvise04.c @@ -47,15 +47,11 @@ int main(int argc, char *argv[]) int i; char *file = NULL; struct stat stat; - - const char *msg; char filename[64]; char *progname = NULL; char *str_for_file = "abcdefghijklmnopqrstuvwxyz12345\n"; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/madvise/madvise05.c b/testcases/kernel/syscalls/madvise/madvise05.c index 6fbd20886..cdbc26ff4 100644 --- a/testcases/kernel/syscalls/madvise/madvise05.c +++ b/testcases/kernel/syscalls/madvise/madvise05.c @@ -41,12 +41,9 @@ int TST_TOTAL = 1; int main(int argc, char *argv[]) { int lc; - const char *msg = NULL; void *p; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mbind/mbind01.c b/testcases/kernel/syscalls/mbind/mbind01.c index c4c71acd4..d56f39e96 100644 --- a/testcases/kernel/syscalls/mbind/mbind01.c +++ b/testcases/kernel/syscalls/mbind/mbind01.c @@ -180,12 +180,9 @@ static void cleanup(void); int main(int argc, char **argv) { - const char *msg; int lc, i, ret; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); testno = (int)(sizeof(tcase) / sizeof(tcase[0])); diff --git a/testcases/kernel/syscalls/migrate_pages/migrate_pages01.c b/testcases/kernel/syscalls/migrate_pages/migrate_pages01.c index 97d648048..1a3297c5d 100644 --- a/testcases/kernel/syscalls/migrate_pages/migrate_pages01.c +++ b/testcases/kernel/syscalls/migrate_pages/migrate_pages01.c @@ -202,11 +202,8 @@ static void test_invalid_perm(void) int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, options, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, NULL); setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/syscalls/migrate_pages/migrate_pages02.c b/testcases/kernel/syscalls/migrate_pages/migrate_pages02.c index 4d62ad9c4..efc50de6a 100644 --- a/testcases/kernel/syscalls/migrate_pages/migrate_pages02.c +++ b/testcases/kernel/syscalls/migrate_pages/migrate_pages02.c @@ -318,11 +318,8 @@ static void test_migrate_other_process(int node1, int node2, int cap_sys_nice) int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, options, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, NULL); setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/syscalls/mincore/mincore01.c b/testcases/kernel/syscalls/mincore/mincore01.c index 65220c754..97a3d958d 100644 --- a/testcases/kernel/syscalls/mincore/mincore01.c +++ b/testcases/kernel/syscalls/mincore/mincore01.c @@ -83,11 +83,8 @@ int TST_TOTAL = ARRAY_SIZE(TC); int main(int ac, char **av) { int i, lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, cleanup, "error parsing options: %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mincore/mincore02.c b/testcases/kernel/syscalls/mincore/mincore02.c index 7de8ad4e6..713473acd 100644 --- a/testcases/kernel/syscalls/mincore/mincore02.c +++ b/testcases/kernel/syscalls/mincore/mincore02.c @@ -101,15 +101,12 @@ static void setup(void) int main(int argc, char **argv) { int lock_pages, counter; - const char *msg; int lc; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, cleanup, "error parsing options: %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); - + for (lc = 0; TEST_LOOPING(lc); lc++) { tst_count = 0; diff --git a/testcases/kernel/syscalls/mkdir/mkdir01.c b/testcases/kernel/syscalls/mkdir/mkdir01.c index b637ab64f..9839a095b 100644 --- a/testcases/kernel/syscalls/mkdir/mkdir01.c +++ b/testcases/kernel/syscalls/mkdir/mkdir01.c @@ -123,10 +123,8 @@ char *bad_addr = 0; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mkdir/mkdir02.c b/testcases/kernel/syscalls/mkdir/mkdir02.c index 4418dade8..706106a48 100644 --- a/testcases/kernel/syscalls/mkdir/mkdir02.c +++ b/testcases/kernel/syscalls/mkdir/mkdir02.c @@ -95,7 +95,6 @@ char tstdir2[100]; int main(int ac, char **av) { int lc; - const char *msg; struct stat buf, buf1; pid_t pid, pid1; int rval, status; @@ -103,9 +102,7 @@ int main(int ac, char **av) /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); /* * perform global setup for test diff --git a/testcases/kernel/syscalls/mkdir/mkdir03.c b/testcases/kernel/syscalls/mkdir/mkdir03.c index 0bd5978d6..6cff3aaac 100644 --- a/testcases/kernel/syscalls/mkdir/mkdir03.c +++ b/testcases/kernel/syscalls/mkdir/mkdir03.c @@ -77,11 +77,8 @@ int TST_TOTAL = ARRAY_SIZE(TC); int main(int ac, char **av) { int i, lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mkdir/mkdir04.c b/testcases/kernel/syscalls/mkdir/mkdir04.c index c4918ffef..4667a89ea 100644 --- a/testcases/kernel/syscalls/mkdir/mkdir04.c +++ b/testcases/kernel/syscalls/mkdir/mkdir04.c @@ -97,7 +97,6 @@ char tstdir2[100]; int main(int ac, char **av) { int lc; - const char *msg; int rval; pid_t pid, pid1; int status; @@ -105,9 +104,7 @@ int main(int ac, char **av) /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); /* * perform global setup for test diff --git a/testcases/kernel/syscalls/mkdir/mkdir05.c b/testcases/kernel/syscalls/mkdir/mkdir05.c index 37e165dff..1a6d5691d 100644 --- a/testcases/kernel/syscalls/mkdir/mkdir05.c +++ b/testcases/kernel/syscalls/mkdir/mkdir05.c @@ -48,15 +48,12 @@ char tstdir1[100]; int main(int ac, char **av) { int lc; - const char *msg; struct stat buf; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); /* * perform global setup for test diff --git a/testcases/kernel/syscalls/mkdir/mkdir08.c b/testcases/kernel/syscalls/mkdir/mkdir08.c index 43b3b9556..752763a47 100644 --- a/testcases/kernel/syscalls/mkdir/mkdir08.c +++ b/testcases/kernel/syscalls/mkdir/mkdir08.c @@ -129,13 +129,11 @@ char fname[255]; int main(int ac, char **av) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/mkdir/mkdir09.c b/testcases/kernel/syscalls/mkdir/mkdir09.c index 1cd5fb2af..41c20e9f4 100644 --- a/testcases/kernel/syscalls/mkdir/mkdir09.c +++ b/testcases/kernel/syscalls/mkdir/mkdir09.c @@ -104,11 +104,8 @@ int main(int argc, char *argv[]) int c; #ifdef UCLINUX - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); argv0 = argv[0]; maybe_run_child(&dochild1_uclinux, "nd", 1, &nfiles); diff --git a/testcases/kernel/syscalls/mkdirat/mkdirat01.c b/testcases/kernel/syscalls/mkdirat/mkdirat01.c index 2222c6310..7e159479e 100644 --- a/testcases/kernel/syscalls/mkdirat/mkdirat01.c +++ b/testcases/kernel/syscalls/mkdirat/mkdirat01.c @@ -109,11 +109,9 @@ static void cleanup_iteration(void) int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mkdirat/mkdirat02.c b/testcases/kernel/syscalls/mkdirat/mkdirat02.c index 0e354cc4e..36c1f1536 100644 --- a/testcases/kernel/syscalls/mkdirat/mkdirat02.c +++ b/testcases/kernel/syscalls/mkdirat/mkdirat02.c @@ -66,11 +66,8 @@ int main(int ac, char **av) { int lc; int i; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mknod/mknod01.c b/testcases/kernel/syscalls/mknod/mknod01.c index f2abd2c2c..86e63e211 100644 --- a/testcases/kernel/syscalls/mknod/mknod01.c +++ b/testcases/kernel/syscalls/mknod/mknod01.c @@ -66,10 +66,8 @@ int TST_TOTAL = ARRAY_SIZE(tcases); int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mknod/mknod02.c b/testcases/kernel/syscalls/mknod/mknod02.c index 00cb930e9..ac52f20d8 100644 --- a/testcases/kernel/syscalls/mknod/mknod02.c +++ b/testcases/kernel/syscalls/mknod/mknod02.c @@ -104,14 +104,9 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - int fflag; /* functionality flag variable */ - const char *msg; + int fflag; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mknod/mknod03.c b/testcases/kernel/syscalls/mknod/mknod03.c index 03559a11b..5e2670677 100644 --- a/testcases/kernel/syscalls/mknod/mknod03.c +++ b/testcases/kernel/syscalls/mknod/mknod03.c @@ -104,14 +104,9 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - int fflag; /* functionality flag variable */ - const char *msg; + int fflag; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mknod/mknod04.c b/testcases/kernel/syscalls/mknod/mknod04.c index 9bbaba210..d6356aaaf 100644 --- a/testcases/kernel/syscalls/mknod/mknod04.c +++ b/testcases/kernel/syscalls/mknod/mknod04.c @@ -104,14 +104,9 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - int fflag; /* functionality flag variable */ - const char *msg; + int fflag; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mknod/mknod05.c b/testcases/kernel/syscalls/mknod/mknod05.c index 7bcfb55c8..3b3059e57 100644 --- a/testcases/kernel/syscalls/mknod/mknod05.c +++ b/testcases/kernel/syscalls/mknod/mknod05.c @@ -104,14 +104,9 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - int fflag; /* functionality flag variable */ - const char *msg; + int fflag; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mknod/mknod06.c b/testcases/kernel/syscalls/mknod/mknod06.c index ebd67bd27..e82acaddf 100644 --- a/testcases/kernel/syscalls/mknod/mknod06.c +++ b/testcases/kernel/syscalls/mknod/mknod06.c @@ -132,16 +132,11 @@ void cleanup(); /* cleanup function for the tests */ int main(int ac, char **av) { int lc; - const char *msg; char *node_name; /* ptr. for node name created */ char *test_desc; /* test specific error message */ int ind; /* counter to test different test conditions */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); /* * Invoke setup function to call individual test setup functions diff --git a/testcases/kernel/syscalls/mknod/mknod07.c b/testcases/kernel/syscalls/mknod/mknod07.c index 02c1363a8..bf9b8b10d 100644 --- a/testcases/kernel/syscalls/mknod/mknod07.c +++ b/testcases/kernel/syscalls/mknod/mknod07.c @@ -88,12 +88,9 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; int i; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mknod/mknod08.c b/testcases/kernel/syscalls/mknod/mknod08.c index 400c06d4c..403eb0b8d 100644 --- a/testcases/kernel/syscalls/mknod/mknod08.c +++ b/testcases/kernel/syscalls/mknod/mknod08.c @@ -103,14 +103,9 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - int fflag; /* functionality flag variable */ - const char *msg; + int fflag; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mknod/mknod09.c b/testcases/kernel/syscalls/mknod/mknod09.c index a5ee9e620..a785eb876 100644 --- a/testcases/kernel/syscalls/mknod/mknod09.c +++ b/testcases/kernel/syscalls/mknod/mknod09.c @@ -82,14 +82,9 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; char *test_desc; /* test specific error message */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mknodat/mknodat01.c b/testcases/kernel/syscalls/mknodat/mknodat01.c index e8f03941d..26e553806 100644 --- a/testcases/kernel/syscalls/mknodat/mknodat01.c +++ b/testcases/kernel/syscalls/mknodat/mknodat01.c @@ -96,11 +96,9 @@ static void verify_mknodat(struct test_case *test) int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mknodat/mknodat02.c b/testcases/kernel/syscalls/mknodat/mknodat02.c index e52647ebf..7e7a830bd 100644 --- a/testcases/kernel/syscalls/mknodat/mknodat02.c +++ b/testcases/kernel/syscalls/mknodat/mknodat02.c @@ -86,11 +86,8 @@ int TST_TOTAL = ARRAY_SIZE(test_cases); int main(int ac, char **av) { int lc, i; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mlock/mlock01.c b/testcases/kernel/syscalls/mlock/mlock01.c index d86bf6451..5e0104279 100644 --- a/testcases/kernel/syscalls/mlock/mlock01.c +++ b/testcases/kernel/syscalls/mlock/mlock01.c @@ -81,10 +81,8 @@ struct test_case_t { int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mlock/mlock02.c b/testcases/kernel/syscalls/mlock/mlock02.c index c128d3306..fe7db58f9 100644 --- a/testcases/kernel/syscalls/mlock/mlock02.c +++ b/testcases/kernel/syscalls/mlock/mlock02.c @@ -63,10 +63,8 @@ int TST_TOTAL = ARRAY_SIZE(test_func); int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mlock/mlock03.c b/testcases/kernel/syscalls/mlock/mlock03.c index 363c0c2b1..80600a2a0 100644 --- a/testcases/kernel/syscalls/mlock/mlock03.c +++ b/testcases/kernel/syscalls/mlock/mlock03.c @@ -49,14 +49,12 @@ static void cleanup(void); int main(int argc, char *argv[]) { int lc; - const char *msg; long from, to; long first = -1, last = -1; char b[KB]; FILE *fp; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mlockall/mlockall01.c b/testcases/kernel/syscalls/mlockall/mlockall01.c index 201e967f7..dd51da715 100644 --- a/testcases/kernel/syscalls/mlockall/mlockall01.c +++ b/testcases/kernel/syscalls/mlockall/mlockall01.c @@ -93,11 +93,8 @@ struct test_case_t { int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mlockall/mlockall02.c b/testcases/kernel/syscalls/mlockall/mlockall02.c index 5ab22b4f3..db2516ce9 100644 --- a/testcases/kernel/syscalls/mlockall/mlockall02.c +++ b/testcases/kernel/syscalls/mlockall/mlockall02.c @@ -103,11 +103,8 @@ struct test_case_t { int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mlockall/mlockall03.c b/testcases/kernel/syscalls/mlockall/mlockall03.c index b2017da77..29997c0a8 100644 --- a/testcases/kernel/syscalls/mlockall/mlockall03.c +++ b/testcases/kernel/syscalls/mlockall/mlockall03.c @@ -110,12 +110,9 @@ struct test_case_t { int main(int ac, char **av) { int lc, i; - const char *msg; struct utsname *buf; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); /* allocate some space for buf */ if ((buf = malloc((size_t)sizeof(struct utsname))) == NULL) { diff --git a/testcases/kernel/syscalls/mmap/mmap001.c b/testcases/kernel/syscalls/mmap/mmap001.c index a915351ad..59a923f0f 100644 --- a/testcases/kernel/syscalls/mmap/mmap001.c +++ b/testcases/kernel/syscalls/mmap/mmap001.c @@ -81,13 +81,11 @@ option_t options[] = { int main(int argc, char *argv[]) { char *array; - const char *msg; int i, lc; int fd; unsigned int pages, memsize; - if ((msg = parse_opts(argc, argv, options, help)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, help); if (m_opt) { memsize = pages = atoi(m_copt); diff --git a/testcases/kernel/syscalls/mmap/mmap01.c b/testcases/kernel/syscalls/mmap/mmap01.c index e6b8e87c6..41183d109 100644 --- a/testcases/kernel/syscalls/mmap/mmap01.c +++ b/testcases/kernel/syscalls/mmap/mmap01.c @@ -66,10 +66,8 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mmap/mmap02.c b/testcases/kernel/syscalls/mmap/mmap02.c index df6e84fda..b7972f132 100644 --- a/testcases/kernel/syscalls/mmap/mmap02.c +++ b/testcases/kernel/syscalls/mmap/mmap02.c @@ -61,10 +61,8 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mmap/mmap03.c b/testcases/kernel/syscalls/mmap/mmap03.c index 2447329fd..679f0762d 100644 --- a/testcases/kernel/syscalls/mmap/mmap03.c +++ b/testcases/kernel/syscalls/mmap/mmap03.c @@ -71,10 +71,8 @@ static void sig_handler(int sig); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mmap/mmap04.c b/testcases/kernel/syscalls/mmap/mmap04.c index 3c82040e2..896157baf 100644 --- a/testcases/kernel/syscalls/mmap/mmap04.c +++ b/testcases/kernel/syscalls/mmap/mmap04.c @@ -65,10 +65,8 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mmap/mmap05.c b/testcases/kernel/syscalls/mmap/mmap05.c index 8fdd2f3c7..2cbad0653 100644 --- a/testcases/kernel/syscalls/mmap/mmap05.c +++ b/testcases/kernel/syscalls/mmap/mmap05.c @@ -67,11 +67,9 @@ static void sig_handler(int sig); int main(int ac, char **av) { int lc; - const char *msg; char file_content; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mmap/mmap06.c b/testcases/kernel/syscalls/mmap/mmap06.c index 534c60a8a..e01cef2ed 100644 --- a/testcases/kernel/syscalls/mmap/mmap06.c +++ b/testcases/kernel/syscalls/mmap/mmap06.c @@ -59,10 +59,8 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mmap/mmap07.c b/testcases/kernel/syscalls/mmap/mmap07.c index b28e63aa8..372840ac5 100644 --- a/testcases/kernel/syscalls/mmap/mmap07.c +++ b/testcases/kernel/syscalls/mmap/mmap07.c @@ -60,10 +60,8 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mmap/mmap08.c b/testcases/kernel/syscalls/mmap/mmap08.c index 326cffb2d..f7ef6c3a2 100644 --- a/testcases/kernel/syscalls/mmap/mmap08.c +++ b/testcases/kernel/syscalls/mmap/mmap08.c @@ -55,10 +55,8 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mmap/mmap09.c b/testcases/kernel/syscalls/mmap/mmap09.c index ad4030bc1..4ab0da470 100644 --- a/testcases/kernel/syscalls/mmap/mmap09.c +++ b/testcases/kernel/syscalls/mmap/mmap09.c @@ -64,10 +64,8 @@ int main(int argc, char **argv) { int lc; int i; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mmap/mmap10.c b/testcases/kernel/syscalls/mmap/mmap10.c index 144e53fa2..667cc8089 100644 --- a/testcases/kernel/syscalls/mmap/mmap10.c +++ b/testcases/kernel/syscalls/mmap/mmap10.c @@ -88,11 +88,8 @@ static option_t options[] = { int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, options, help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, help); if (opt_ksm) { if (access(PATH_KSM, F_OK) == -1) diff --git a/testcases/kernel/syscalls/mmap/mmap11.c b/testcases/kernel/syscalls/mmap/mmap11.c index 1b45ed134..a2d994578 100644 --- a/testcases/kernel/syscalls/mmap/mmap11.c +++ b/testcases/kernel/syscalls/mmap/mmap11.c @@ -68,11 +68,8 @@ static void check(void); int main(int argc, char *argv[]) { - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); check(); cleanup(); diff --git a/testcases/kernel/syscalls/mmap/mmap12.c b/testcases/kernel/syscalls/mmap/mmap12.c index f4ef38bc1..ba8c64661 100644 --- a/testcases/kernel/syscalls/mmap/mmap12.c +++ b/testcases/kernel/syscalls/mmap/mmap12.c @@ -59,11 +59,8 @@ static void cleanup(void); int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mmap/mmap13.c b/testcases/kernel/syscalls/mmap/mmap13.c index 77f0beedc..c5a2058e9 100644 --- a/testcases/kernel/syscalls/mmap/mmap13.c +++ b/testcases/kernel/syscalls/mmap/mmap13.c @@ -60,11 +60,8 @@ int main(int argc, char *argv[]) { int lc; char *ch; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mmap/mmap14.c b/testcases/kernel/syscalls/mmap/mmap14.c index 41fafa662..65c6d79b4 100644 --- a/testcases/kernel/syscalls/mmap/mmap14.c +++ b/testcases/kernel/syscalls/mmap/mmap14.c @@ -46,14 +46,11 @@ static void cleanup(void); int main(int argc, char *argv[]) { int lc; - const char *msg; unsigned int sz_before; unsigned int sz_after; unsigned int sz_ch; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mmap/mmap15.c b/testcases/kernel/syscalls/mmap/mmap15.c index 079ffc65c..d2c0cbcee 100644 --- a/testcases/kernel/syscalls/mmap/mmap15.c +++ b/testcases/kernel/syscalls/mmap/mmap15.c @@ -50,16 +50,13 @@ static void cleanup(void); int main(int ac, char **av) { int lc, fd; - const char *msg; void *addr; #if __WORDSIZE == 32 tst_brkm(TCONF, NULL, "This test is only for 64bit"); #endif - msg = parse_opts(ac, av, NULL, NULL); - if (msg) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mmap/mmap16.c b/testcases/kernel/syscalls/mmap/mmap16.c index 5fe8cb01f..5291a35d4 100644 --- a/testcases/kernel/syscalls/mmap/mmap16.c +++ b/testcases/kernel/syscalls/mmap/mmap16.c @@ -58,11 +58,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int i, lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c b/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c index ea091e6c3..248111814 100644 --- a/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c +++ b/testcases/kernel/syscalls/modify_ldt/modify_ldt01.c @@ -94,7 +94,6 @@ void setup(void); int main(int ac, char **av) { int lc; - const char *msg; void *ptr; int retval, func; @@ -102,9 +101,7 @@ int main(int ac, char **av) int flag; int seg[4]; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/modify_ldt/modify_ldt02.c b/testcases/kernel/syscalls/modify_ldt/modify_ldt02.c index da615746e..b82d14ea3 100644 --- a/testcases/kernel/syscalls/modify_ldt/modify_ldt02.c +++ b/testcases/kernel/syscalls/modify_ldt/modify_ldt02.c @@ -91,16 +91,13 @@ void setup(void); int main(int ac, char **av) { int lc; - const char *msg; int val, pid, status; int flag; int seg[4]; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/modify_ldt/modify_ldt03.c b/testcases/kernel/syscalls/modify_ldt/modify_ldt03.c index 5d6c3ea06..01730e0e1 100644 --- a/testcases/kernel/syscalls/modify_ldt/modify_ldt03.c +++ b/testcases/kernel/syscalls/modify_ldt/modify_ldt03.c @@ -50,11 +50,8 @@ static void setup(void); int main(int ac, char **av) { int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mount/mount01.c b/testcases/kernel/syscalls/mount/mount01.c index d8e0d2f08..a7ced12d6 100644 --- a/testcases/kernel/syscalls/mount/mount01.c +++ b/testcases/kernel/syscalls/mount/mount01.c @@ -42,10 +42,8 @@ static const char *fs_type; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mount/mount02.c b/testcases/kernel/syscalls/mount/mount02.c index cffcfdfc1..6dfd07610 100644 --- a/testcases/kernel/syscalls/mount/mount02.c +++ b/testcases/kernel/syscalls/mount/mount02.c @@ -127,11 +127,8 @@ cleanup: int main(int ac, char **av) { int lc, i; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mount/mount03.c b/testcases/kernel/syscalls/mount/mount03.c index cb10873e4..dc8eeeee8 100644 --- a/testcases/kernel/syscalls/mount/mount03.c +++ b/testcases/kernel/syscalls/mount/mount03.c @@ -83,11 +83,8 @@ long rwflags[] = { int main(int argc, char *argv[]) { int lc, i; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mount/mount04.c b/testcases/kernel/syscalls/mount/mount04.c index 7a48d487a..6c9ebf775 100644 --- a/testcases/kernel/syscalls/mount/mount04.c +++ b/testcases/kernel/syscalls/mount/mount04.c @@ -67,10 +67,8 @@ static void verify_mount(void) int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL))) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mount/mount05.c b/testcases/kernel/syscalls/mount/mount05.c index 710adb1b0..d19c147ee 100644 --- a/testcases/kernel/syscalls/mount/mount05.c +++ b/testcases/kernel/syscalls/mount/mount05.c @@ -59,11 +59,8 @@ static option_t options[] = { int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, options, &help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, &help); setup(); diff --git a/testcases/kernel/syscalls/mount/mount06.c b/testcases/kernel/syscalls/mount/mount06.c index 0d55d0a64..d7dcec2b7 100644 --- a/testcases/kernel/syscalls/mount/mount06.c +++ b/testcases/kernel/syscalls/mount/mount06.c @@ -60,11 +60,8 @@ static int mount_flag; int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/move_pages/move_pages01.c b/testcases/kernel/syscalls/move_pages/move_pages01.c index 2893bb071..6f9bd896d 100644 --- a/testcases/kernel/syscalls/move_pages/move_pages01.c +++ b/testcases/kernel/syscalls/move_pages/move_pages01.c @@ -67,13 +67,8 @@ int TST_TOTAL = 1; int main(int argc, char **argv) { - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/move_pages/move_pages02.c b/testcases/kernel/syscalls/move_pages/move_pages02.c index 07fbe963a..23594ab1b 100644 --- a/testcases/kernel/syscalls/move_pages/move_pages02.c +++ b/testcases/kernel/syscalls/move_pages/move_pages02.c @@ -68,13 +68,8 @@ int TST_TOTAL = 1; int main(int argc, char **argv) { - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/move_pages/move_pages03.c b/testcases/kernel/syscalls/move_pages/move_pages03.c index 4d87c51a9..ec036e610 100644 --- a/testcases/kernel/syscalls/move_pages/move_pages03.c +++ b/testcases/kernel/syscalls/move_pages/move_pages03.c @@ -106,13 +106,8 @@ void child(void **pages, sem_t * sem) int main(int argc, char **argv) { - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/move_pages/move_pages04.c b/testcases/kernel/syscalls/move_pages/move_pages04.c index 0ef377fb2..1657beea4 100644 --- a/testcases/kernel/syscalls/move_pages/move_pages04.c +++ b/testcases/kernel/syscalls/move_pages/move_pages04.c @@ -74,13 +74,8 @@ typedef void (*sighandler_t) (int); int main(int argc, char **argv) { - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/move_pages/move_pages05.c b/testcases/kernel/syscalls/move_pages/move_pages05.c index 295146455..10264ef20 100644 --- a/testcases/kernel/syscalls/move_pages/move_pages05.c +++ b/testcases/kernel/syscalls/move_pages/move_pages05.c @@ -107,13 +107,8 @@ void child(void **pages, sem_t * sem) int main(int argc, char **argv) { - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/move_pages/move_pages06.c b/testcases/kernel/syscalls/move_pages/move_pages06.c index 8f202839f..847fc6279 100644 --- a/testcases/kernel/syscalls/move_pages/move_pages06.c +++ b/testcases/kernel/syscalls/move_pages/move_pages06.c @@ -68,13 +68,8 @@ int TST_TOTAL = 1; int main(int argc, char **argv) { - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/move_pages/move_pages07.c b/testcases/kernel/syscalls/move_pages/move_pages07.c index 5c18f73a2..b8653bd8c 100644 --- a/testcases/kernel/syscalls/move_pages/move_pages07.c +++ b/testcases/kernel/syscalls/move_pages/move_pages07.c @@ -68,13 +68,8 @@ int TST_TOTAL = 1; int main(int argc, char **argv) { - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/move_pages/move_pages08.c b/testcases/kernel/syscalls/move_pages/move_pages08.c index 55ec2555f..e0705a20e 100644 --- a/testcases/kernel/syscalls/move_pages/move_pages08.c +++ b/testcases/kernel/syscalls/move_pages/move_pages08.c @@ -68,11 +68,8 @@ int TST_TOTAL = 1; int main(int argc, char **argv) { - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/move_pages/move_pages09.c b/testcases/kernel/syscalls/move_pages/move_pages09.c index 43b9d2526..d217fc2a1 100644 --- a/testcases/kernel/syscalls/move_pages/move_pages09.c +++ b/testcases/kernel/syscalls/move_pages/move_pages09.c @@ -68,11 +68,8 @@ int TST_TOTAL = 1; int main(int argc, char **argv) { - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/move_pages/move_pages10.c b/testcases/kernel/syscalls/move_pages/move_pages10.c index 8836a2c8d..1777ff465 100644 --- a/testcases/kernel/syscalls/move_pages/move_pages10.c +++ b/testcases/kernel/syscalls/move_pages/move_pages10.c @@ -68,13 +68,8 @@ int TST_TOTAL = 1; int main(int argc, char **argv) { - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/move_pages/move_pages11.c b/testcases/kernel/syscalls/move_pages/move_pages11.c index ee0bf1afa..4013c5977 100644 --- a/testcases/kernel/syscalls/move_pages/move_pages11.c +++ b/testcases/kernel/syscalls/move_pages/move_pages11.c @@ -106,13 +106,8 @@ void child(void **pages, sem_t * sem) int main(int argc, char **argv) { - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mprotect/mprotect01.c b/testcases/kernel/syscalls/mprotect/mprotect01.c index 7a7648258..d514b1352 100644 --- a/testcases/kernel/syscalls/mprotect/mprotect01.c +++ b/testcases/kernel/syscalls/mprotect/mprotect01.c @@ -83,10 +83,8 @@ int main(int ac, char **av) { int lc; int i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mprotect/mprotect02.c b/testcases/kernel/syscalls/mprotect/mprotect02.c index 23d56117e..a513493dc 100644 --- a/testcases/kernel/syscalls/mprotect/mprotect02.c +++ b/testcases/kernel/syscalls/mprotect/mprotect02.c @@ -58,13 +58,11 @@ static char buf[] = "abcdefghijklmnopqrstuvwxyz"; int main(int ac, char **av) { int lc; - const char *msg; int bytes_to_write, fd, num_bytes; pid_t pid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mprotect/mprotect03.c b/testcases/kernel/syscalls/mprotect/mprotect03.c index c5cbcbb99..c53932d13 100644 --- a/testcases/kernel/syscalls/mprotect/mprotect03.c +++ b/testcases/kernel/syscalls/mprotect/mprotect03.c @@ -64,14 +64,12 @@ char file1[BUFSIZ]; int main(int ac, char **av) { int lc; - const char *msg; char *addr; int fd, pid; char *buf = "abcdefghijklmnopqrstuvwxyz"; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mprotect/mprotect04.c b/testcases/kernel/syscalls/mprotect/mprotect04.c index aa3bf3010..c4007f3cb 100644 --- a/testcases/kernel/syscalls/mprotect/mprotect04.c +++ b/testcases/kernel/syscalls/mprotect/mprotect04.c @@ -60,11 +60,8 @@ int main(int ac, char **av) { int lc; int i; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mq_notify/mq_notify01.c b/testcases/kernel/syscalls/mq_notify/mq_notify01.c index fb616507f..4728c7070 100644 --- a/testcases/kernel/syscalls/mq_notify/mq_notify01.c +++ b/testcases/kernel/syscalls/mq_notify/mq_notify01.c @@ -299,7 +299,6 @@ int main(int ac, char **av) int c; int i; int lc; - const char *msg; struct option long_options[] = { {"debug", no_argument, 0, 'd'}, @@ -309,8 +308,7 @@ int main(int ac, char **av) progname = basename(av[0]); - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mq_notify/mq_notify02.c b/testcases/kernel/syscalls/mq_notify/mq_notify02.c index 874e7461a..fe59b5a11 100644 --- a/testcases/kernel/syscalls/mq_notify/mq_notify02.c +++ b/testcases/kernel/syscalls/mq_notify/mq_notify02.c @@ -45,11 +45,8 @@ int main(int argc, char **argv) { int lc; int i; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mq_open/mq_open01.c b/testcases/kernel/syscalls/mq_open/mq_open01.c index cfd973cb1..3c2d1b1ee 100644 --- a/testcases/kernel/syscalls/mq_open/mq_open01.c +++ b/testcases/kernel/syscalls/mq_open/mq_open01.c @@ -393,10 +393,8 @@ int main(int ac, char **av) int result = RESULT_OK; int i; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c b/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c index 2d0df22bd..945e2fa79 100644 --- a/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c +++ b/testcases/kernel/syscalls/mq_timedreceive/mq_timedreceive01.c @@ -437,10 +437,8 @@ int main(int ac, char **av) int result = RESULT_OK; int i; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mq_timedsend/mq_timedsend01.c b/testcases/kernel/syscalls/mq_timedsend/mq_timedsend01.c index aaaba61bd..5b1cd535c 100644 --- a/testcases/kernel/syscalls/mq_timedsend/mq_timedsend01.c +++ b/testcases/kernel/syscalls/mq_timedsend/mq_timedsend01.c @@ -440,10 +440,8 @@ int main(int ac, char **av) int result = RESULT_OK; int i; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mq_unlink/mq_unlink01.c b/testcases/kernel/syscalls/mq_unlink/mq_unlink01.c index 3ebc14910..28b569651 100644 --- a/testcases/kernel/syscalls/mq_unlink/mq_unlink01.c +++ b/testcases/kernel/syscalls/mq_unlink/mq_unlink01.c @@ -266,10 +266,8 @@ int main(int ac, char **av) { int i; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mremap/mremap01.c b/testcases/kernel/syscalls/mremap/mremap01.c index f6c15cbd1..d63d1e456 100644 --- a/testcases/kernel/syscalls/mremap/mremap01.c +++ b/testcases/kernel/syscalls/mremap/mremap01.c @@ -97,11 +97,9 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { - const char *msg; int ind; /* counter variable */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); tst_count = 0; diff --git a/testcases/kernel/syscalls/mremap/mremap02.c b/testcases/kernel/syscalls/mremap/mremap02.c index 4c1e61b5d..5a51b9aff 100644 --- a/testcases/kernel/syscalls/mremap/mremap02.c +++ b/testcases/kernel/syscalls/mremap/mremap02.c @@ -93,10 +93,8 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mremap/mremap03.c b/testcases/kernel/syscalls/mremap/mremap03.c index 6b1827c4a..12e3829bf 100644 --- a/testcases/kernel/syscalls/mremap/mremap03.c +++ b/testcases/kernel/syscalls/mremap/mremap03.c @@ -95,10 +95,8 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mremap/mremap04.c b/testcases/kernel/syscalls/mremap/mremap04.c index 748988ad8..c25dbfeb4 100644 --- a/testcases/kernel/syscalls/mremap/mremap04.c +++ b/testcases/kernel/syscalls/mremap/mremap04.c @@ -105,10 +105,8 @@ extern int getipckey(); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/mremap/mremap05.c b/testcases/kernel/syscalls/mremap/mremap05.c index e612bf1d8..079f281e5 100644 --- a/testcases/kernel/syscalls/mremap/mremap05.c +++ b/testcases/kernel/syscalls/mremap/mremap05.c @@ -214,12 +214,9 @@ static void cleanup1(struct test_case_t *t) int main(int ac, char **av) { - const char *msg; int lc, testno; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/syscalls/msync/msync01.c b/testcases/kernel/syscalls/msync/msync01.c index 6bd02c69f..565d5fe7c 100644 --- a/testcases/kernel/syscalls/msync/msync01.c +++ b/testcases/kernel/syscalls/msync/msync01.c @@ -89,12 +89,10 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; char read_buf[BUF_SIZE]; /* buffer to hold data read from file */ int nread = 0, count, err_flg = 0; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/syscalls/msync/msync03.c b/testcases/kernel/syscalls/msync/msync03.c index c0a7ed91b..8bd35be0d 100644 --- a/testcases/kernel/syscalls/msync/msync03.c +++ b/testcases/kernel/syscalls/msync/msync03.c @@ -87,11 +87,8 @@ int TST_TOTAL = ARRAY_SIZE(test_cases); int main(int ac, char **av) { int i, lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/munlock/munlock01.c b/testcases/kernel/syscalls/munlock/munlock01.c index 5e31e4782..3b4392fb9 100644 --- a/testcases/kernel/syscalls/munlock/munlock01.c +++ b/testcases/kernel/syscalls/munlock/munlock01.c @@ -92,11 +92,8 @@ struct test_case_t { int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/munlock/munlock02.c b/testcases/kernel/syscalls/munlock/munlock02.c index 9793f5f55..75906a1df 100644 --- a/testcases/kernel/syscalls/munlock/munlock02.c +++ b/testcases/kernel/syscalls/munlock/munlock02.c @@ -98,11 +98,8 @@ NULL, 0, ENOMEM, "address range out of address space"},}; int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/munlockall/munlockall01.c b/testcases/kernel/syscalls/munlockall/munlockall01.c index e8f7fbcc9..14d06674d 100644 --- a/testcases/kernel/syscalls/munlockall/munlockall01.c +++ b/testcases/kernel/syscalls/munlockall/munlockall01.c @@ -76,12 +76,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/munlockall/munlockall02.c b/testcases/kernel/syscalls/munlockall/munlockall02.c index 657054490..bc11371a0 100644 --- a/testcases/kernel/syscalls/munlockall/munlockall02.c +++ b/testcases/kernel/syscalls/munlockall/munlockall02.c @@ -85,12 +85,8 @@ struct passwd *ltpuser; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/munmap/munmap01.c b/testcases/kernel/syscalls/munmap/munmap01.c index e9510b780..62dbaffbc 100644 --- a/testcases/kernel/syscalls/munmap/munmap01.c +++ b/testcases/kernel/syscalls/munmap/munmap01.c @@ -92,10 +92,8 @@ void sig_handler(); /* signal catching function */ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/syscalls/munmap/munmap02.c b/testcases/kernel/syscalls/munmap/munmap02.c index 4752a8aba..7f1d9f4c2 100644 --- a/testcases/kernel/syscalls/munmap/munmap02.c +++ b/testcases/kernel/syscalls/munmap/munmap02.c @@ -96,10 +96,8 @@ void sig_handler(); /* signal catching function */ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/syscalls/munmap/munmap03.c b/testcases/kernel/syscalls/munmap/munmap03.c index 88c1802b0..3b88b531e 100644 --- a/testcases/kernel/syscalls/munmap/munmap03.c +++ b/testcases/kernel/syscalls/munmap/munmap03.c @@ -61,10 +61,8 @@ int TST_TOTAL = ARRAY_SIZE(testfunc); int main(int ac, char **av) { int i, lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/nanosleep/nanosleep01.c b/testcases/kernel/syscalls/nanosleep/nanosleep01.c index 480998252..4d9d083b1 100644 --- a/testcases/kernel/syscalls/nanosleep/nanosleep01.c +++ b/testcases/kernel/syscalls/nanosleep/nanosleep01.c @@ -37,12 +37,9 @@ static void setup(void); int main(int ac, char **av) { int lc; - const char *msg; struct timespec timereq = {.tv_sec = 2, .tv_nsec = 9999}; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/nanosleep/nanosleep02.c b/testcases/kernel/syscalls/nanosleep/nanosleep02.c index 9a26fd202..2da893713 100644 --- a/testcases/kernel/syscalls/nanosleep/nanosleep02.c +++ b/testcases/kernel/syscalls/nanosleep/nanosleep02.c @@ -59,11 +59,9 @@ static void sig_handler(); int main(int ac, char **av) { int lc; - const char *msg; pid_t cpid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, ""); diff --git a/testcases/kernel/syscalls/nanosleep/nanosleep03.c b/testcases/kernel/syscalls/nanosleep/nanosleep03.c index c1cc39477..2c9af6e59 100644 --- a/testcases/kernel/syscalls/nanosleep/nanosleep03.c +++ b/testcases/kernel/syscalls/nanosleep/nanosleep03.c @@ -44,12 +44,10 @@ static void sig_handler(); int main(int ac, char **av) { int lc; - const char *msg; pid_t cpid; int status; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, "dddd", &timereq.tv_sec, &timereq.tv_nsec, diff --git a/testcases/kernel/syscalls/nanosleep/nanosleep04.c b/testcases/kernel/syscalls/nanosleep/nanosleep04.c index f3f253c1a..527ad14b2 100644 --- a/testcases/kernel/syscalls/nanosleep/nanosleep04.c +++ b/testcases/kernel/syscalls/nanosleep/nanosleep04.c @@ -65,10 +65,8 @@ static void verify_nanosleep(struct timespec *tcase) int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/newuname/newuname01.c b/testcases/kernel/syscalls/newuname/newuname01.c index 89f79d957..1c5cb48f9 100644 --- a/testcases/kernel/syscalls/newuname/newuname01.c +++ b/testcases/kernel/syscalls/newuname/newuname01.c @@ -107,11 +107,8 @@ int main(int ac, char **av) { struct utsname name; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/nice/nice01.c b/testcases/kernel/syscalls/nice/nice01.c index fd75ea5fa..fa6563ddb 100644 --- a/testcases/kernel/syscalls/nice/nice01.c +++ b/testcases/kernel/syscalls/nice/nice01.c @@ -88,12 +88,10 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; int New_nice; /* priority of process after nice() */ int rval; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/nice/nice02.c b/testcases/kernel/syscalls/nice/nice02.c index a88a972ec..248c30b31 100644 --- a/testcases/kernel/syscalls/nice/nice02.c +++ b/testcases/kernel/syscalls/nice/nice02.c @@ -82,12 +82,10 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; int New_nice; /* priority of process after nice() */ int max_val; /* Maximum nice value per OS. */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/nice/nice03.c b/testcases/kernel/syscalls/nice/nice03.c index 7127073dc..357de9efc 100644 --- a/testcases/kernel/syscalls/nice/nice03.c +++ b/testcases/kernel/syscalls/nice/nice03.c @@ -86,11 +86,9 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; int New_nice; /* priority of process after nice() */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/nice/nice04.c b/testcases/kernel/syscalls/nice/nice04.c index 96b7ec31d..40fa6eda8 100644 --- a/testcases/kernel/syscalls/nice/nice04.c +++ b/testcases/kernel/syscalls/nice/nice04.c @@ -90,13 +90,11 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; int i; int incr_val; /* nice value for the process */ char *test_desc; /* test specific error message */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/nice/nice05.c b/testcases/kernel/syscalls/nice/nice05.c index 750419f4f..699ec257b 100644 --- a/testcases/kernel/syscalls/nice/nice05.c +++ b/testcases/kernel/syscalls/nice/nice05.c @@ -127,15 +127,11 @@ int val; int main(int ac, char **av) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/open/open01.c b/testcases/kernel/syscalls/open/open01.c index eb9f86b39..adb59d48f 100644 --- a/testcases/kernel/syscalls/open/open01.c +++ b/testcases/kernel/syscalls/open/open01.c @@ -66,7 +66,6 @@ static void setup(void); int main(int ac, char **av) { int lc; - const char *msg; struct stat statbuf; int fildes; @@ -75,9 +74,7 @@ int main(int ac, char **av) /* * parse standard command line options */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/open/open02.c b/testcases/kernel/syscalls/open/open02.c index 1b5321071..5812d3cb7 100644 --- a/testcases/kernel/syscalls/open/open02.c +++ b/testcases/kernel/syscalls/open/open02.c @@ -58,12 +58,9 @@ static void open_verify(const struct test_case_t *); int main(int ac, char **av) { int lc; - const char *msg; int i; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/open/open03.c b/testcases/kernel/syscalls/open/open03.c index c0e7c710b..a67873c40 100644 --- a/testcases/kernel/syscalls/open/open03.c +++ b/testcases/kernel/syscalls/open/open03.c @@ -44,11 +44,8 @@ static int fd; int main(int ac, char **av) { int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/open/open04.c b/testcases/kernel/syscalls/open/open04.c index 35c47d69a..52a1e5cdf 100644 --- a/testcases/kernel/syscalls/open/open04.c +++ b/testcases/kernel/syscalls/open/open04.c @@ -49,11 +49,8 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/open/open05.c b/testcases/kernel/syscalls/open/open05.c index b17d8b633..43e6ef901 100644 --- a/testcases/kernel/syscalls/open/open05.c +++ b/testcases/kernel/syscalls/open/open05.c @@ -51,13 +51,10 @@ static void setup(void); int main(int ac, char **av) { int lc; - const char *msg; int e_code, status, retval = 0; pid_t pid; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/open/open06.c b/testcases/kernel/syscalls/open/open06.c index 0b3fde5b2..6c774ce84 100644 --- a/testcases/kernel/syscalls/open/open06.c +++ b/testcases/kernel/syscalls/open/open06.c @@ -44,11 +44,8 @@ static char fname[100] = "fifo"; int main(int ac, char **av) { int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/open/open07.c b/testcases/kernel/syscalls/open/open07.c index eda8bf099..8d99ae5c2 100644 --- a/testcases/kernel/syscalls/open/open07.c +++ b/testcases/kernel/syscalls/open/open07.c @@ -103,12 +103,9 @@ static struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; int i; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/open/open08.c b/testcases/kernel/syscalls/open/open08.c index d5ce59acb..4a3fa25d3 100644 --- a/testcases/kernel/syscalls/open/open08.c +++ b/testcases/kernel/syscalls/open/open08.c @@ -92,12 +92,9 @@ int TST_TOTAL = sizeof(TC) / sizeof(TC[0]); int main(int ac, char **av) { int lc; - const char *msg; int i; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/open/open09.c b/testcases/kernel/syscalls/open/open09.c index da14cdfa4..331ce0f6c 100644 --- a/testcases/kernel/syscalls/open/open09.c +++ b/testcases/kernel/syscalls/open/open09.c @@ -47,11 +47,8 @@ int main(int ac, char *av[]) char pbuf[BUFSIZ]; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/open/open10.c b/testcases/kernel/syscalls/open/open10.c index a8f98120d..31f4679ee 100644 --- a/testcases/kernel/syscalls/open/open10.c +++ b/testcases/kernel/syscalls/open/open10.c @@ -76,12 +76,9 @@ int main(int ac, char *av[]) pid_t mypid; int lc; - const char *msg; int fail_count = 0; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/open/open11.c b/testcases/kernel/syscalls/open/open11.c index a04c834a1..9e6bb34b7 100644 --- a/testcases/kernel/syscalls/open/open11.c +++ b/testcases/kernel/syscalls/open/open11.c @@ -331,11 +331,8 @@ int main(int argc, char *argv[]) int i; int fd; int ret; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/open/open12.c b/testcases/kernel/syscalls/open/open12.c index 2d90bacdb..54ddfe043 100644 --- a/testcases/kernel/syscalls/open/open12.c +++ b/testcases/kernel/syscalls/open/open12.c @@ -51,12 +51,9 @@ int TST_TOTAL = ARRAY_SIZE(test_func); int main(int argc, char **argv) { int lc; - const char *msg; int i; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/openat/openat01.c b/testcases/kernel/syscalls/openat/openat01.c index 57a7369ae..85f9a912e 100644 --- a/testcases/kernel/syscalls/openat/openat01.c +++ b/testcases/kernel/syscalls/openat/openat01.c @@ -97,11 +97,9 @@ static void verify_openat(struct test_case *test) int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/openat/openat02.c b/testcases/kernel/syscalls/openat/openat02.c index f1d8a4a07..580b08636 100644 --- a/testcases/kernel/syscalls/openat/openat02.c +++ b/testcases/kernel/syscalls/openat/openat02.c @@ -85,11 +85,8 @@ int main(int ac, char **av) { int lc; int i; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/pathconf/pathconf01.c b/testcases/kernel/syscalls/pathconf/pathconf01.c index f88c096e3..ddbe87f7a 100644 --- a/testcases/kernel/syscalls/pathconf/pathconf01.c +++ b/testcases/kernel/syscalls/pathconf/pathconf01.c @@ -150,14 +150,8 @@ option_t options[] = { int main(int ac, char **av) { int lc; - const char *msg; - - /*************************************************************** - * parse standard options - ***************************************************************/ - if ((msg = parse_opts(ac, av, options, &help)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, &help); if (!lflag) { path = strdup("/tmp"); diff --git a/testcases/kernel/syscalls/pause/pause01.c b/testcases/kernel/syscalls/pause/pause01.c index 8b37e0802..c967d8ec4 100644 --- a/testcases/kernel/syscalls/pause/pause01.c +++ b/testcases/kernel/syscalls/pause/pause01.c @@ -46,14 +46,12 @@ static void setup(void); int main(int ac, char **av) { int lc; - const char *msg; struct itimerval it = { .it_interval = {.tv_sec = 0, .tv_usec = 0}, .it_value = {.tv_sec = 0, .tv_usec = 1000}, }; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/pause/pause02.c b/testcases/kernel/syscalls/pause/pause02.c index 7b1abbe32..0e862a179 100644 --- a/testcases/kernel/syscalls/pause/pause02.c +++ b/testcases/kernel/syscalls/pause/pause02.c @@ -41,11 +41,9 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; int status; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, ""); diff --git a/testcases/kernel/syscalls/pause/pause03.c b/testcases/kernel/syscalls/pause/pause03.c index 31d92dad8..f3565e358 100644 --- a/testcases/kernel/syscalls/pause/pause03.c +++ b/testcases/kernel/syscalls/pause/pause03.c @@ -41,11 +41,9 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; int status; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, ""); #endif diff --git a/testcases/kernel/syscalls/perf_event_open/perf_event_open01.c b/testcases/kernel/syscalls/perf_event_open/perf_event_open01.c index e4027ed2d..9c87e656f 100644 --- a/testcases/kernel/syscalls/perf_event_open/perf_event_open01.c +++ b/testcases/kernel/syscalls/perf_event_open/perf_event_open01.c @@ -81,11 +81,8 @@ static struct perf_event_attr pe; int main(int ac, char **av) { int i, lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/perf_event_open/perf_event_open02.c b/testcases/kernel/syscalls/perf_event_open/perf_event_open02.c index 40e13e8bd..5dc205b89 100644 --- a/testcases/kernel/syscalls/perf_event_open/perf_event_open02.c +++ b/testcases/kernel/syscalls/perf_event_open/perf_event_open02.c @@ -100,11 +100,8 @@ static int hwfd[MAX_CTRS], tskfd[MAX_CTRS]; int main(int ac, char **av) { int lc; - const char *msg; - msg = parse_opts(ac, av, options, help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, options, help); setup(); diff --git a/testcases/kernel/syscalls/personality/personality01.c b/testcases/kernel/syscalls/personality/personality01.c index 670df7faa..9e92eba82 100644 --- a/testcases/kernel/syscalls/personality/personality01.c +++ b/testcases/kernel/syscalls/personality/personality01.c @@ -76,11 +76,9 @@ int pers[] = { PER_LINUX, PER_LINUX_32BIT, PER_SVR4, PER_SVR3, PER_SCOSVR3, int main(int ac, char **av) { int lc; - const char *msg; int i, start_pers; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/personality/personality02.c b/testcases/kernel/syscalls/personality/personality02.c index 708e12d33..83698b0b7 100644 --- a/testcases/kernel/syscalls/personality/personality02.c +++ b/testcases/kernel/syscalls/personality/personality02.c @@ -81,11 +81,9 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; int start_pers; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/pipe/pipe01.c b/testcases/kernel/syscalls/pipe/pipe01.c index 26c644b1f..d4eb08e30 100644 --- a/testcases/kernel/syscalls/pipe/pipe01.c +++ b/testcases/kernel/syscalls/pipe/pipe01.c @@ -68,15 +68,13 @@ ssize_t safe_read(int fd, void *buf, size_t count) int main(int ac, char **av) { int lc; - const char *msg; int fildes[2]; /* fds for pipe read and write */ char wrbuf[BUFSIZ], rebuf[BUFSIZ]; int red, written; /* no. of chars read/written to pipe */ int greater, length; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/pipe/pipe02.c b/testcases/kernel/syscalls/pipe/pipe02.c index e2582f2bc..317634a31 100644 --- a/testcases/kernel/syscalls/pipe/pipe02.c +++ b/testcases/kernel/syscalls/pipe/pipe02.c @@ -80,16 +80,13 @@ int pp[2]; /* pipe descriptor */ int main(int ac, char **av) { int lc; - const char *msg; char rbuf[BUFSIZ], wbuf[BUFSIZ]; int pid, ret, len, rlen, status; int sig = 0; usrsig = 0; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, "dd", &pp[0], &pp[1]); #endif diff --git a/testcases/kernel/syscalls/pipe/pipe03.c b/testcases/kernel/syscalls/pipe/pipe03.c index 73bcdaaed..e95e37633 100644 --- a/testcases/kernel/syscalls/pipe/pipe03.c +++ b/testcases/kernel/syscalls/pipe/pipe03.c @@ -66,13 +66,11 @@ ssize_t safe_read(int fd, void *buf, size_t count) int main(int ac, char **av) { int lc; - const char *msg; int fildes[2]; /* fds for pipe read and write */ char rbuf[BUFSIZ]; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/pipe/pipe04.c b/testcases/kernel/syscalls/pipe/pipe04.c index 13cdabb53..66eda4991 100644 --- a/testcases/kernel/syscalls/pipe/pipe04.c +++ b/testcases/kernel/syscalls/pipe/pipe04.c @@ -75,7 +75,6 @@ ssize_t safe_read(int fd, void *buf, size_t count) int main(int ac, char **av) { int lc; - const char *msg; pid_t c1pid, c2pid; int wtstatus; int bytesread; @@ -83,8 +82,7 @@ int main(int ac, char **av) char rbuf[BUFSIZ]; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&c1func, "ndd", 1, &fildes[0], &fildes[1]); maybe_run_child(&c2func, "ndd", 2, &fildes[0], &fildes[1]); diff --git a/testcases/kernel/syscalls/pipe/pipe05.c b/testcases/kernel/syscalls/pipe/pipe05.c index e5fdf6765..fe5ec37e4 100644 --- a/testcases/kernel/syscalls/pipe/pipe05.c +++ b/testcases/kernel/syscalls/pipe/pipe05.c @@ -60,11 +60,9 @@ void sig11_handler(int sig); int main(int ac, char **av) { int lc; - const char *msg; struct sigaction sa, osa; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/pipe/pipe06.c b/testcases/kernel/syscalls/pipe/pipe06.c index a7f0b70df..d83765632 100644 --- a/testcases/kernel/syscalls/pipe/pipe06.c +++ b/testcases/kernel/syscalls/pipe/pipe06.c @@ -57,10 +57,8 @@ void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/pipe/pipe07.c b/testcases/kernel/syscalls/pipe/pipe07.c index bf2a7adc8..b09df714f 100644 --- a/testcases/kernel/syscalls/pipe/pipe07.c +++ b/testcases/kernel/syscalls/pipe/pipe07.c @@ -55,13 +55,11 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; int min, ret; int npipes; int pipes[2], max_fd = 0; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/pipe/pipe08.c b/testcases/kernel/syscalls/pipe/pipe08.c index 451986055..cdb2a4da3 100644 --- a/testcases/kernel/syscalls/pipe/pipe08.c +++ b/testcases/kernel/syscalls/pipe/pipe08.c @@ -63,15 +63,13 @@ void sighandler(int); int main(int ac, char **av) { int lc; - const char *msg; int pipefd[2]; /* fds for pipe read/write */ char wrbuf[BUFSIZ]; int written, length; int close_stat; /* exit status of close(read fd) */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/pipe/pipe09.c b/testcases/kernel/syscalls/pipe/pipe09.c index 006d02954..db5adcd84 100644 --- a/testcases/kernel/syscalls/pipe/pipe09.c +++ b/testcases/kernel/syscalls/pipe/pipe09.c @@ -74,7 +74,6 @@ ssize_t safe_read(int fd, void *buf, size_t count) int main(int ac, char **av) { int lc; - const char *msg; int i, red, wtstatus; int pipefd[2]; /* fds for pipe read/write */ @@ -82,8 +81,7 @@ int main(int ac, char **av) int Acnt = 0, Bcnt = 0; /* count 'A' and 'B' */ int fork_1, fork_2; /* ret values in parent */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/pipe/pipe10.c b/testcases/kernel/syscalls/pipe/pipe10.c index dd4849513..542cde0b8 100644 --- a/testcases/kernel/syscalls/pipe/pipe10.c +++ b/testcases/kernel/syscalls/pipe/pipe10.c @@ -69,7 +69,6 @@ ssize_t safe_read(int fd, void *buf, size_t count) int main(int ac, char **av) { int lc; - const char *msg; int fd[2]; /* fds for pipe read/write */ char wrbuf[BUFSIZ], rebuf[BUFSIZ]; @@ -78,8 +77,7 @@ int main(int ac, char **av) int length, greater, forkstat; int retval = 0, status, e_code; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/pipe/pipe11.c b/testcases/kernel/syscalls/pipe/pipe11.c index 32d882f4a..5acda2274 100644 --- a/testcases/kernel/syscalls/pipe/pipe11.c +++ b/testcases/kernel/syscalls/pipe/pipe11.c @@ -87,15 +87,12 @@ ssize_t safe_read(int fd, void *buf, size_t count) int main(int ac, char **av) { int lc; - const char *msg; int i; int fork_ret, status; int written; /* no of chars read and written */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child_uclinux, "ddddd", &fd[0], &fd[1], &kidid, &ncperchild, &szcharbuf); diff --git a/testcases/kernel/syscalls/pipe2/pipe2_01.c b/testcases/kernel/syscalls/pipe2/pipe2_01.c index c501ff8d0..38d257f07 100644 --- a/testcases/kernel/syscalls/pipe2/pipe2_01.c +++ b/testcases/kernel/syscalls/pipe2/pipe2_01.c @@ -130,12 +130,8 @@ int main(int argc, char *argv[]) { int fd[2], i, coe; int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); if ((tst_kvercmp(2, 6, 27)) < 0) { tst_brkm(TCONF, NULL, diff --git a/testcases/kernel/syscalls/pipe2/pipe2_02.c b/testcases/kernel/syscalls/pipe2/pipe2_02.c index 87bc1aebb..e130f4038 100644 --- a/testcases/kernel/syscalls/pipe2/pipe2_02.c +++ b/testcases/kernel/syscalls/pipe2/pipe2_02.c @@ -121,12 +121,8 @@ int main(int argc, char *argv[]) { int fds[2], fl, i; int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); if ((tst_kvercmp(2, 6, 27)) < 0) { tst_brkm(TCONF, NULL, diff --git a/testcases/kernel/syscalls/poll/poll01.c b/testcases/kernel/syscalls/poll/poll01.c index a442a2714..c641f5224 100644 --- a/testcases/kernel/syscalls/poll/poll01.c +++ b/testcases/kernel/syscalls/poll/poll01.c @@ -95,10 +95,8 @@ end: int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/poll/poll02.c b/testcases/kernel/syscalls/poll/poll02.c index eefed0052..98e7e2a4a 100644 --- a/testcases/kernel/syscalls/poll/poll02.c +++ b/testcases/kernel/syscalls/poll/poll02.c @@ -43,14 +43,12 @@ static void help(void); int main(int ac, char **av) { int lc, treshold; - const char *msg; long long elapsed_ms, sleep_ms = 100; struct pollfd fds[] = { {.fd = 1, .events = POLLIN} }; - if ((msg = parse_opts(ac, av, opts, help)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, opts, help); if (opt_sleep_ms) { sleep_ms = atoll(opt_sleep_ms); diff --git a/testcases/kernel/syscalls/prctl/prctl01.c b/testcases/kernel/syscalls/prctl/prctl01.c index ccd1c6cd6..1857dfbb2 100644 --- a/testcases/kernel/syscalls/prctl/prctl01.c +++ b/testcases/kernel/syscalls/prctl/prctl01.c @@ -92,12 +92,10 @@ int main(int ac, char **av) { int lc, i; - const char *msg; pid_t child_pid; int status, sig; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/prctl/prctl02.c b/testcases/kernel/syscalls/prctl/prctl02.c index e9d8c8b1f..67e3b6f82 100644 --- a/testcases/kernel/syscalls/prctl/prctl02.c +++ b/testcases/kernel/syscalls/prctl/prctl02.c @@ -106,12 +106,10 @@ int main(int ac, char **av) { int lc, i; - const char *msg; pid_t child_pid; int status; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/pread/pread01.c b/testcases/kernel/syscalls/pread/pread01.c index cde97f7bc..94c9d9461 100644 --- a/testcases/kernel/syscalls/pread/pread01.c +++ b/testcases/kernel/syscalls/pread/pread01.c @@ -100,11 +100,9 @@ void compare_bufers(); /* function to compare o/p of pread/pwrite */ int main(int ac, char **av) { int lc; - const char *msg; int nread; /* no. of bytes read by pread() */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/pread/pread02.c b/testcases/kernel/syscalls/pread/pread02.c index b0431f951..b9739775e 100644 --- a/testcases/kernel/syscalls/pread/pread02.c +++ b/testcases/kernel/syscalls/pread/pread02.c @@ -109,15 +109,13 @@ struct test_case_t { /* test case struct. to hold ref. test cond's */ int main(int ac, char **av) { int lc; - const char *msg; int i; int fildes; /* file descriptor of test file */ size_t nbytes; /* no. of bytes to be written */ off_t offset; /* offset position in the specified file */ char *test_desc; /* test specific error message */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/pread/pread03.c b/testcases/kernel/syscalls/pread/pread03.c index 21916c80b..f56b22f0f 100644 --- a/testcases/kernel/syscalls/pread/pread03.c +++ b/testcases/kernel/syscalls/pread/pread03.c @@ -98,13 +98,11 @@ void init_buffers(); /* function to initialize/allocate buffers */ int main(int ac, char **av) { int lc; - const char *msg; size_t nbytes; /* no. of bytes to be written */ off_t offset; /* offset position in the specified file */ char *test_desc; /* test specific error message */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/profil/profil01.c b/testcases/kernel/syscalls/profil/profil01.c index 37106fca4..2fc47aaf5 100644 --- a/testcases/kernel/syscalls/profil/profil01.c +++ b/testcases/kernel/syscalls/profil/profil01.c @@ -116,11 +116,8 @@ static void test_profil(void) int main(int ac, char *av[]) { int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); for (lc = 0; TEST_LOOPING(lc); lc++) test_profil(); diff --git a/testcases/kernel/syscalls/pselect/pselect01.c b/testcases/kernel/syscalls/pselect/pselect01.c index c16834a57..21f02db06 100644 --- a/testcases/kernel/syscalls/pselect/pselect01.c +++ b/testcases/kernel/syscalls/pselect/pselect01.c @@ -129,12 +129,9 @@ static void pselect_verify(void) int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/pselect/pselect02.c b/testcases/kernel/syscalls/pselect/pselect02.c index f6c444d78..d31621d5a 100644 --- a/testcases/kernel/syscalls/pselect/pselect02.c +++ b/testcases/kernel/syscalls/pselect/pselect02.c @@ -56,12 +56,9 @@ static void pselect_verify(const struct test_case_t *); int main(int argc, char **argv) { - const char *msg; int lc, i; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ptrace/ptrace01.c b/testcases/kernel/syscalls/ptrace/ptrace01.c index 94f591999..5a7ed5ffd 100644 --- a/testcases/kernel/syscalls/ptrace/ptrace01.c +++ b/testcases/kernel/syscalls/ptrace/ptrace01.c @@ -113,13 +113,11 @@ int main(int ac, char **av) { int lc; - const char *msg; pid_t child_pid; int status; struct sigaction parent_act; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, "d", &i); #endif diff --git a/testcases/kernel/syscalls/ptrace/ptrace02.c b/testcases/kernel/syscalls/ptrace/ptrace02.c index 1dbfcf050..057591f62 100644 --- a/testcases/kernel/syscalls/ptrace/ptrace02.c +++ b/testcases/kernel/syscalls/ptrace/ptrace02.c @@ -113,13 +113,11 @@ int main(int ac, char **av) { int lc; - const char *msg; pid_t child_pid; int status; struct sigaction parent_act; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, "d", &i); #endif diff --git a/testcases/kernel/syscalls/ptrace/ptrace03.c b/testcases/kernel/syscalls/ptrace/ptrace03.c index c4375aca9..a4028fc26 100644 --- a/testcases/kernel/syscalls/ptrace/ptrace03.c +++ b/testcases/kernel/syscalls/ptrace/ptrace03.c @@ -117,12 +117,10 @@ int main(int ac, char **av) { int lc, i; - const char *msg; pid_t child_pid; int status; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ptrace/ptrace04.c b/testcases/kernel/syscalls/ptrace/ptrace04.c index b29e3da4e..b2707c072 100644 --- a/testcases/kernel/syscalls/ptrace/ptrace04.c +++ b/testcases/kernel/syscalls/ptrace/ptrace04.c @@ -99,13 +99,10 @@ void compare_registers(unsigned char poison) int main(int argc, char *argv[]) { - const char *msg; - if (ARRAY_SIZE(regs) == 0) tst_brkm(TCONF, NULL, "test not supported for your arch (yet)"); - if ((msg = parse_opts(argc, argv, NULL, NULL))) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); make_a_baby(argc, argv); diff --git a/testcases/kernel/syscalls/ptrace/ptrace06.c b/testcases/kernel/syscalls/ptrace/ptrace06.c index 8f2b9ceba..ba92ed11f 100644 --- a/testcases/kernel/syscalls/ptrace/ptrace06.c +++ b/testcases/kernel/syscalls/ptrace/ptrace06.c @@ -166,10 +166,8 @@ int main(int argc, char *argv[]) size_t i; long ret; int saved_errno; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL))) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); make_a_baby(argc, argv); diff --git a/testcases/kernel/syscalls/pwrite/pwrite01.c b/testcases/kernel/syscalls/pwrite/pwrite01.c index 9e1b49ad6..2d00fb11b 100644 --- a/testcases/kernel/syscalls/pwrite/pwrite01.c +++ b/testcases/kernel/syscalls/pwrite/pwrite01.c @@ -101,11 +101,9 @@ void check_file_contents(); /* function to verify the contents of file */ int main(int ac, char **av) { int lc; - const char *msg; int nwrite; /* no. of bytes written by pwrite() */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/pwrite/pwrite02.c b/testcases/kernel/syscalls/pwrite/pwrite02.c index 865042ab7..d4592fb1d 100644 --- a/testcases/kernel/syscalls/pwrite/pwrite02.c +++ b/testcases/kernel/syscalls/pwrite/pwrite02.c @@ -71,10 +71,8 @@ int TST_TOTAL = ARRAY_SIZE(testfunc); int main(int ac, char **av) { int i, lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/pwrite/pwrite04.c b/testcases/kernel/syscalls/pwrite/pwrite04.c index 300ba5812..b297682da 100644 --- a/testcases/kernel/syscalls/pwrite/pwrite04.c +++ b/testcases/kernel/syscalls/pwrite/pwrite04.c @@ -70,18 +70,12 @@ int main(int ac, char *av[]) char *wbuf[NBUFS]; struct stat statbuf; int lc; - const char *msg; strcpy(name, DATA_FILE); sprintf(fname, "%s.%d", name, getpid()); - /* - * parse standard options - */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_resm(TBROK, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); - } tst_tmpdir(); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/syscalls/quotactl/quotactl01.c b/testcases/kernel/syscalls/quotactl/quotactl01.c index 3f6564faf..de49d8430 100644 --- a/testcases/kernel/syscalls/quotactl/quotactl01.c +++ b/testcases/kernel/syscalls/quotactl/quotactl01.c @@ -215,11 +215,8 @@ int main(int ac, char **av) int ret; int i; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, (option_t *) opts, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, (option_t *) opts, NULL); setup(); diff --git a/testcases/kernel/syscalls/quotactl/quotactl02.c b/testcases/kernel/syscalls/quotactl/quotactl02.c index 18aecac7c..01ed7f6a1 100644 --- a/testcases/kernel/syscalls/quotactl/quotactl02.c +++ b/testcases/kernel/syscalls/quotactl/quotactl02.c @@ -84,11 +84,8 @@ static struct test_case_t { int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/read/read01.c b/testcases/kernel/syscalls/read/read01.c index a6b07a5e2..839819ad9 100644 --- a/testcases/kernel/syscalls/read/read01.c +++ b/testcases/kernel/syscalls/read/read01.c @@ -140,13 +140,11 @@ char *s; int main(int ac, char **av) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/read/read02.c b/testcases/kernel/syscalls/read/read02.c index 63ae3ab80..650e2cdb3 100644 --- a/testcases/kernel/syscalls/read/read02.c +++ b/testcases/kernel/syscalls/read/read02.c @@ -85,11 +85,8 @@ int main(int ac, char **av) { int i; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/read/read03.c b/testcases/kernel/syscalls/read/read03.c index dd01944a0..e8b3bbd60 100644 --- a/testcases/kernel/syscalls/read/read03.c +++ b/testcases/kernel/syscalls/read/read03.c @@ -64,13 +64,10 @@ void cleanup(); int main(int ac, char **av) { int lc; - const char *msg; int c; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/read/read04.c b/testcases/kernel/syscalls/read/read04.c index 9a2fdd2fb..aa9a7bf89 100644 --- a/testcases/kernel/syscalls/read/read04.c +++ b/testcases/kernel/syscalls/read/read04.c @@ -66,7 +66,6 @@ int fild; int main(int ac, char **av) { int lc; - const char *msg; int rfild; char prbuf[BUFSIZ]; @@ -74,9 +73,7 @@ int main(int ac, char **av) /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup for test */ diff --git a/testcases/kernel/syscalls/readahead/readahead01.c b/testcases/kernel/syscalls/readahead/readahead01.c index 8a8f83d73..a8b0a5a4c 100644 --- a/testcases/kernel/syscalls/readahead/readahead01.c +++ b/testcases/kernel/syscalls/readahead/readahead01.c @@ -128,12 +128,9 @@ static void test_invalid_fd(void) int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, options, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, NULL); setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/syscalls/readahead/readahead02.c b/testcases/kernel/syscalls/readahead/readahead02.c index f1571c43e..2b9010bb3 100644 --- a/testcases/kernel/syscalls/readahead/readahead02.c +++ b/testcases/kernel/syscalls/readahead/readahead02.c @@ -330,12 +330,9 @@ static void test_readahead(void) int main(int argc, char *argv[]) { - const char *msg; int lc; - msg = parse_opts(argc, argv, options, help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, help); if (opt_fsize) testfile_size = atoi(opt_fsizestr); diff --git a/testcases/kernel/syscalls/readdir/readdir01.c b/testcases/kernel/syscalls/readdir/readdir01.c index 7bce1d380..15b1b2779 100644 --- a/testcases/kernel/syscalls/readdir/readdir01.c +++ b/testcases/kernel/syscalls/readdir/readdir01.c @@ -134,17 +134,9 @@ char Basename[255]; char Fname[255]; int Nfiles = 0; -/* To add command line options you need to declare a structure to pass to - * parse_opts(). options is the structure used in this example. The format is - * the string that should be added to optstring in getopt(3), an integer that - * will be used as a flag if the option is given, and a pointer to a string that - * should receive the optarg parameter from getopt(3). Here we add a -N - * option. Long options are not supported at this time. - */ char *Nfilearg; int Nflag = 0; -/* for test specific parse_opts options */ option_t options[] = { {"N:", &Nflag, &Nfilearg}, /* -N #files */ {NULL, NULL, NULL} @@ -156,23 +148,13 @@ option_t options[] = { int main(int ac, char **av) { int lc; - const char *msg; int cnt; int nfiles, fd; char fname[255]; DIR *test_dir; struct dirent *dptr; - /*************************************************************** - * parse standard options - ***************************************************************/ - /* start off by parsing the command line options. We provide a function - * that understands many common options to control looping. If you are not - * adding any new options, pass NULL in place of options and &help. - */ - if ((msg = parse_opts(ac, av, options, &help)) != 0) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, options, &help); if (Nflag) { if (sscanf(Nfilearg, "%i", &Nfiles) != 1) { diff --git a/testcases/kernel/syscalls/readdir/readdir02.c b/testcases/kernel/syscalls/readdir/readdir02.c index a4cba9c21..3f3151f6a 100644 --- a/testcases/kernel/syscalls/readdir/readdir02.c +++ b/testcases/kernel/syscalls/readdir/readdir02.c @@ -63,12 +63,10 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; DIR *test_dir; struct dirent *dptr; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/readdir/readdir21.c b/testcases/kernel/syscalls/readdir/readdir21.c index 0d42fa85d..ced8fa76d 100644 --- a/testcases/kernel/syscalls/readdir/readdir21.c +++ b/testcases/kernel/syscalls/readdir/readdir21.c @@ -79,11 +79,8 @@ static void readdir_verify(const struct test_case_t *); int main(int argc, char **argv) { int i, lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/readlink/readlink01.c b/testcases/kernel/syscalls/readlink/readlink01.c index 468f7cf11..cc27bb5b2 100644 --- a/testcases/kernel/syscalls/readlink/readlink01.c +++ b/testcases/kernel/syscalls/readlink/readlink01.c @@ -93,10 +93,8 @@ int main(int ac, char **av) { char buffer[MAX_SIZE]; /* temporary buffer to hold symlink contents */ int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/readlink/readlink02.c b/testcases/kernel/syscalls/readlink/readlink02.c index 1db4df74e..c73fc67bc 100644 --- a/testcases/kernel/syscalls/readlink/readlink02.c +++ b/testcases/kernel/syscalls/readlink/readlink02.c @@ -128,13 +128,11 @@ int fd; int main(int ac, char **av) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/readlink/readlink03.c b/testcases/kernel/syscalls/readlink/readlink03.c index ed4f240f1..24ed07872 100644 --- a/testcases/kernel/syscalls/readlink/readlink03.c +++ b/testcases/kernel/syscalls/readlink/readlink03.c @@ -96,11 +96,8 @@ int TST_TOTAL = ARRAY_SIZE(test_cases); int main(int ac, char **av) { int i, lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/readlink/readlink04.c b/testcases/kernel/syscalls/readlink/readlink04.c index 71e760c88..52dbd710a 100644 --- a/testcases/kernel/syscalls/readlink/readlink04.c +++ b/testcases/kernel/syscalls/readlink/readlink04.c @@ -57,10 +57,8 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/readlinkat/readlinkat01.c b/testcases/kernel/syscalls/readlinkat/readlinkat01.c index 9a7c3ae43..97a49e803 100644 --- a/testcases/kernel/syscalls/readlinkat/readlinkat01.c +++ b/testcases/kernel/syscalls/readlinkat/readlinkat01.c @@ -102,11 +102,9 @@ static void verify_readlinkat(struct test_case *test) int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/readlinkat/readlinkat02.c b/testcases/kernel/syscalls/readlinkat/readlinkat02.c index 68e1239c2..10b8d5b3e 100644 --- a/testcases/kernel/syscalls/readlinkat/readlinkat02.c +++ b/testcases/kernel/syscalls/readlinkat/readlinkat02.c @@ -64,11 +64,8 @@ static void readlinkat_verify(const struct test_case_t *); int main(int argc, char **argv) { int i, lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/readv/readv01.c b/testcases/kernel/syscalls/readv/readv01.c index bbf29135c..d540a2e8b 100644 --- a/testcases/kernel/syscalls/readv/readv01.c +++ b/testcases/kernel/syscalls/readv/readv01.c @@ -57,11 +57,9 @@ static void cleanup(void); int main(int ac, char **av) { int lc, i, fail; - const char *msg; char *vec; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/readv/readv02.c b/testcases/kernel/syscalls/readv/readv02.c index 50459ffac..b5f826c62 100644 --- a/testcases/kernel/syscalls/readv/readv02.c +++ b/testcases/kernel/syscalls/readv/readv02.c @@ -101,11 +101,8 @@ void cleanup(); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/readv/readv03.c b/testcases/kernel/syscalls/readv/readv03.c index ca0e0e155..79aebe0a7 100644 --- a/testcases/kernel/syscalls/readv/readv03.c +++ b/testcases/kernel/syscalls/readv/readv03.c @@ -78,11 +78,8 @@ void cleanup(); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/reboot/reboot01.c b/testcases/kernel/syscalls/reboot/reboot01.c index 1b75e34f6..13b9e1992 100644 --- a/testcases/kernel/syscalls/reboot/reboot01.c +++ b/testcases/kernel/syscalls/reboot/reboot01.c @@ -91,10 +91,8 @@ int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/reboot/reboot02.c b/testcases/kernel/syscalls/reboot/reboot02.c index 43e6f7fe7..cbe0b1559 100644 --- a/testcases/kernel/syscalls/reboot/reboot02.c +++ b/testcases/kernel/syscalls/reboot/reboot02.c @@ -104,10 +104,8 @@ int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/recv/recv01.c b/testcases/kernel/syscalls/recv/recv01.c index 34e7bbbd0..9c21dc206 100644 --- a/testcases/kernel/syscalls/recv/recv01.c +++ b/testcases/kernel/syscalls/recv/recv01.c @@ -111,10 +111,8 @@ static char *argv0; int main(int argc, char *argv[]) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX argv0 = argv[0]; maybe_run_child(&do_child, "d", &sfd); diff --git a/testcases/kernel/syscalls/recvfrom/recvfrom01.c b/testcases/kernel/syscalls/recvfrom/recvfrom01.c index c74eeec36..3bcf2a1fc 100644 --- a/testcases/kernel/syscalls/recvfrom/recvfrom01.c +++ b/testcases/kernel/syscalls/recvfrom/recvfrom01.c @@ -132,10 +132,8 @@ static char *argv0; int main(int argc, char *argv[]) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX argv0 = argv[0]; diff --git a/testcases/kernel/syscalls/recvmsg/recvmsg01.c b/testcases/kernel/syscalls/recvmsg/recvmsg01.c index 647966092..13bd58f4b 100644 --- a/testcases/kernel/syscalls/recvmsg/recvmsg01.c +++ b/testcases/kernel/syscalls/recvmsg/recvmsg01.c @@ -188,10 +188,8 @@ static char *argv0; int main(int argc, char *argv[]) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX argv0 = argv[0]; maybe_run_child(&do_child, "dd", &sfd, &ufd); diff --git a/testcases/kernel/syscalls/remap_file_pages/remap_file_pages01.c b/testcases/kernel/syscalls/remap_file_pages/remap_file_pages01.c index 7fad17ab3..86496c1d1 100644 --- a/testcases/kernel/syscalls/remap_file_pages/remap_file_pages01.c +++ b/testcases/kernel/syscalls/remap_file_pages/remap_file_pages01.c @@ -112,7 +112,6 @@ char fname[255]; int main(int ac, char **av) { int lc; - const char *msg; #if defined (__s390__) || (__s390x__) || (__ia64__) /* Disables the test in case the kernel version is lower than 2.6.12 and arch is s390 */ @@ -123,9 +122,7 @@ int main(int ac, char **av) } #endif - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/remap_file_pages/remap_file_pages02.c b/testcases/kernel/syscalls/remap_file_pages/remap_file_pages02.c index 6064d6c43..ddd537e1e 100644 --- a/testcases/kernel/syscalls/remap_file_pages/remap_file_pages02.c +++ b/testcases/kernel/syscalls/remap_file_pages/remap_file_pages02.c @@ -131,7 +131,6 @@ static struct test_case_t { int main(int ac, char **av) { int lc, i; - const char *msg; #if defined (__s390__) || (__s390x__) || (__ia64__) /* Disables the test in case the kernel version is lower than 2.6.12 and arch is s390 */ @@ -142,8 +141,7 @@ int main(int ac, char **av) } #endif - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/rename/rename01.c b/testcases/kernel/syscalls/rename/rename01.c index f819d6cbe..a1e3f9649 100644 --- a/testcases/kernel/syscalls/rename/rename01.c +++ b/testcases/kernel/syscalls/rename/rename01.c @@ -103,14 +103,12 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; int i; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* * perform global setup for test diff --git a/testcases/kernel/syscalls/rename/rename02.c b/testcases/kernel/syscalls/rename/rename02.c index a24e35b57..304d530d3 100644 --- a/testcases/kernel/syscalls/rename/rename02.c +++ b/testcases/kernel/syscalls/rename/rename02.c @@ -128,10 +128,8 @@ char fname[255], mname[255]; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/rename/rename03.c b/testcases/kernel/syscalls/rename/rename03.c index 733f21eb0..9040deb19 100644 --- a/testcases/kernel/syscalls/rename/rename03.c +++ b/testcases/kernel/syscalls/rename/rename03.c @@ -98,14 +98,12 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; int i; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* * perform global setup for test */ diff --git a/testcases/kernel/syscalls/rename/rename04.c b/testcases/kernel/syscalls/rename/rename04.c index 67fe0df23..f3d6066ad 100644 --- a/testcases/kernel/syscalls/rename/rename04.c +++ b/testcases/kernel/syscalls/rename/rename04.c @@ -81,13 +81,11 @@ ino_t oldino, oldino1; int main(int ac, char **av) { int lc; - const char *msg; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* * perform global setup for test diff --git a/testcases/kernel/syscalls/rename/rename05.c b/testcases/kernel/syscalls/rename/rename05.c index 7056b00e4..6302ae5df 100644 --- a/testcases/kernel/syscalls/rename/rename05.c +++ b/testcases/kernel/syscalls/rename/rename05.c @@ -78,13 +78,11 @@ ino_t oldino, oldino1; int main(int ac, char **av) { int lc; - const char *msg; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* * perform global setup for test diff --git a/testcases/kernel/syscalls/rename/rename06.c b/testcases/kernel/syscalls/rename/rename06.c index 4cda21783..941782cba 100644 --- a/testcases/kernel/syscalls/rename/rename06.c +++ b/testcases/kernel/syscalls/rename/rename06.c @@ -80,13 +80,11 @@ ino_t oldino, oldino1; int main(int ac, char **av) { int lc; - const char *msg; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* * perform global setup for test diff --git a/testcases/kernel/syscalls/rename/rename07.c b/testcases/kernel/syscalls/rename/rename07.c index 5cd8243f2..6494967fd 100644 --- a/testcases/kernel/syscalls/rename/rename07.c +++ b/testcases/kernel/syscalls/rename/rename07.c @@ -61,13 +61,11 @@ ino_t oldino, oldino1; int main(int ac, char **av) { int lc; - const char *msg; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* * perform global setup for test diff --git a/testcases/kernel/syscalls/rename/rename08.c b/testcases/kernel/syscalls/rename/rename08.c index b117934e5..de2c03552 100644 --- a/testcases/kernel/syscalls/rename/rename08.c +++ b/testcases/kernel/syscalls/rename/rename08.c @@ -105,14 +105,12 @@ int TST_TOTAL = ARRAY_SIZE(TC); int main(int ac, char **av) { int lc; - const char *msg; int i; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/rename/rename09.c b/testcases/kernel/syscalls/rename/rename09.c index 05d89d2e0..942b9b41e 100644 --- a/testcases/kernel/syscalls/rename/rename09.c +++ b/testcases/kernel/syscalls/rename/rename09.c @@ -96,7 +96,6 @@ uid_t nobody_uid, bin_uid; int main(int ac, char **av) { int lc; - const char *msg; int rval; pid_t pid, pid1; int status; @@ -104,8 +103,7 @@ int main(int ac, char **av) /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* * perform global setup for test diff --git a/testcases/kernel/syscalls/rename/rename10.c b/testcases/kernel/syscalls/rename/rename10.c index d3d125f99..4b656b07b 100644 --- a/testcases/kernel/syscalls/rename/rename10.c +++ b/testcases/kernel/syscalls/rename/rename10.c @@ -95,14 +95,12 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; int i; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* * perform global setup for test diff --git a/testcases/kernel/syscalls/rename/rename11.c b/testcases/kernel/syscalls/rename/rename11.c index 5806ab36c..4459ef536 100644 --- a/testcases/kernel/syscalls/rename/rename11.c +++ b/testcases/kernel/syscalls/rename/rename11.c @@ -70,11 +70,8 @@ int TST_TOTAL = ARRAY_SIZE(testfunc); int main(int ac, char **av) { int lc, i; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/rename/rename12.c b/testcases/kernel/syscalls/rename/rename12.c index 1e080e4a5..d42c138d1 100644 --- a/testcases/kernel/syscalls/rename/rename12.c +++ b/testcases/kernel/syscalls/rename/rename12.c @@ -92,15 +92,13 @@ struct stat buf1; int main(int ac, char **av) { int lc; - const char *msg; pid_t pid; int status; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* * perform global setup for test diff --git a/testcases/kernel/syscalls/rename/rename13.c b/testcases/kernel/syscalls/rename/rename13.c index d51599d98..7a791f0d4 100644 --- a/testcases/kernel/syscalls/rename/rename13.c +++ b/testcases/kernel/syscalls/rename/rename13.c @@ -81,13 +81,11 @@ ino_t oldino; int main(int ac, char **av) { int lc; - const char *msg; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* * perform global setup for test diff --git a/testcases/kernel/syscalls/rename/rename14.c b/testcases/kernel/syscalls/rename/rename14.c index 90231d405..0d821baa8 100644 --- a/testcases/kernel/syscalls/rename/rename14.c +++ b/testcases/kernel/syscalls/rename/rename14.c @@ -71,10 +71,8 @@ int main(int argc, char *argv[]) void dochild2(); #ifdef UCLINUX - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); maybe_run_child(&dochild1, "n", 1); maybe_run_child(&dochild2, "n", 2); diff --git a/testcases/kernel/syscalls/renameat/renameat01.c b/testcases/kernel/syscalls/renameat/renameat01.c index ea84e8aa3..0d008eef5 100644 --- a/testcases/kernel/syscalls/renameat/renameat01.c +++ b/testcases/kernel/syscalls/renameat/renameat01.c @@ -113,11 +113,8 @@ int TST_TOTAL = ARRAY_SIZE(test_cases); int main(int ac, char **av) { int i, lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/rmdir/rmdir01.c b/testcases/kernel/syscalls/rmdir/rmdir01.c index 6d1bd21b7..f7e176a6e 100644 --- a/testcases/kernel/syscalls/rmdir/rmdir01.c +++ b/testcases/kernel/syscalls/rmdir/rmdir01.c @@ -77,15 +77,12 @@ char tstdir[100]; int main(int ac, char **av) { int lc; - const char *msg; struct stat buf; /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); /* * perform global setup for test diff --git a/testcases/kernel/syscalls/rmdir/rmdir02.c b/testcases/kernel/syscalls/rmdir/rmdir02.c index 95827021c..889d18144 100644 --- a/testcases/kernel/syscalls/rmdir/rmdir02.c +++ b/testcases/kernel/syscalls/rmdir/rmdir02.c @@ -102,11 +102,8 @@ int TST_TOTAL = ARRAY_SIZE(test_cases); int main(int ac, char **av) { int i, lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/rmdir/rmdir03.c b/testcases/kernel/syscalls/rmdir/rmdir03.c index daa937d43..cca9690c8 100644 --- a/testcases/kernel/syscalls/rmdir/rmdir03.c +++ b/testcases/kernel/syscalls/rmdir/rmdir03.c @@ -95,7 +95,6 @@ char tstdir4[255]; int main(int ac, char **av) { int lc; - const char *msg; pid_t pid; struct stat buf1; int e_code, status, status2; @@ -103,9 +102,7 @@ int main(int ac, char **av) /* * parse standard options */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&dochild1, "ns", 1, tstdir2); maybe_run_child(&dochild2, "ns", 2, tstdir4); diff --git a/testcases/kernel/syscalls/rmdir/rmdir04.c b/testcases/kernel/syscalls/rmdir/rmdir04.c index 4959a2710..1b32dafba 100644 --- a/testcases/kernel/syscalls/rmdir/rmdir04.c +++ b/testcases/kernel/syscalls/rmdir/rmdir04.c @@ -131,13 +131,11 @@ char fname[255]; int main(int ac, char **av) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/rmdir/rmdir05.c b/testcases/kernel/syscalls/rmdir/rmdir05.c index af6dab325..10037c72e 100644 --- a/testcases/kernel/syscalls/rmdir/rmdir05.c +++ b/testcases/kernel/syscalls/rmdir/rmdir05.c @@ -66,10 +66,8 @@ static char *bad_addr = NULL; int main(int argc, char **argv) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c index 4cee988b1..9ca914f15 100644 --- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c +++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction01.c @@ -85,11 +85,8 @@ int main(int ac, char **av) unsigned int flag; int signal; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c index 4f7abb068..7c0f0d096 100644 --- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c +++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction02.c @@ -73,11 +73,8 @@ int main(int ac, char **av) unsigned int flag; int signal; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c index 8db912f87..5206c1642 100644 --- a/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c +++ b/testcases/kernel/syscalls/rt_sigaction/rt_sigaction03.c @@ -98,11 +98,8 @@ int main(int ac, char **av) unsigned int flag; int signal; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask01.c b/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask01.c index d6224d87e..74e5a61b6 100644 --- a/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask01.c +++ b/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask01.c @@ -80,11 +80,8 @@ int main(int ac, char **av) sigset_t set, oset; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask02.c b/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask02.c index f7d84c3fa..cbc4f7e51 100644 --- a/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask02.c +++ b/testcases/kernel/syscalls/rt_sigprocmask/rt_sigprocmask02.c @@ -91,11 +91,8 @@ int main(int ac, char **av) { int i; sigset_t s; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c b/testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c index 411682034..95b582746 100644 --- a/testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c +++ b/testcases/kernel/syscalls/rt_sigsuspend/rt_sigsuspend01.c @@ -53,11 +53,8 @@ int main(int ac, char **av) { sigset_t set, set1, set2; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sbrk/sbrk01.c b/testcases/kernel/syscalls/sbrk/sbrk01.c index 185352118..ce26b1503 100644 --- a/testcases/kernel/syscalls/sbrk/sbrk01.c +++ b/testcases/kernel/syscalls/sbrk/sbrk01.c @@ -64,12 +64,9 @@ int TST_TOTAL = ARRAY_SIZE(test_cases); int main(int ac, char **av) { int lc; - const char *msg; int i; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sbrk/sbrk02.c b/testcases/kernel/syscalls/sbrk/sbrk02.c index b7e4de3f6..84744ef90 100644 --- a/testcases/kernel/syscalls/sbrk/sbrk02.c +++ b/testcases/kernel/syscalls/sbrk/sbrk02.c @@ -38,11 +38,8 @@ int main(int argc, char *argv[]) { int lc; int i; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max01.c b/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max01.c index 62dccbf5b..0ea06bba2 100644 --- a/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max01.c +++ b/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max01.c @@ -88,11 +88,9 @@ int TST_TOTAL = sizeof(test_cases) / sizeof(test_cases[0]); int main(int ac, char **av) { - int lc, ind; /* loop counter */ - const char *msg; + int lc, ind; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max02.c b/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max02.c index b2982b665..63b0d8a8e 100644 --- a/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max02.c +++ b/testcases/kernel/syscalls/sched_get_priority_max/sched_get_priority_max02.c @@ -81,10 +81,8 @@ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min01.c b/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min01.c index 2c2c9227c..b3c270968 100644 --- a/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min01.c +++ b/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min01.c @@ -88,11 +88,9 @@ int TST_TOTAL = sizeof(test_cases) / sizeof(test_cases[0]); int main(int ac, char **av) { - int lc, ind; /* loop counter */ - const char *msg; + int lc, ind; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min02.c b/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min02.c index 12e3fd89e..564c54f4a 100644 --- a/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min02.c +++ b/testcases/kernel/syscalls/sched_get_priority_min/sched_get_priority_min02.c @@ -81,10 +81,8 @@ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c b/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c index 99c6bb71d..9d6a81a57 100644 --- a/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c +++ b/testcases/kernel/syscalls/sched_getaffinity/sched_getaffinity01.c @@ -73,11 +73,8 @@ do { \ int main(int ac, char **av) { int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); for (lc = 0; TEST_LOOPING(lc); ++lc) { diff --git a/testcases/kernel/syscalls/sched_getparam/sched_getparam01.c b/testcases/kernel/syscalls/sched_getparam/sched_getparam01.c index d7a5419d3..82e97713b 100644 --- a/testcases/kernel/syscalls/sched_getparam/sched_getparam01.c +++ b/testcases/kernel/syscalls/sched_getparam/sched_getparam01.c @@ -78,10 +78,8 @@ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sched_getparam/sched_getparam02.c b/testcases/kernel/syscalls/sched_getparam/sched_getparam02.c index b9898dccc..1bbf686ae 100644 --- a/testcases/kernel/syscalls/sched_getparam/sched_getparam02.c +++ b/testcases/kernel/syscalls/sched_getparam/sched_getparam02.c @@ -88,12 +88,10 @@ int main(int ac, char **av) { int lc; - const char *msg; int status; pid_t child_pid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sched_getparam/sched_getparam03.c b/testcases/kernel/syscalls/sched_getparam/sched_getparam03.c index 3d7a5609f..dec6e41a1 100644 --- a/testcases/kernel/syscalls/sched_getparam/sched_getparam03.c +++ b/testcases/kernel/syscalls/sched_getparam/sched_getparam03.c @@ -104,11 +104,9 @@ int TST_TOTAL = sizeof(test_cases) / sizeof(test_cases[0]); int main(int ac, char **av) { - int lc, ind; /* loop counter */ - const char *msg; + int lc, ind; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler01.c b/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler01.c index 2da787426..75504b0a0 100644 --- a/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler01.c +++ b/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler01.c @@ -74,13 +74,10 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; /* message returned by parse_opts */ - int i; struct sched_param param; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler02.c b/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler02.c index c4373de2f..c43240108 100644 --- a/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler02.c +++ b/testcases/kernel/syscalls/sched_getscheduler/sched_getscheduler02.c @@ -56,11 +56,8 @@ void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval01.c b/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval01.c index bbb5a15e5..7527c4348 100644 --- a/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval01.c +++ b/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval01.c @@ -80,10 +80,8 @@ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval02.c b/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval02.c index 7523f1805..54101764c 100644 --- a/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval02.c +++ b/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval02.c @@ -81,10 +81,8 @@ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval03.c b/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval03.c index f2adc9f6e..c9686ada9 100644 --- a/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval03.c +++ b/testcases/kernel/syscalls/sched_rr_get_interval/sched_rr_get_interval03.c @@ -105,10 +105,8 @@ int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sched_setaffinity/sched_setaffinity01.c b/testcases/kernel/syscalls/sched_setaffinity/sched_setaffinity01.c index 435d6265f..15b90981c 100644 --- a/testcases/kernel/syscalls/sched_setaffinity/sched_setaffinity01.c +++ b/testcases/kernel/syscalls/sched_setaffinity/sched_setaffinity01.c @@ -138,13 +138,10 @@ static void setup(void) int main(int argc, char *argv[]) { - const char *msg; int lc; int i; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sched_setparam/sched_setparam01.c b/testcases/kernel/syscalls/sched_setparam/sched_setparam01.c index a174a67ac..a2272eb18 100644 --- a/testcases/kernel/syscalls/sched_setparam/sched_setparam01.c +++ b/testcases/kernel/syscalls/sched_setparam/sched_setparam01.c @@ -78,10 +78,8 @@ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sched_setparam/sched_setparam02.c b/testcases/kernel/syscalls/sched_setparam/sched_setparam02.c index 454f2e4bd..9321a4e1e 100644 --- a/testcases/kernel/syscalls/sched_setparam/sched_setparam02.c +++ b/testcases/kernel/syscalls/sched_setparam/sched_setparam02.c @@ -96,10 +96,8 @@ int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sched_setparam/sched_setparam03.c b/testcases/kernel/syscalls/sched_setparam/sched_setparam03.c index b4a592f24..127a74fba 100644 --- a/testcases/kernel/syscalls/sched_setparam/sched_setparam03.c +++ b/testcases/kernel/syscalls/sched_setparam/sched_setparam03.c @@ -89,12 +89,10 @@ int main(int ac, char **av) { int lc; - const char *msg; int status; pid_t child_pid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sched_setparam/sched_setparam04.c b/testcases/kernel/syscalls/sched_setparam/sched_setparam04.c index 303b82aa6..3da112088 100644 --- a/testcases/kernel/syscalls/sched_setparam/sched_setparam04.c +++ b/testcases/kernel/syscalls/sched_setparam/sched_setparam04.c @@ -110,11 +110,9 @@ int TST_TOTAL = sizeof(test_cases) / sizeof(test_cases[0]); int main(int ac, char **av) { - int lc, ind; /* loop counter */ - const char *msg; + int lc, ind; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/sched_setparam/sched_setparam05.c b/testcases/kernel/syscalls/sched_setparam/sched_setparam05.c index 573f0788b..66b973b10 100644 --- a/testcases/kernel/syscalls/sched_setparam/sched_setparam05.c +++ b/testcases/kernel/syscalls/sched_setparam/sched_setparam05.c @@ -92,12 +92,10 @@ int main(int ac, char **av) { int lc; - const char *msg; int status; pid_t child_pid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler01.c b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler01.c index f73a47be0..1cbce15d0 100644 --- a/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler01.c +++ b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler01.c @@ -99,13 +99,10 @@ int TST_TOTAL = ARRAY_SIZE(TC); int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); for (lc = 0; TEST_LOOPING(lc); lc++) { /* reset tst_count in case we are looping */ diff --git a/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler02.c b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler02.c index 720fdbc3d..e5b097e98 100644 --- a/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler02.c +++ b/testcases/kernel/syscalls/sched_setscheduler/sched_setscheduler02.c @@ -68,14 +68,11 @@ static uid_t nobody_uid; int main(int ac, char **av) { int lc; - const char *msg; pid_t pid; struct sched_param param; int status; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sched_yield/sched_yield01.c b/testcases/kernel/syscalls/sched_yield/sched_yield01.c index 09cd616b1..74501b0b7 100644 --- a/testcases/kernel/syscalls/sched_yield/sched_yield01.c +++ b/testcases/kernel/syscalls/sched_yield/sched_yield01.c @@ -56,11 +56,8 @@ void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/select/select01.c b/testcases/kernel/syscalls/select/select01.c index dfa89a9e8..e9100c78e 100644 --- a/testcases/kernel/syscalls/select/select01.c +++ b/testcases/kernel/syscalls/select/select01.c @@ -62,12 +62,10 @@ fd_set Readfds; int main(int ac, char **av) { int lc; - const char *msg; struct timeval timeout; long test_time = 0; /* in usecs */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/select/select02.c b/testcases/kernel/syscalls/select/select02.c index c02c64d08..3c9742777 100644 --- a/testcases/kernel/syscalls/select/select02.c +++ b/testcases/kernel/syscalls/select/select02.c @@ -60,12 +60,10 @@ fd_set Readfds, Writefds; int main(int ac, char **av) { int lc; - const char *msg; struct timeval timeout; long test_time = 0; /* in usecs */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/select/select03.c b/testcases/kernel/syscalls/select/select03.c index ad997570c..a9a81d0f9 100644 --- a/testcases/kernel/syscalls/select/select03.c +++ b/testcases/kernel/syscalls/select/select03.c @@ -64,12 +64,10 @@ fd_set Readfds, Writefds; int main(int ac, char **av) { int lc; - const char *msg; struct timeval timeout; long test_time = 0; /* in usecs */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/select/select04.c b/testcases/kernel/syscalls/select/select04.c index 5b655b9aa..255b00982 100644 --- a/testcases/kernel/syscalls/select/select04.c +++ b/testcases/kernel/syscalls/select/select04.c @@ -43,13 +43,11 @@ static void help(void); int main(int ac, char **av) { int lc, treshold; - const char *msg; long long elapsed_us, sleep_us = 100000; struct timeval timeout; fd_set fds; - if ((msg = parse_opts(ac, av, opts, help)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, opts, help); if (opt_sleep_us) { sleep_us = atoll(opt_sleep_us); diff --git a/testcases/kernel/syscalls/send/send01.c b/testcases/kernel/syscalls/send/send01.c index 00ef6934c..6f71300ce 100644 --- a/testcases/kernel/syscalls/send/send01.c +++ b/testcases/kernel/syscalls/send/send01.c @@ -250,10 +250,8 @@ static void do_child(void) int main(int ac, char *av[]) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX argv0 = av[0]; diff --git a/testcases/kernel/syscalls/sendfile/sendfile02.c b/testcases/kernel/syscalls/sendfile/sendfile02.c index 875ecef5d..ba12308b3 100644 --- a/testcases/kernel/syscalls/sendfile/sendfile02.c +++ b/testcases/kernel/syscalls/sendfile/sendfile02.c @@ -269,11 +269,8 @@ int main(int ac, char **av) { int i; int lc; - const char *msg; /* parse_opts() return message */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX argv0 = av[0]; maybe_run_child(&do_child, ""); diff --git a/testcases/kernel/syscalls/sendfile/sendfile03.c b/testcases/kernel/syscalls/sendfile/sendfile03.c index d56ae2419..cd790ccde 100644 --- a/testcases/kernel/syscalls/sendfile/sendfile03.c +++ b/testcases/kernel/syscalls/sendfile/sendfile03.c @@ -88,11 +88,8 @@ int main(int ac, char **av) { int i; int lc; - const char *msg; /* parse_opts() return message */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sendfile/sendfile04.c b/testcases/kernel/syscalls/sendfile/sendfile04.c index bcbf01522..822c4688c 100644 --- a/testcases/kernel/syscalls/sendfile/sendfile04.c +++ b/testcases/kernel/syscalls/sendfile/sendfile04.c @@ -267,11 +267,8 @@ int main(int ac, char **av) { int i; int lc; - const char *msg; /* parse_opts() return message */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX argv0 = av[0]; maybe_run_child(&do_child, ""); diff --git a/testcases/kernel/syscalls/sendfile/sendfile05.c b/testcases/kernel/syscalls/sendfile/sendfile05.c index ce8b01d18..110194b84 100644 --- a/testcases/kernel/syscalls/sendfile/sendfile05.c +++ b/testcases/kernel/syscalls/sendfile/sendfile05.c @@ -230,11 +230,8 @@ int create_server(void) int main(int ac, char **av) { int lc; - const char *msg; /* parse_opts() return message */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX argv0 = av[0]; maybe_run_child(&do_child, ""); diff --git a/testcases/kernel/syscalls/sendfile/sendfile06.c b/testcases/kernel/syscalls/sendfile/sendfile06.c index 0c85cfd6d..794519549 100644 --- a/testcases/kernel/syscalls/sendfile/sendfile06.c +++ b/testcases/kernel/syscalls/sendfile/sendfile06.c @@ -211,10 +211,8 @@ static int create_server(void) int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX argv0 = av[0]; diff --git a/testcases/kernel/syscalls/sendfile/sendfile07.c b/testcases/kernel/syscalls/sendfile/sendfile07.c index 811af8d53..c93363bad 100644 --- a/testcases/kernel/syscalls/sendfile/sendfile07.c +++ b/testcases/kernel/syscalls/sendfile/sendfile07.c @@ -75,11 +75,8 @@ void setup(void); int main(int ac, char **av) { int lc; - const char *msg; /* parse_opts() return message */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sendfile/sendfile08.c b/testcases/kernel/syscalls/sendfile/sendfile08.c index 445867587..21b25868d 100644 --- a/testcases/kernel/syscalls/sendfile/sendfile08.c +++ b/testcases/kernel/syscalls/sendfile/sendfile08.c @@ -54,12 +54,9 @@ int main(int argc, char *argv[]) { int lc; int ret; - const char *msg; char buf[BUFSIZ]; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sendfile/sendfile09.c b/testcases/kernel/syscalls/sendfile/sendfile09.c index dad26f9e4..0a9d2553e 100644 --- a/testcases/kernel/syscalls/sendfile/sendfile09.c +++ b/testcases/kernel/syscalls/sendfile/sendfile09.c @@ -169,7 +169,6 @@ int main(int ac, char **av) { int i; int lc; - const char *msg; #if __WORDSIZE == 32 tst_brkm(TCONF, NULL, "This test is only for 64bit"); @@ -181,8 +180,7 @@ int main(int ac, char **av) return 0; } - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sendmsg/sendmsg01.c b/testcases/kernel/syscalls/sendmsg/sendmsg01.c index 015a329cf..582851bd1 100644 --- a/testcases/kernel/syscalls/sendmsg/sendmsg01.c +++ b/testcases/kernel/syscalls/sendmsg/sendmsg01.c @@ -364,11 +364,8 @@ static char *argv0; int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX argv0 = argv[0]; diff --git a/testcases/kernel/syscalls/sendmsg/sendmsg02.c b/testcases/kernel/syscalls/sendmsg/sendmsg02.c index bd25ee5bc..06f816390 100644 --- a/testcases/kernel/syscalls/sendmsg/sendmsg02.c +++ b/testcases/kernel/syscalls/sendmsg/sendmsg02.c @@ -201,12 +201,9 @@ static void help(void) int main(int argc, char *argv[]) { int lc; - const char *msg; long seconds; - msg = parse_opts(argc, argv, options, &help); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, &help); setup(); seconds = tflag ? SAFE_STRTOL(NULL, t_opt, 1, LONG_MAX) : 15; diff --git a/testcases/kernel/syscalls/sendto/sendto01.c b/testcases/kernel/syscalls/sendto/sendto01.c index 3577f432f..ec0766197 100644 --- a/testcases/kernel/syscalls/sendto/sendto01.c +++ b/testcases/kernel/syscalls/sendto/sendto01.c @@ -320,10 +320,8 @@ static void do_child(void) int main(int ac, char *av[]) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX argv0 = av[0]; diff --git a/testcases/kernel/syscalls/set_robust_list/set_robust_list01.c b/testcases/kernel/syscalls/set_robust_list/set_robust_list01.c index 350d38188..cb67bd359 100644 --- a/testcases/kernel/syscalls/set_robust_list/set_robust_list01.c +++ b/testcases/kernel/syscalls/set_robust_list/set_robust_list01.c @@ -78,18 +78,13 @@ int main(int argc, char **argv) #ifdef __NR_set_robust_list int lc; #endif - const char *msg; #ifdef __NR_set_robust_list struct robust_list_head head; size_t len; /* size of structure struct robust_list_head */ int retval; #endif - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/set_thread_area/set_thread_area01.c b/testcases/kernel/syscalls/set_thread_area/set_thread_area01.c index eedeb2e43..511543c13 100644 --- a/testcases/kernel/syscalls/set_thread_area/set_thread_area01.c +++ b/testcases/kernel/syscalls/set_thread_area/set_thread_area01.c @@ -77,10 +77,8 @@ static const char *get_name(int syscall) int main(int argc, char *argv[]) { int lc, i; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c b/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c index 0b6e9f86f..b7aea1bc5 100644 --- a/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c +++ b/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c @@ -104,11 +104,8 @@ int main(int ac, char **av) { int newtid = -1; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setdomainname/setdomainname01.c b/testcases/kernel/syscalls/setdomainname/setdomainname01.c index e6b2c3a19..0b3e2cf71 100644 --- a/testcases/kernel/syscalls/setdomainname/setdomainname01.c +++ b/testcases/kernel/syscalls/setdomainname/setdomainname01.c @@ -84,12 +84,8 @@ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setdomainname/setdomainname02.c b/testcases/kernel/syscalls/setdomainname/setdomainname02.c index 269cbda92..ce27cbbad 100644 --- a/testcases/kernel/syscalls/setdomainname/setdomainname02.c +++ b/testcases/kernel/syscalls/setdomainname/setdomainname02.c @@ -105,13 +105,9 @@ static struct test_case_t { int main(int ac, char **av) { - int lc, ind; /* loop counter */ - const char *msg; + int lc, ind; - if ((msg = parse_opts(ac, av, NULL, NULL)) - != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/setdomainname/setdomainname03.c b/testcases/kernel/syscalls/setdomainname/setdomainname03.c index 86205144b..53d05fb69 100644 --- a/testcases/kernel/syscalls/setdomainname/setdomainname03.c +++ b/testcases/kernel/syscalls/setdomainname/setdomainname03.c @@ -95,13 +95,8 @@ static void cleanup(); /* cleanup function for the tests */ int main(int ac, char **av) { int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); /* * Invoke setup function to call individual test setup functions diff --git a/testcases/kernel/syscalls/setegid/setegid01.c b/testcases/kernel/syscalls/setegid/setegid01.c index 65976f3b9..cb641f3c6 100644 --- a/testcases/kernel/syscalls/setegid/setegid01.c +++ b/testcases/kernel/syscalls/setegid/setegid01.c @@ -43,11 +43,8 @@ static gid_t nobody_gid; int main(int argc, char **argv) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "Option parsing error - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setegid/setegid02.c b/testcases/kernel/syscalls/setegid/setegid02.c index 11a67d683..16bf486a6 100644 --- a/testcases/kernel/syscalls/setegid/setegid02.c +++ b/testcases/kernel/syscalls/setegid/setegid02.c @@ -36,11 +36,8 @@ static struct passwd *ltpuser; int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setfsgid/setfsgid01.c b/testcases/kernel/syscalls/setfsgid/setfsgid01.c index 097a0a6ab..45d89c0cb 100644 --- a/testcases/kernel/syscalls/setfsgid/setfsgid01.c +++ b/testcases/kernel/syscalls/setfsgid/setfsgid01.c @@ -39,12 +39,10 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; gid_t gid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setfsgid/setfsgid02.c b/testcases/kernel/syscalls/setfsgid/setfsgid02.c index 1d056f7ab..4788957e2 100644 --- a/testcases/kernel/syscalls/setfsgid/setfsgid02.c +++ b/testcases/kernel/syscalls/setfsgid/setfsgid02.c @@ -42,12 +42,10 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; gid_t gid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setfsgid/setfsgid03.c b/testcases/kernel/syscalls/setfsgid/setfsgid03.c index a12092444..dbe43610f 100644 --- a/testcases/kernel/syscalls/setfsgid/setfsgid03.c +++ b/testcases/kernel/syscalls/setfsgid/setfsgid03.c @@ -45,12 +45,10 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; gid_t gid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setfsuid/setfsuid01.c b/testcases/kernel/syscalls/setfsuid/setfsuid01.c index 50767ef84..63f9f5dd8 100644 --- a/testcases/kernel/syscalls/setfsuid/setfsuid01.c +++ b/testcases/kernel/syscalls/setfsuid/setfsuid01.c @@ -39,12 +39,10 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; uid_t uid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setfsuid/setfsuid02.c b/testcases/kernel/syscalls/setfsuid/setfsuid02.c index c9fe7f129..5807bb6c0 100644 --- a/testcases/kernel/syscalls/setfsuid/setfsuid02.c +++ b/testcases/kernel/syscalls/setfsuid/setfsuid02.c @@ -41,12 +41,10 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; uid_t uid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setfsuid/setfsuid03.c b/testcases/kernel/syscalls/setfsuid/setfsuid03.c index 7438f7d83..56d51f30f 100644 --- a/testcases/kernel/syscalls/setfsuid/setfsuid03.c +++ b/testcases/kernel/syscalls/setfsuid/setfsuid03.c @@ -44,12 +44,10 @@ static struct passwd *ltpuser; int main(int ac, char **av) { int lc; - const char *msg; uid_t uid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setfsuid/setfsuid04.c b/testcases/kernel/syscalls/setfsuid/setfsuid04.c index 1ad254aa7..0d5a9eabf 100644 --- a/testcases/kernel/syscalls/setfsuid/setfsuid04.c +++ b/testcases/kernel/syscalls/setfsuid/setfsuid04.c @@ -56,10 +56,8 @@ static void do_master_child(void); int main(int ac, char **av) { pid_t pid; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setgid/setgid01.c b/testcases/kernel/syscalls/setgid/setgid01.c index bf1628b58..0c8ef3b2a 100644 --- a/testcases/kernel/syscalls/setgid/setgid01.c +++ b/testcases/kernel/syscalls/setgid/setgid01.c @@ -52,10 +52,8 @@ static gid_t gid; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setgid/setgid02.c b/testcases/kernel/syscalls/setgid/setgid02.c index 982acf572..46bc2a0c1 100644 --- a/testcases/kernel/syscalls/setgid/setgid02.c +++ b/testcases/kernel/syscalls/setgid/setgid02.c @@ -45,10 +45,8 @@ int main(int ac, char **av) { struct passwd *getpwnam(), *rootpwent; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setgid/setgid03.c b/testcases/kernel/syscalls/setgid/setgid03.c index 293a15a99..50b6ded98 100644 --- a/testcases/kernel/syscalls/setgid/setgid03.c +++ b/testcases/kernel/syscalls/setgid/setgid03.c @@ -41,10 +41,8 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setgroups/setgroups01.c b/testcases/kernel/syscalls/setgroups/setgroups01.c index f3406b2a1..ea12ee2c3 100644 --- a/testcases/kernel/syscalls/setgroups/setgroups01.c +++ b/testcases/kernel/syscalls/setgroups/setgroups01.c @@ -132,15 +132,11 @@ GID_T list[NGROUPS]; int main(int ac, char **av) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/setgroups/setgroups02.c b/testcases/kernel/syscalls/setgroups/setgroups02.c index d53d4d55e..43fbbba07 100644 --- a/testcases/kernel/syscalls/setgroups/setgroups02.c +++ b/testcases/kernel/syscalls/setgroups/setgroups02.c @@ -86,13 +86,11 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { - int lc, i; /* loop counters */ - const char *msg; + int lc, i; int gidsetsize = 1; /* only one GID, the GID of TESTUSER */ int PASS_FLAG = 0; /* used for checking group array */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setgroups/setgroups03.c b/testcases/kernel/syscalls/setgroups/setgroups03.c index 86b1e6e8a..c30834a23 100644 --- a/testcases/kernel/syscalls/setgroups/setgroups03.c +++ b/testcases/kernel/syscalls/setgroups/setgroups03.c @@ -105,14 +105,12 @@ struct test_case_t { /* test case struct. to hold ref. test cond's */ int main(int ac, char **av) { int lc; - const char *msg; int gidsetsize; /* total no. of groups */ int i; char *test_desc; /* test specific error message */ int ngroups_max = sysconf(_SC_NGROUPS_MAX); /* max no. of groups in the current system */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); groups_list = malloc(ngroups_max * sizeof(GID_T)); if (groups_list == NULL) { diff --git a/testcases/kernel/syscalls/setgroups/setgroups04.c b/testcases/kernel/syscalls/setgroups/setgroups04.c index 381d886a0..f732a62c2 100644 --- a/testcases/kernel/syscalls/setgroups/setgroups04.c +++ b/testcases/kernel/syscalls/setgroups/setgroups04.c @@ -84,12 +84,10 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; int gidsetsize; /* total no. of groups */ char *test_desc; /* test specific error message */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* Perform setup for test */ setup(); diff --git a/testcases/kernel/syscalls/sethostname/sethostname01.c b/testcases/kernel/syscalls/sethostname/sethostname01.c index 24a377daf..ef0226353 100644 --- a/testcases/kernel/syscalls/sethostname/sethostname01.c +++ b/testcases/kernel/syscalls/sethostname/sethostname01.c @@ -83,14 +83,10 @@ static char hname[MAX_LENGTH]; /* host name */ int main(int ac, char **av) { int lc; - const char *msg; char ltphost[] = "ltphost"; /* temporary host name to set */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); /* Do initial setup. */ setup(); diff --git a/testcases/kernel/syscalls/sethostname/sethostname02.c b/testcases/kernel/syscalls/sethostname/sethostname02.c index 516d5112f..269043787 100644 --- a/testcases/kernel/syscalls/sethostname/sethostname02.c +++ b/testcases/kernel/syscalls/sethostname/sethostname02.c @@ -118,11 +118,8 @@ int main(int ac, char **av) { int i; int lc; - const char *msg; /* parse_opts() return message */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); /* Do initial setup */ setup(); diff --git a/testcases/kernel/syscalls/sethostname/sethostname03.c b/testcases/kernel/syscalls/sethostname/sethostname03.c index 59f4e403c..65968b37b 100644 --- a/testcases/kernel/syscalls/sethostname/sethostname03.c +++ b/testcases/kernel/syscalls/sethostname/sethostname03.c @@ -92,12 +92,8 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); /* Do initial setup */ setup(); diff --git a/testcases/kernel/syscalls/setitimer/setitimer01.c b/testcases/kernel/syscalls/setitimer/setitimer01.c index d86333fec..6874b94ad 100644 --- a/testcases/kernel/syscalls/setitimer/setitimer01.c +++ b/testcases/kernel/syscalls/setitimer/setitimer01.c @@ -69,12 +69,9 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; struct itimerval *value, *ovalue; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/setitimer/setitimer02.c b/testcases/kernel/syscalls/setitimer/setitimer02.c index 813b472b2..4d13cd1e0 100644 --- a/testcases/kernel/syscalls/setitimer/setitimer02.c +++ b/testcases/kernel/syscalls/setitimer/setitimer02.c @@ -68,12 +68,9 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; struct itimerval *value; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/setitimer/setitimer03.c b/testcases/kernel/syscalls/setitimer/setitimer03.c index ff5b426b8..418ec71f0 100644 --- a/testcases/kernel/syscalls/setitimer/setitimer03.c +++ b/testcases/kernel/syscalls/setitimer/setitimer03.c @@ -66,12 +66,9 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; struct itimerval *value, *ovalue; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/setns/setns01.c b/testcases/kernel/syscalls/setns/setns01.c index 2ad010ec4..324341bd5 100644 --- a/testcases/kernel/syscalls/setns/setns01.c +++ b/testcases/kernel/syscalls/setns/setns01.c @@ -189,11 +189,8 @@ static void test_setns(struct testcase_t *t) int main(int argc, char *argv[]) { int lc, testno; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/syscalls/setns/setns02.c b/testcases/kernel/syscalls/setns/setns02.c index e0a50f89d..9a707789c 100644 --- a/testcases/kernel/syscalls/setns/setns02.c +++ b/testcases/kernel/syscalls/setns/setns02.c @@ -162,11 +162,8 @@ static void test_flag(int clone_flag, int ns_flag, int (*fn) (void *arg)) int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/syscalls/setpgid/setpgid01.c b/testcases/kernel/syscalls/setpgid/setpgid01.c index 9ed9581cd..89c9a3779 100644 --- a/testcases/kernel/syscalls/setpgid/setpgid01.c +++ b/testcases/kernel/syscalls/setpgid/setpgid01.c @@ -59,10 +59,8 @@ int TST_TOTAL = ARRAY_SIZE(testfunc); int main(int ac, char **av) { int i, lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setpgid/setpgid02.c b/testcases/kernel/syscalls/setpgid/setpgid02.c index c1ec93063..73e88d066 100644 --- a/testcases/kernel/syscalls/setpgid/setpgid02.c +++ b/testcases/kernel/syscalls/setpgid/setpgid02.c @@ -85,12 +85,9 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setpgid/setpgid03.c b/testcases/kernel/syscalls/setpgid/setpgid03.c index 9c7f826af..96ebe1453 100644 --- a/testcases/kernel/syscalls/setpgid/setpgid03.c +++ b/testcases/kernel/syscalls/setpgid/setpgid03.c @@ -53,10 +53,8 @@ int main(int ac, char **av) int status; int rval; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, ""); #endif diff --git a/testcases/kernel/syscalls/setpgrp/setpgrp01.c b/testcases/kernel/syscalls/setpgrp/setpgrp01.c index 079ca608e..3fdb8cb4c 100644 --- a/testcases/kernel/syscalls/setpgrp/setpgrp01.c +++ b/testcases/kernel/syscalls/setpgrp/setpgrp01.c @@ -49,10 +49,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setpgrp/setpgrp02.c b/testcases/kernel/syscalls/setpgrp/setpgrp02.c index 9348b1ab1..681223bad 100644 --- a/testcases/kernel/syscalls/setpgrp/setpgrp02.c +++ b/testcases/kernel/syscalls/setpgrp/setpgrp02.c @@ -57,14 +57,11 @@ void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; /* message returned by parse_opts */ int pid, oldpgrp; int e_code, status, retval = 0; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setpriority/setpriority01.c b/testcases/kernel/syscalls/setpriority/setpriority01.c index 3db7cede9..2354a9c5d 100644 --- a/testcases/kernel/syscalls/setpriority/setpriority01.c +++ b/testcases/kernel/syscalls/setpriority/setpriority01.c @@ -38,12 +38,9 @@ int TST_TOTAL = 40; int main(int ac, char **av) { int lc; - const char *msg; int new_val; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setpriority/setpriority02.c b/testcases/kernel/syscalls/setpriority/setpriority02.c index 53466e7cd..2dd0a6246 100644 --- a/testcases/kernel/syscalls/setpriority/setpriority02.c +++ b/testcases/kernel/syscalls/setpriority/setpriority02.c @@ -70,12 +70,9 @@ struct passwd *ltpuser; int main(int ac, char **av) { int lc; - const char *msg; int new_val = -2; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/setpriority/setpriority03.c b/testcases/kernel/syscalls/setpriority/setpriority03.c index 76e93af38..e61899e34 100644 --- a/testcases/kernel/syscalls/setpriority/setpriority03.c +++ b/testcases/kernel/syscalls/setpriority/setpriority03.c @@ -69,12 +69,9 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; int new_val = 2; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/setpriority/setpriority04.c b/testcases/kernel/syscalls/setpriority/setpriority04.c index fb55fcefb..162a364ab 100644 --- a/testcases/kernel/syscalls/setpriority/setpriority04.c +++ b/testcases/kernel/syscalls/setpriority/setpriority04.c @@ -66,13 +66,10 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; int new_val = 2; pid_t unused_pid; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/setpriority/setpriority05.c b/testcases/kernel/syscalls/setpriority/setpriority05.c index 971c4d5c2..5fe81cfac 100644 --- a/testcases/kernel/syscalls/setpriority/setpriority05.c +++ b/testcases/kernel/syscalls/setpriority/setpriority05.c @@ -70,13 +70,10 @@ struct passwd *ltpuser; int main(int ac, char **av) { int lc; - const char *msg; int new_val = 2; int init_val = 1; /* the init process = id 1 */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/setregid/setregid01.c b/testcases/kernel/syscalls/setregid/setregid01.c index 6e3762376..29a8a0567 100644 --- a/testcases/kernel/syscalls/setregid/setregid01.c +++ b/testcases/kernel/syscalls/setregid/setregid01.c @@ -56,10 +56,8 @@ static gid_t gid, egid; /* current real and effective group id */ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setregid/setregid02.c b/testcases/kernel/syscalls/setregid/setregid02.c index 56bcc9984..c4318c912 100644 --- a/testcases/kernel/syscalls/setregid/setregid02.c +++ b/testcases/kernel/syscalls/setregid/setregid02.c @@ -79,10 +79,8 @@ static void gid_verify(struct group *ru, struct group *eu, char *when); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setregid/setregid03.c b/testcases/kernel/syscalls/setregid/setregid03.c index 85d74de0f..4bc4c8345 100644 --- a/testcases/kernel/syscalls/setregid/setregid03.c +++ b/testcases/kernel/syscalls/setregid/setregid03.c @@ -87,10 +87,8 @@ static void gid_verify(struct group *ru, struct group *eu, char *when); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setregid/setregid04.c b/testcases/kernel/syscalls/setregid/setregid04.c index b9426ab79..bf662da60 100644 --- a/testcases/kernel/syscalls/setregid/setregid04.c +++ b/testcases/kernel/syscalls/setregid/setregid04.c @@ -79,10 +79,8 @@ static void gid_verify(struct group *ru, struct group *eu, const char *when); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setresgid/setresgid01.c b/testcases/kernel/syscalls/setresgid/setresgid01.c index fec171ad3..30a85dbd9 100644 --- a/testcases/kernel/syscalls/setresgid/setresgid01.c +++ b/testcases/kernel/syscalls/setresgid/setresgid01.c @@ -117,11 +117,8 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); int main(int argc, char **argv) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setresgid/setresgid02.c b/testcases/kernel/syscalls/setresgid/setresgid02.c index 94fd0c155..1e8d0ad12 100644 --- a/testcases/kernel/syscalls/setresgid/setresgid02.c +++ b/testcases/kernel/syscalls/setresgid/setresgid02.c @@ -124,11 +124,8 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); int main(int argc, char **argv) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setresgid/setresgid03.c b/testcases/kernel/syscalls/setresgid/setresgid03.c index b08818ed1..bd3001d7c 100644 --- a/testcases/kernel/syscalls/setresgid/setresgid03.c +++ b/testcases/kernel/syscalls/setresgid/setresgid03.c @@ -116,11 +116,8 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); int main(int argc, char **argv) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setresgid/setresgid04.c b/testcases/kernel/syscalls/setresgid/setresgid04.c index 2c371d359..5a3c12737 100644 --- a/testcases/kernel/syscalls/setresgid/setresgid04.c +++ b/testcases/kernel/syscalls/setresgid/setresgid04.c @@ -41,11 +41,8 @@ static void cleanup(void); int main(int argc, char **argv) { int i, lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setresuid/setresuid01.c b/testcases/kernel/syscalls/setresuid/setresuid01.c index e94894d0a..a07bbd8bc 100644 --- a/testcases/kernel/syscalls/setresuid/setresuid01.c +++ b/testcases/kernel/syscalls/setresuid/setresuid01.c @@ -122,12 +122,8 @@ uid_verify(struct passwd *ru, struct passwd *eu, struct passwd *su, char *when); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setresuid/setresuid02.c b/testcases/kernel/syscalls/setresuid/setresuid02.c index 4140f8013..617501c01 100644 --- a/testcases/kernel/syscalls/setresuid/setresuid02.c +++ b/testcases/kernel/syscalls/setresuid/setresuid02.c @@ -112,12 +112,8 @@ uid_verify(struct passwd *ru, struct passwd *eu, struct passwd *su, char *); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setresuid/setresuid03.c b/testcases/kernel/syscalls/setresuid/setresuid03.c index 057598519..5a2ba5a92 100644 --- a/testcases/kernel/syscalls/setresuid/setresuid03.c +++ b/testcases/kernel/syscalls/setresuid/setresuid03.c @@ -120,12 +120,8 @@ uid_verify(struct passwd *ru, struct passwd *eu, struct passwd *su, char *); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setresuid/setresuid04.c b/testcases/kernel/syscalls/setresuid/setresuid04.c index bc4729573..639c4df28 100644 --- a/testcases/kernel/syscalls/setresuid/setresuid04.c +++ b/testcases/kernel/syscalls/setresuid/setresuid04.c @@ -69,10 +69,8 @@ void do_master_child(); int main(int ac, char **av) { pid_t pid; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); pid = FORK_OR_VFORK(); diff --git a/testcases/kernel/syscalls/setresuid/setresuid05.c b/testcases/kernel/syscalls/setresuid/setresuid05.c index cbb9ee6d6..fae1b6c8e 100644 --- a/testcases/kernel/syscalls/setresuid/setresuid05.c +++ b/testcases/kernel/syscalls/setresuid/setresuid05.c @@ -41,11 +41,8 @@ static void cleanup(void); int main(int argc, char **argv) { int i, lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setreuid/setreuid01.c b/testcases/kernel/syscalls/setreuid/setreuid01.c index c015517d6..54ba2d7a8 100644 --- a/testcases/kernel/syscalls/setreuid/setreuid01.c +++ b/testcases/kernel/syscalls/setreuid/setreuid01.c @@ -56,10 +56,8 @@ static uid_t ruid, euid; /* real and effective user ids */ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setreuid/setreuid02.c b/testcases/kernel/syscalls/setreuid/setreuid02.c index 5a7971048..9cc03339e 100644 --- a/testcases/kernel/syscalls/setreuid/setreuid02.c +++ b/testcases/kernel/syscalls/setreuid/setreuid02.c @@ -67,10 +67,8 @@ static void uid_verify(struct passwd *ru, struct passwd *eu, char *when); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setreuid/setreuid03.c b/testcases/kernel/syscalls/setreuid/setreuid03.c index 93b7a4571..253390825 100644 --- a/testcases/kernel/syscalls/setreuid/setreuid03.c +++ b/testcases/kernel/syscalls/setreuid/setreuid03.c @@ -92,10 +92,8 @@ static void uid_verify(struct passwd *, struct passwd *, char *); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setreuid/setreuid04.c b/testcases/kernel/syscalls/setreuid/setreuid04.c index e92d05e20..f05f61dd2 100644 --- a/testcases/kernel/syscalls/setreuid/setreuid04.c +++ b/testcases/kernel/syscalls/setreuid/setreuid04.c @@ -64,10 +64,8 @@ static void uid_verify(struct passwd *, struct passwd *, char *); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setreuid/setreuid05.c b/testcases/kernel/syscalls/setreuid/setreuid05.c index 9a9559da5..d6c4c6fa4 100644 --- a/testcases/kernel/syscalls/setreuid/setreuid05.c +++ b/testcases/kernel/syscalls/setreuid/setreuid05.c @@ -85,10 +85,8 @@ static void uid_verify(struct passwd *, struct passwd *, char *); int main(int argc, char **argv) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setreuid/setreuid06.c b/testcases/kernel/syscalls/setreuid/setreuid06.c index ae1f500f1..3364c1493 100644 --- a/testcases/kernel/syscalls/setreuid/setreuid06.c +++ b/testcases/kernel/syscalls/setreuid/setreuid06.c @@ -48,10 +48,8 @@ static void cleanup(void); int main(int argc, char **argv) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setreuid/setreuid07.c b/testcases/kernel/syscalls/setreuid/setreuid07.c index 619682464..54299fc72 100644 --- a/testcases/kernel/syscalls/setreuid/setreuid07.c +++ b/testcases/kernel/syscalls/setreuid/setreuid07.c @@ -53,10 +53,8 @@ static void do_master_child(void); int main(int ac, char **av) { pid_t pid; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setrlimit/setrlimit01.c b/testcases/kernel/syscalls/setrlimit/setrlimit01.c index b40340939..cb06b4e43 100644 --- a/testcases/kernel/syscalls/setrlimit/setrlimit01.c +++ b/testcases/kernel/syscalls/setrlimit/setrlimit01.c @@ -57,11 +57,8 @@ static pid_t pid; int main(int ac, char **av) { int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setrlimit/setrlimit02.c b/testcases/kernel/syscalls/setrlimit/setrlimit02.c index bb45cf6c9..0b249d029 100644 --- a/testcases/kernel/syscalls/setrlimit/setrlimit02.c +++ b/testcases/kernel/syscalls/setrlimit/setrlimit02.c @@ -79,12 +79,9 @@ int TST_TOTAL = ARRAY_SIZE(TC); int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setrlimit/setrlimit03.c b/testcases/kernel/syscalls/setrlimit/setrlimit03.c index 247a3012e..b0b4a399b 100644 --- a/testcases/kernel/syscalls/setrlimit/setrlimit03.c +++ b/testcases/kernel/syscalls/setrlimit/setrlimit03.c @@ -61,12 +61,9 @@ void cleanup(); int main(int ac, char **av) { int lc; - const char *msg; struct rlimit rlim; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setsid/setsid01.c b/testcases/kernel/syscalls/setsid/setsid01.c index 3e6eaf866..ad5687c9d 100644 --- a/testcases/kernel/syscalls/setsid/setsid01.c +++ b/testcases/kernel/syscalls/setsid/setsid01.c @@ -66,10 +66,8 @@ int main(int ac, char **av) int exno = 0; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX argv0 = av[0]; diff --git a/testcases/kernel/syscalls/setsockopt/setsockopt01.c b/testcases/kernel/syscalls/setsockopt/setsockopt01.c index ee9835679..f25694a96 100644 --- a/testcases/kernel/syscalls/setsockopt/setsockopt01.c +++ b/testcases/kernel/syscalls/setsockopt/setsockopt01.c @@ -131,12 +131,8 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); for (lc = 0; TEST_LOOPING(lc); ++lc) { diff --git a/testcases/kernel/syscalls/settimeofday/settimeofday01.c b/testcases/kernel/syscalls/settimeofday/settimeofday01.c index f15f6f3eb..1d018e2a5 100644 --- a/testcases/kernel/syscalls/settimeofday/settimeofday01.c +++ b/testcases/kernel/syscalls/settimeofday/settimeofday01.c @@ -78,13 +78,9 @@ void cleanup(void); int main(int argc, char **argv) { int lc; - const char *msg; suseconds_t delta; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/settimeofday/settimeofday02.c b/testcases/kernel/syscalls/settimeofday/settimeofday02.c index d5e334158..f0497b47f 100644 --- a/testcases/kernel/syscalls/settimeofday/settimeofday02.c +++ b/testcases/kernel/syscalls/settimeofday/settimeofday02.c @@ -83,11 +83,8 @@ void restore_time(void); int main(int argc, char **argv) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setuid/setuid01.c b/testcases/kernel/syscalls/setuid/setuid01.c index 73d8c64ee..c6061b88f 100644 --- a/testcases/kernel/syscalls/setuid/setuid01.c +++ b/testcases/kernel/syscalls/setuid/setuid01.c @@ -54,10 +54,8 @@ static uid_t uid; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setuid/setuid02.c b/testcases/kernel/syscalls/setuid/setuid02.c index 135d62260..89d52ebe2 100644 --- a/testcases/kernel/syscalls/setuid/setuid02.c +++ b/testcases/kernel/syscalls/setuid/setuid02.c @@ -128,13 +128,11 @@ uid_t uid; /* current user id */ int main(int ac, char **av) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/setuid/setuid03.c b/testcases/kernel/syscalls/setuid/setuid03.c index 8491c5678..cc0d91d37 100644 --- a/testcases/kernel/syscalls/setuid/setuid03.c +++ b/testcases/kernel/syscalls/setuid/setuid03.c @@ -44,10 +44,8 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setuid/setuid04.c b/testcases/kernel/syscalls/setuid/setuid04.c index 27277a089..f1896ad1d 100644 --- a/testcases/kernel/syscalls/setuid/setuid04.c +++ b/testcases/kernel/syscalls/setuid/setuid04.c @@ -52,11 +52,9 @@ static void do_master_child(void); int main(int ac, char **av) { pid_t pid; - const char *msg; int status; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setxattr/setxattr01.c b/testcases/kernel/syscalls/setxattr/setxattr01.c index fb6083d25..4622151c5 100644 --- a/testcases/kernel/syscalls/setxattr/setxattr01.c +++ b/testcases/kernel/syscalls/setxattr/setxattr01.c @@ -149,11 +149,8 @@ int main(int argc, char *argv[]) { int lc; int i; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setxattr/setxattr02.c b/testcases/kernel/syscalls/setxattr/setxattr02.c index e9bc9f36b..35fa89593 100644 --- a/testcases/kernel/syscalls/setxattr/setxattr02.c +++ b/testcases/kernel/syscalls/setxattr/setxattr02.c @@ -149,11 +149,8 @@ int main(int argc, char *argv[]) { int lc; int i; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/setxattr/setxattr03.c b/testcases/kernel/syscalls/setxattr/setxattr03.c index 2e0f6c569..5b2738514 100644 --- a/testcases/kernel/syscalls/setxattr/setxattr03.c +++ b/testcases/kernel/syscalls/setxattr/setxattr03.c @@ -108,11 +108,8 @@ int main(int argc, char *argv[]) { int lc; int i; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, tst_exit, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sgetmask/sgetmask01.c b/testcases/kernel/syscalls/sgetmask/sgetmask01.c index 92dd2380b..7114856f5 100644 --- a/testcases/kernel/syscalls/sgetmask/sgetmask01.c +++ b/testcases/kernel/syscalls/sgetmask/sgetmask01.c @@ -115,11 +115,8 @@ int main(int ac, char **av) { int sig; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sigaction/sigaction01.c b/testcases/kernel/syscalls/sigaction/sigaction01.c index e47d6b043..e8e8a49a7 100644 --- a/testcases/kernel/syscalls/sigaction/sigaction01.c +++ b/testcases/kernel/syscalls/sigaction/sigaction01.c @@ -228,15 +228,12 @@ void cleanup(void) int main(int ac, char **av) { int lc; - const char *msg; /* message got from parse_opts */ int i; int test_flags[] = { SA_RESETHAND | SA_SIGINFO, SA_RESETHAND, SA_RESETHAND | SA_SIGINFO, SA_RESETHAND | SA_SIGINFO }; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sigaction/sigaction02.c b/testcases/kernel/syscalls/sigaction/sigaction02.c index 11ed794f3..641a04eca 100644 --- a/testcases/kernel/syscalls/sigaction/sigaction02.c +++ b/testcases/kernel/syscalls/sigaction/sigaction02.c @@ -110,13 +110,9 @@ int set_handler(int sig, int sig_to_mask, int flag) int main(int ac, char **av) { - const char *msg; /* message got from parse_opts */ - int ret; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); //test1: testcase_no = 1; diff --git a/testcases/kernel/syscalls/sigaltstack/sigaltstack01.c b/testcases/kernel/syscalls/sigaltstack/sigaltstack01.c index 80cf7e5b3..9a2e3a440 100644 --- a/testcases/kernel/syscalls/sigaltstack/sigaltstack01.c +++ b/testcases/kernel/syscalls/sigaltstack/sigaltstack01.c @@ -94,14 +94,9 @@ void sig_handler(int); /* signal catching function */ int main(int ac, char **av) { int lc; - const char *msg; void *alt_stk; /* address of alternate stack for signal */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sigaltstack/sigaltstack02.c b/testcases/kernel/syscalls/sigaltstack/sigaltstack02.c index 74d8a625b..c5ab79715 100644 --- a/testcases/kernel/syscalls/sigaltstack/sigaltstack02.c +++ b/testcases/kernel/syscalls/sigaltstack/sigaltstack02.c @@ -110,14 +110,10 @@ struct test_case_t { /* test case struct. to hold diff. test.conds */ int main(int ac, char **av) { int lc; - const char *msg; char *test_desc; /* test specific error message */ int ind; /* counter to test different test conditions */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sighold/sighold02.c b/testcases/kernel/syscalls/sighold/sighold02.c index b72349c54..0f334d194 100644 --- a/testcases/kernel/syscalls/sighold/sighold02.c +++ b/testcases/kernel/syscalls/sighold/sighold02.c @@ -160,15 +160,11 @@ int main(int ac, char **av) int term_stat; /* child return status */ int sig; /* current signal */ int lc; - const char *msg; /*************************************************************** * parse standard options, and exit if there is an error ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, "dd", &CHILDSWRITEFD, &CHILDSREADFD); #endif diff --git a/testcases/kernel/syscalls/signal/signal01.c b/testcases/kernel/syscalls/signal/signal01.c index de5edb77c..6b1a33a20 100644 --- a/testcases/kernel/syscalls/signal/signal01.c +++ b/testcases/kernel/syscalls/signal/signal01.c @@ -232,14 +232,11 @@ static int test_case_uclinux; int main(int argc, char *argv[]) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX argv0 = argv[0]; maybe_run_child(&do_child_uclinux, "dd", &test_case_uclinux, &fd1[1]); diff --git a/testcases/kernel/syscalls/signal/signal02.c b/testcases/kernel/syscalls/signal/signal02.c index 721ab935a..8eb95b52b 100644 --- a/testcases/kernel/syscalls/signal/signal02.c +++ b/testcases/kernel/syscalls/signal/signal02.c @@ -72,12 +72,9 @@ int sigs[] = { _NSIG + 1, SIGKILL, SIGSTOP }; int main(int ac, char **av) { int lc; - const char *msg; int i; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/signal/signal03.c b/testcases/kernel/syscalls/signal/signal03.c index 1b2c05b99..c9f8017d0 100644 --- a/testcases/kernel/syscalls/signal/signal03.c +++ b/testcases/kernel/syscalls/signal/signal03.c @@ -90,13 +90,10 @@ int fail = 0; int main(int ac, char **av) { int lc; - const char *msg; pid_t pid; int i, rval; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/signal/signal04.c b/testcases/kernel/syscalls/signal/signal04.c index 88a5ca190..baca1618a 100644 --- a/testcases/kernel/syscalls/signal/signal04.c +++ b/testcases/kernel/syscalls/signal/signal04.c @@ -84,13 +84,10 @@ sighandler_t Tret; int main(int ac, char **av) { int lc; - const char *msg; int i; sighandler_t rval, first; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/signal/signal05.c b/testcases/kernel/syscalls/signal/signal05.c index e9e5899ec..2a2894161 100644 --- a/testcases/kernel/syscalls/signal/signal05.c +++ b/testcases/kernel/syscalls/signal/signal05.c @@ -90,13 +90,10 @@ int pass = 0; int main(int ac, char **av) { int lc; - const char *msg; pid_t pid; int i, rval; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/signalfd/signalfd01.c b/testcases/kernel/syscalls/signalfd/signalfd01.c index 8f525bb24..48c929291 100644 --- a/testcases/kernel/syscalls/signalfd/signalfd01.c +++ b/testcases/kernel/syscalls/signalfd/signalfd01.c @@ -271,7 +271,6 @@ out: int main(int argc, char **argv) { int lc; - const char *msg; int sfd; if ((tst_kvercmp(2, 6, 22)) < 0) { @@ -280,9 +279,7 @@ int main(int argc, char **argv) exit(0); } - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/syscalls/signalfd4/signalfd4_01.c b/testcases/kernel/syscalls/signalfd4/signalfd4_01.c index 5927646bb..4dc60d2fa 100644 --- a/testcases/kernel/syscalls/signalfd4/signalfd4_01.c +++ b/testcases/kernel/syscalls/signalfd4/signalfd4_01.c @@ -128,12 +128,8 @@ int main(int argc, char *argv[]) int fd, coe; sigset_t ss; int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); if ((tst_kvercmp(2, 6, 27)) < 0) { tst_brkm(TCONF, NULL, diff --git a/testcases/kernel/syscalls/signalfd4/signalfd4_02.c b/testcases/kernel/syscalls/signalfd4/signalfd4_02.c index 6539199ea..800687d7a 100644 --- a/testcases/kernel/syscalls/signalfd4/signalfd4_02.c +++ b/testcases/kernel/syscalls/signalfd4/signalfd4_02.c @@ -123,12 +123,8 @@ int main(int argc, char *argv[]) sigset_t ss; int fd, fl; int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); if ((tst_kvercmp(2, 6, 27)) < 0) { tst_brkm(TCONF, NULL, diff --git a/testcases/kernel/syscalls/sigpending/sigpending02.c b/testcases/kernel/syscalls/sigpending/sigpending02.c index ed0b2d174..21a5f92c3 100644 --- a/testcases/kernel/syscalls/sigpending/sigpending02.c +++ b/testcases/kernel/syscalls/sigpending/sigpending02.c @@ -67,13 +67,9 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; sigset_t *sigset; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c b/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c index ab825f3d7..20fca523f 100644 --- a/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c +++ b/testcases/kernel/syscalls/sigprocmask/sigprocmask01.c @@ -97,14 +97,9 @@ sigset_t sigset2; int main(int ac, char **av) { int lc; - const char *msg; pid_t my_pid; /* test process id */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - /*NOTREACED*/} + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sigrelse/sigrelse01.c b/testcases/kernel/syscalls/sigrelse/sigrelse01.c index 693172986..f94ba3534 100644 --- a/testcases/kernel/syscalls/sigrelse/sigrelse01.c +++ b/testcases/kernel/syscalls/sigrelse/sigrelse01.c @@ -183,7 +183,6 @@ static int sig_array[NUMSIGS]; int main(int argc, char **argv) { int lc; - const char *msg; /* gcc -Wall complains about sig_caught not being ref'd because of the external declarations. */ @@ -192,10 +191,7 @@ int main(int argc, char **argv) /* * parse standard options */ - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX maybe_run_child(&child, "dd", &pipe_fd[1], &pipe_fd2[0]); #endif diff --git a/testcases/kernel/syscalls/sigsuspend/sigsuspend01.c b/testcases/kernel/syscalls/sigsuspend/sigsuspend01.c index a0441577b..b84f9865e 100644 --- a/testcases/kernel/syscalls/sigsuspend/sigsuspend01.c +++ b/testcases/kernel/syscalls/sigsuspend/sigsuspend01.c @@ -94,10 +94,8 @@ void sig_handler(int sig); /* signal catching function */ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c index 49f7a889f..1cc391856 100644 --- a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c +++ b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c @@ -446,10 +446,8 @@ int main(int argc, char **argv) { unsigned i; int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/socket/socket01.c b/testcases/kernel/syscalls/socket/socket01.c index ba206c3fd..f471d8b7a 100644 --- a/testcases/kernel/syscalls/socket/socket01.c +++ b/testcases/kernel/syscalls/socket/socket01.c @@ -83,13 +83,9 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); int main(int argc, char *argv[]) { int lc; - const char *msg; int s; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/socket/socket02.c b/testcases/kernel/syscalls/socket/socket02.c index f4dceaf26..259f0e3a9 100644 --- a/testcases/kernel/syscalls/socket/socket02.c +++ b/testcases/kernel/syscalls/socket/socket02.c @@ -131,12 +131,8 @@ int main(int argc, char *argv[]) { int fd, fds[2], i, coe; int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); if ((tst_kvercmp(2, 6, 27)) < 0) { tst_brkm(TCONF, NULL, diff --git a/testcases/kernel/syscalls/socket/socket03.c b/testcases/kernel/syscalls/socket/socket03.c index aad524a84..2f069f23c 100644 --- a/testcases/kernel/syscalls/socket/socket03.c +++ b/testcases/kernel/syscalls/socket/socket03.c @@ -118,12 +118,8 @@ int main(int argc, char *argv[]) { int fd, fl; int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); if ((tst_kvercmp(2, 6, 27)) < 0) { tst_brkm(TCONF, NULL, diff --git a/testcases/kernel/syscalls/socketcall/socketcall01.c b/testcases/kernel/syscalls/socketcall/socketcall01.c index 01ad0f57a..d439729f4 100644 --- a/testcases/kernel/syscalls/socketcall/socketcall01.c +++ b/testcases/kernel/syscalls/socketcall/socketcall01.c @@ -104,12 +104,9 @@ int TST_TOTAL = sizeof(TC) / sizeof(TC[0]); int main(int ac, char **av) { int lc; - const char *msg; int i; /* s is socket descriptor */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/socketcall/socketcall02.c b/testcases/kernel/syscalls/socketcall/socketcall02.c index 0be1c53b7..cec0246a6 100644 --- a/testcases/kernel/syscalls/socketcall/socketcall02.c +++ b/testcases/kernel/syscalls/socketcall/socketcall02.c @@ -102,11 +102,8 @@ PF_INET, SOCK_STREAM, 0}, -1, EINVAL, "invalid call"}; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/socketcall/socketcall03.c b/testcases/kernel/syscalls/socketcall/socketcall03.c index 49ee1c2c1..244a28678 100644 --- a/testcases/kernel/syscalls/socketcall/socketcall03.c +++ b/testcases/kernel/syscalls/socketcall/socketcall03.c @@ -102,11 +102,8 @@ AF_INET, SOCK_STREAM, 6, SYS_BIND, setup1, "bind call"}; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/socketcall/socketcall04.c b/testcases/kernel/syscalls/socketcall/socketcall04.c index a2f940cc4..584c8f37a 100644 --- a/testcases/kernel/syscalls/socketcall/socketcall04.c +++ b/testcases/kernel/syscalls/socketcall/socketcall04.c @@ -102,11 +102,8 @@ AF_INET, SOCK_STREAM, 6, SYS_LISTEN, setup1, "listen call"}; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/socketpair/socketpair01.c b/testcases/kernel/syscalls/socketpair/socketpair01.c index 72c56a24a..3a045b711 100644 --- a/testcases/kernel/syscalls/socketpair/socketpair01.c +++ b/testcases/kernel/syscalls/socketpair/socketpair01.c @@ -93,11 +93,9 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); int main(int argc, char *argv[]) { int lc; - const char *msg; int s; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sockioctl/sockioctl01.c b/testcases/kernel/syscalls/sockioctl/sockioctl01.c index 7fb384d56..50bdc935a 100644 --- a/testcases/kernel/syscalls/sockioctl/sockioctl01.c +++ b/testcases/kernel/syscalls/sockioctl/sockioctl01.c @@ -120,11 +120,8 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); int main(int argc, char *argv[]) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/splice/splice01.c b/testcases/kernel/syscalls/splice/splice01.c index 2c4f429b1..ce880b93a 100644 --- a/testcases/kernel/syscalls/splice/splice01.c +++ b/testcases/kernel/syscalls/splice/splice01.c @@ -54,10 +54,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL))) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/splice/splice03.c b/testcases/kernel/syscalls/splice/splice03.c index b80ac2755..b18c52a46 100644 --- a/testcases/kernel/syscalls/splice/splice03.c +++ b/testcases/kernel/syscalls/splice/splice03.c @@ -84,11 +84,8 @@ int TST_TOTAL = ARRAY_SIZE(test_cases); int main(int ac, char **av) { int i, lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ssetmask/ssetmask01.c b/testcases/kernel/syscalls/ssetmask/ssetmask01.c index 296532033..d0246969e 100644 --- a/testcases/kernel/syscalls/ssetmask/ssetmask01.c +++ b/testcases/kernel/syscalls/ssetmask/ssetmask01.c @@ -104,11 +104,8 @@ void setup(void) int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/stat/stat01.c b/testcases/kernel/syscalls/stat/stat01.c index 3f0d13cf9..5dfb88edd 100644 --- a/testcases/kernel/syscalls/stat/stat01.c +++ b/testcases/kernel/syscalls/stat/stat01.c @@ -78,10 +78,8 @@ int main(int ac, char **av) { struct stat stat_buf; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/stat/stat02.c b/testcases/kernel/syscalls/stat/stat02.c index 5271b9fbd..2cf726fe6 100644 --- a/testcases/kernel/syscalls/stat/stat02.c +++ b/testcases/kernel/syscalls/stat/stat02.c @@ -100,10 +100,8 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat structure buffer */ int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/stat/stat03.c b/testcases/kernel/syscalls/stat/stat03.c index 680e69ab0..f78fd9404 100644 --- a/testcases/kernel/syscalls/stat/stat03.c +++ b/testcases/kernel/syscalls/stat/stat03.c @@ -137,13 +137,11 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat structure buffer */ int lc; - const char *msg; char *file_name; /* ptr. for file name whose mode is modified */ char *test_desc; /* test specific error message */ int ind; /* counter to test different test conditions */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* * Invoke setup function to call individual test setup functions diff --git a/testcases/kernel/syscalls/stat/stat05.c b/testcases/kernel/syscalls/stat/stat05.c index 21b4d2175..b6929883d 100644 --- a/testcases/kernel/syscalls/stat/stat05.c +++ b/testcases/kernel/syscalls/stat/stat05.c @@ -130,10 +130,8 @@ struct stat statter; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/stat/stat06.c b/testcases/kernel/syscalls/stat/stat06.c index 0ddf73003..c6f11a3cc 100644 --- a/testcases/kernel/syscalls/stat/stat06.c +++ b/testcases/kernel/syscalls/stat/stat06.c @@ -175,7 +175,6 @@ int TST_TOTAL = ARRAY_SIZE(Test_cases); int main(int ac, char **av) { int lc; - const char *msg; char *fname; char *desc; int ind; @@ -185,9 +184,7 @@ int main(int ac, char **av) /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/statfs/statfs01.c b/testcases/kernel/syscalls/statfs/statfs01.c index 7f9ab56ea..12ddb9cb8 100644 --- a/testcases/kernel/syscalls/statfs/statfs01.c +++ b/testcases/kernel/syscalls/statfs/statfs01.c @@ -130,13 +130,8 @@ struct statfs stats; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/statfs/statfs02.c b/testcases/kernel/syscalls/statfs/statfs02.c index 9e9b59d97..279665f86 100644 --- a/testcases/kernel/syscalls/statfs/statfs02.c +++ b/testcases/kernel/syscalls/statfs/statfs02.c @@ -77,12 +77,9 @@ static void statfs_verify(const struct test_case_t *); int main(int ac, char **av) { int lc; - const char *msg; int i; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/statfs/statfs03.c b/testcases/kernel/syscalls/statfs/statfs03.c index aedeaf351..031b8d170 100644 --- a/testcases/kernel/syscalls/statfs/statfs03.c +++ b/testcases/kernel/syscalls/statfs/statfs03.c @@ -73,10 +73,8 @@ void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/statvfs/statvfs01.c b/testcases/kernel/syscalls/statvfs/statvfs01.c index 84dd0acc5..1523058e7 100644 --- a/testcases/kernel/syscalls/statvfs/statvfs01.c +++ b/testcases/kernel/syscalls/statvfs/statvfs01.c @@ -42,10 +42,8 @@ int main(int ac, char **av) { struct statvfs buf; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/statvfs/statvfs02.c b/testcases/kernel/syscalls/statvfs/statvfs02.c index e7ad99023..927cedc6e 100644 --- a/testcases/kernel/syscalls/statvfs/statvfs02.c +++ b/testcases/kernel/syscalls/statvfs/statvfs02.c @@ -61,11 +61,8 @@ static void statvfs_verify(const struct test_case_t *); int main(int argc, char **argv) { int i, lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/stime/stime01.c b/testcases/kernel/syscalls/stime/stime01.c index 64b684268..869815207 100644 --- a/testcases/kernel/syscalls/stime/stime01.c +++ b/testcases/kernel/syscalls/stime/stime01.c @@ -93,13 +93,8 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/stime/stime02.c b/testcases/kernel/syscalls/stime/stime02.c index a812dc33d..a19fc1e7c 100644 --- a/testcases/kernel/syscalls/stime/stime02.c +++ b/testcases/kernel/syscalls/stime/stime02.c @@ -92,13 +92,8 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/swapoff/swapoff01.c b/testcases/kernel/syscalls/swapoff/swapoff01.c index 6a23de1f6..fdabe487a 100644 --- a/testcases/kernel/syscalls/swapoff/swapoff01.c +++ b/testcases/kernel/syscalls/swapoff/swapoff01.c @@ -39,10 +39,8 @@ static long fs_type; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/swapoff/swapoff02.c b/testcases/kernel/syscalls/swapoff/swapoff02.c index fffddc420..b3cbd409c 100644 --- a/testcases/kernel/syscalls/swapoff/swapoff02.c +++ b/testcases/kernel/syscalls/swapoff/swapoff02.c @@ -61,10 +61,8 @@ static struct test_case_t { int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/swapon/swapon01.c b/testcases/kernel/syscalls/swapon/swapon01.c index cda8ec254..523b80d32 100644 --- a/testcases/kernel/syscalls/swapon/swapon01.c +++ b/testcases/kernel/syscalls/swapon/swapon01.c @@ -61,10 +61,8 @@ int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/swapon/swapon02.c b/testcases/kernel/syscalls/swapon/swapon02.c index db74ba977..d10885b25 100644 --- a/testcases/kernel/syscalls/swapon/swapon02.c +++ b/testcases/kernel/syscalls/swapon/swapon02.c @@ -95,10 +95,8 @@ static void verify_swapon(struct test_case_t *test) int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/swapon/swapon03.c b/testcases/kernel/syscalls/swapon/swapon03.c index 93276eb1e..f85c31020 100644 --- a/testcases/kernel/syscalls/swapon/swapon03.c +++ b/testcases/kernel/syscalls/swapon/swapon03.c @@ -69,10 +69,8 @@ int expected_errno = EPERM; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/symlink/symlink01.c b/testcases/kernel/syscalls/symlink/symlink01.c index 36eb7da80..61c4541e3 100644 --- a/testcases/kernel/syscalls/symlink/symlink01.c +++ b/testcases/kernel/syscalls/symlink/symlink01.c @@ -518,15 +518,8 @@ int main(int argc, char *argv[]) { struct tcses *tcs_ptr; int lc; - const char *msg; - /*************************************************************** - * parse standard options, and exit if there is an error - ***************************************************************/ - if ((msg = parse_opts(argc, argv, Options, &help)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(argc, argv, Options, &help); /* * If the -T option was used, use that TCID or use the default diff --git a/testcases/kernel/syscalls/symlink/symlink02.c b/testcases/kernel/syscalls/symlink/symlink02.c index ec1250bd7..45aaef380 100644 --- a/testcases/kernel/syscalls/symlink/symlink02.c +++ b/testcases/kernel/syscalls/symlink/symlink02.c @@ -128,13 +128,11 @@ int fd; int main(int ac, char **av) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/symlink/symlink03.c b/testcases/kernel/syscalls/symlink/symlink03.c index 5df790f37..78f31648e 100644 --- a/testcases/kernel/syscalls/symlink/symlink03.c +++ b/testcases/kernel/syscalls/symlink/symlink03.c @@ -149,17 +149,12 @@ void cleanup(); int main(int ac, char **av) { int lc; - const char *msg; char *test_file; /* testfile name */ char *sym_file; /* symbolic link file name */ char *test_desc; /* test specific error message */ int ind; /* counter to test different test conditions */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); /* * Invoke setup function to call individual test setup functions diff --git a/testcases/kernel/syscalls/symlink/symlink04.c b/testcases/kernel/syscalls/symlink/symlink04.c index 11174fee2..8c978d8e5 100644 --- a/testcases/kernel/syscalls/symlink/symlink04.c +++ b/testcases/kernel/syscalls/symlink/symlink04.c @@ -91,13 +91,8 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat structure buffer */ int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/symlink/symlink05.c b/testcases/kernel/syscalls/symlink/symlink05.c index 242e48740..3986f42e4 100644 --- a/testcases/kernel/syscalls/symlink/symlink05.c +++ b/testcases/kernel/syscalls/symlink/symlink05.c @@ -91,13 +91,8 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat structure buffer */ int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/symlinkat/symlinkat01.c b/testcases/kernel/syscalls/symlinkat/symlinkat01.c index 156667df2..5c238d829 100644 --- a/testcases/kernel/syscalls/symlinkat/symlinkat01.c +++ b/testcases/kernel/syscalls/symlinkat/symlinkat01.c @@ -140,7 +140,6 @@ static int mysymlinkat(const char *oldfilename, int main(int ac, char **av) { int lc; - const char *msg; int i; /* Disable test if the version of the kernel is less than 2.6.16 */ @@ -150,8 +149,7 @@ int main(int ac, char **av) exit(0); } - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sync/sync01.c b/testcases/kernel/syscalls/sync/sync01.c index 4f09cdabd..dd0a336c2 100644 --- a/testcases/kernel/syscalls/sync/sync01.c +++ b/testcases/kernel/syscalls/sync/sync01.c @@ -123,13 +123,11 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/sync/sync02.c b/testcases/kernel/syscalls/sync/sync02.c index 24e15109f..d4fd94c0e 100644 --- a/testcases/kernel/syscalls/sync/sync02.c +++ b/testcases/kernel/syscalls/sync/sync02.c @@ -91,11 +91,9 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; char read_buffer[BUFSIZ]; /* buffer used to read data from file */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c b/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c index 33d2e31e9..935786b7c 100644 --- a/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c +++ b/testcases/kernel/syscalls/sync_file_range/sync_file_range01.c @@ -245,10 +245,8 @@ int main(int ac, char **av) { int test_index = 0; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #if defined(__powerpc__) || defined(__powerpc64__) /* for PPC, kernel version > 2.6.21 needed */ if (tst_kvercmp(2, 16, 22) < 0) { diff --git a/testcases/kernel/syscalls/sysctl/sysctl01.c b/testcases/kernel/syscalls/sysctl/sysctl01.c index b8900ad3f..fe6290514 100644 --- a/testcases/kernel/syscalls/sysctl/sysctl01.c +++ b/testcases/kernel/syscalls/sysctl/sysctl01.c @@ -99,14 +99,12 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; int i; char *comp_string; comp_string = NULL; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sysctl/sysctl03.c b/testcases/kernel/syscalls/sysctl/sysctl03.c index b0cff4362..88890b6d8 100644 --- a/testcases/kernel/syscalls/sysctl/sysctl03.c +++ b/testcases/kernel/syscalls/sysctl/sysctl03.c @@ -96,7 +96,6 @@ int main(int ac, char **av) { int exp_eno; int lc; - const char *msg; char osname[OSNAMESZ]; int osnamelth, status; @@ -104,9 +103,7 @@ int main(int ac, char **av) pid_t pid; struct passwd *ltpuser; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sysctl/sysctl04.c b/testcases/kernel/syscalls/sysctl/sysctl04.c index 861b0214a..ff633640a 100644 --- a/testcases/kernel/syscalls/sysctl/sysctl04.c +++ b/testcases/kernel/syscalls/sysctl/sysctl04.c @@ -88,16 +88,13 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; char osname[OSNAMESZ]; int i; size_t osnamelth; int name[] = { CTL_KERN, KERN_OSREV }; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sysctl/sysctl05.c b/testcases/kernel/syscalls/sysctl/sysctl05.c index 1542a7abb..e6f09b2dc 100644 --- a/testcases/kernel/syscalls/sysctl/sysctl05.c +++ b/testcases/kernel/syscalls/sysctl/sysctl05.c @@ -103,13 +103,10 @@ struct testcases { int main(int ac, char **av) { int lc; - const char *msg; int i; int ret = 0; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sysfs/sysfs01.c b/testcases/kernel/syscalls/sysfs/sysfs01.c index 3121fe5b9..11ebe43d8 100644 --- a/testcases/kernel/syscalls/sysfs/sysfs01.c +++ b/testcases/kernel/syscalls/sysfs/sysfs01.c @@ -80,10 +80,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sysfs/sysfs02.c b/testcases/kernel/syscalls/sysfs/sysfs02.c index ae3f533eb..f7cb96a6f 100644 --- a/testcases/kernel/syscalls/sysfs/sysfs02.c +++ b/testcases/kernel/syscalls/sysfs/sysfs02.c @@ -78,11 +78,9 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; char buf[40]; /* 40 bytes suffice to store fs name */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sysfs/sysfs03.c b/testcases/kernel/syscalls/sysfs/sysfs03.c index 887b841d1..59b997e60 100644 --- a/testcases/kernel/syscalls/sysfs/sysfs03.c +++ b/testcases/kernel/syscalls/sysfs/sysfs03.c @@ -78,10 +78,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sysfs/sysfs04.c b/testcases/kernel/syscalls/sysfs/sysfs04.c index f141e72d6..f4fda362b 100644 --- a/testcases/kernel/syscalls/sysfs/sysfs04.c +++ b/testcases/kernel/syscalls/sysfs/sysfs04.c @@ -82,10 +82,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sysfs/sysfs05.c b/testcases/kernel/syscalls/sysfs/sysfs05.c index 116d6c765..e97f0c8f2 100644 --- a/testcases/kernel/syscalls/sysfs/sysfs05.c +++ b/testcases/kernel/syscalls/sysfs/sysfs05.c @@ -96,10 +96,8 @@ int TST_TOTAL = ARRAY_SIZE(testcase); int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sysfs/sysfs06.c b/testcases/kernel/syscalls/sysfs/sysfs06.c index 07e0d2aa3..121e944ab 100644 --- a/testcases/kernel/syscalls/sysfs/sysfs06.c +++ b/testcases/kernel/syscalls/sysfs/sysfs06.c @@ -99,10 +99,8 @@ char *bad_addr = 0; int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo01.c b/testcases/kernel/syscalls/sysinfo/sysinfo01.c index 672c44ebe..2ea44a2be 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo01.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo01.c @@ -83,15 +83,12 @@ int main(int ac, char **av) { struct sysinfo *sys_buf; int lc; - const char *msg; float l1, l2, l3; unsigned long l1_up, l2_up, l3_up; sys_buf = malloc(sizeof(struct sysinfo)); - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* Global setup */ diff --git a/testcases/kernel/syscalls/sysinfo/sysinfo02.c b/testcases/kernel/syscalls/sysinfo/sysinfo02.c index 924ee6ff9..678b8f1d3 100644 --- a/testcases/kernel/syscalls/sysinfo/sysinfo02.c +++ b/testcases/kernel/syscalls/sysinfo/sysinfo02.c @@ -84,13 +84,10 @@ int main(int ac, char **av) { struct sysinfo *sysinfo_buf; int lc; - const char *msg; sysinfo_buf = (void *)INVALID_ADDRESS; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* Global setup */ diff --git a/testcases/kernel/syscalls/syslog/syslog11.c b/testcases/kernel/syscalls/syslog/syslog11.c index 725257bcd..8f5337891 100644 --- a/testcases/kernel/syscalls/syslog/syslog11.c +++ b/testcases/kernel/syscalls/syslog/syslog11.c @@ -117,11 +117,8 @@ int TST_TOTAL = sizeof(tdat) / sizeof(tdat[0]); int main(int argc, char **argv) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); for (lc = 0; TEST_LOOPING(lc); lc++) { diff --git a/testcases/kernel/syscalls/syslog/syslog12.c b/testcases/kernel/syscalls/syslog/syslog12.c index 0571f7c32..9e7300b82 100644 --- a/testcases/kernel/syscalls/syslog/syslog12.c +++ b/testcases/kernel/syscalls/syslog/syslog12.c @@ -126,13 +126,10 @@ void timeout(int sig) int main(int argc, char **argv) { int lc; - const char *msg; struct sigaction sa; int ret; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/tee/tee01.c b/testcases/kernel/syscalls/tee/tee01.c index 1fd0794af..1b7f9c7e6 100644 --- a/testcases/kernel/syscalls/tee/tee01.c +++ b/testcases/kernel/syscalls/tee/tee01.c @@ -57,10 +57,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/tee/tee02.c b/testcases/kernel/syscalls/tee/tee02.c index 257da61c6..2173cd23c 100644 --- a/testcases/kernel/syscalls/tee/tee02.c +++ b/testcases/kernel/syscalls/tee/tee02.c @@ -64,11 +64,8 @@ int TST_TOTAL = ARRAY_SIZE(test_cases); int main(int ac, char **av) { int i, lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/time/time01.c b/testcases/kernel/syscalls/time/time01.c index dec283b0d..616a21fa8 100644 --- a/testcases/kernel/syscalls/time/time01.c +++ b/testcases/kernel/syscalls/time/time01.c @@ -124,10 +124,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/time/time02.c b/testcases/kernel/syscalls/time/time02.c index 023131174..137a3fda4 100644 --- a/testcases/kernel/syscalls/time/time02.c +++ b/testcases/kernel/syscalls/time/time02.c @@ -86,11 +86,9 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; time_t tloc; /* time_t variables for time(2) */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c b/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c index c988c07bf..d186c1f04 100644 --- a/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c +++ b/testcases/kernel/syscalls/timer_getoverrun/timer_getoverrun01.c @@ -47,12 +47,10 @@ static void setup(void) int main(int ac, char **av) { int lc; - const char *msg; int timer; struct sigevent ev; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c b/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c index 238447278..b583aee48 100644 --- a/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c +++ b/testcases/kernel/syscalls/timer_gettime/timer_gettime01.c @@ -46,14 +46,12 @@ static void setup(void) int main(int ac, char **av) { int lc; - const char *msg; struct sigevent ev; struct itimerspec spec; int timer; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/timerfd/timerfd02.c b/testcases/kernel/syscalls/timerfd/timerfd02.c index 114fe4a0f..006ef165f 100644 --- a/testcases/kernel/syscalls/timerfd/timerfd02.c +++ b/testcases/kernel/syscalls/timerfd/timerfd02.c @@ -126,12 +126,8 @@ int main(int argc, char *argv[]) { int fd, coe; int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); if ((tst_kvercmp(2, 6, 27)) < 0) { tst_brkm(TCONF, NULL, diff --git a/testcases/kernel/syscalls/timerfd/timerfd03.c b/testcases/kernel/syscalls/timerfd/timerfd03.c index 0bf234abb..dc8efd46f 100644 --- a/testcases/kernel/syscalls/timerfd/timerfd03.c +++ b/testcases/kernel/syscalls/timerfd/timerfd03.c @@ -122,12 +122,8 @@ int main(int argc, char *argv[]) { int fd, fl; int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); if ((tst_kvercmp(2, 6, 27)) < 0) { tst_brkm(TCONF, NULL, diff --git a/testcases/kernel/syscalls/timerfd/timerfd_create01.c b/testcases/kernel/syscalls/timerfd/timerfd_create01.c index ac8776436..b9fe38954 100644 --- a/testcases/kernel/syscalls/timerfd/timerfd_create01.c +++ b/testcases/kernel/syscalls/timerfd/timerfd_create01.c @@ -48,12 +48,9 @@ static void cleanup(void); int main(int argc, char *argv[]) { int lc; - const char *msg; int i; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/timerfd/timerfd_gettime01.c b/testcases/kernel/syscalls/timerfd/timerfd_gettime01.c index fa86f289d..5f3240bdc 100644 --- a/testcases/kernel/syscalls/timerfd/timerfd_gettime01.c +++ b/testcases/kernel/syscalls/timerfd/timerfd_gettime01.c @@ -57,12 +57,9 @@ static void cleanup(void); int main(int argc, char *argv[]) { int lc; - const char *msg; int i; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/timerfd/timerfd_settime01.c b/testcases/kernel/syscalls/timerfd/timerfd_settime01.c index 1c4719519..2e65d23ae 100644 --- a/testcases/kernel/syscalls/timerfd/timerfd_settime01.c +++ b/testcases/kernel/syscalls/timerfd/timerfd_settime01.c @@ -61,12 +61,9 @@ static struct itimerspec new_value; int main(int argc, char *argv[]) { int lc; - const char *msg; int i; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/times/times01.c b/testcases/kernel/syscalls/times/times01.c index 265941f51..293a52957 100644 --- a/testcases/kernel/syscalls/times/times01.c +++ b/testcases/kernel/syscalls/times/times01.c @@ -127,10 +127,8 @@ struct tms mytimes; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/times/times03.c b/testcases/kernel/syscalls/times/times03.c index 24bb61c8c..9234a63fc 100644 --- a/testcases/kernel/syscalls/times/times03.c +++ b/testcases/kernel/syscalls/times/times03.c @@ -67,15 +67,12 @@ void cleanup(void); int main(int argc, char **argv) { - const char *msg; - struct tms buf1, buf2; time_t start_time, end_time; int pid2, status; struct sigaction sa; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/tkill/tkill01.c b/testcases/kernel/syscalls/tkill/tkill01.c index 6e21ba036..d4100dcc4 100644 --- a/testcases/kernel/syscalls/tkill/tkill01.c +++ b/testcases/kernel/syscalls/tkill/tkill01.c @@ -78,10 +78,8 @@ int main(int ac, char **av) { int tid; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/truncate/truncate01.c b/testcases/kernel/syscalls/truncate/truncate01.c index 190997af1..68e2e4910 100644 --- a/testcases/kernel/syscalls/truncate/truncate01.c +++ b/testcases/kernel/syscalls/truncate/truncate01.c @@ -94,14 +94,9 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat(2) struct contents */ int lc; - const char *msg; off_t file_length; /* test file length */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/truncate/truncate02.c b/testcases/kernel/syscalls/truncate/truncate02.c index 82fdfcc13..6b26fa848 100644 --- a/testcases/kernel/syscalls/truncate/truncate02.c +++ b/testcases/kernel/syscalls/truncate/truncate02.c @@ -97,18 +97,13 @@ int main(int ac, char **av) { struct stat stat_buf; /* stat(2) struct contents */ int lc, i; - const char *msg; off_t file_length2; /* test file length */ off_t file_length1; /* test file length */ int rbytes; /* bytes read from testfile */ int read_len = 0; /* total no. of bytes read from testfile */ int err_flag = 0; /* error indicator flag */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/truncate/truncate03.c b/testcases/kernel/syscalls/truncate/truncate03.c index dd5ad4905..e8fdae3dd 100644 --- a/testcases/kernel/syscalls/truncate/truncate03.c +++ b/testcases/kernel/syscalls/truncate/truncate03.c @@ -97,11 +97,8 @@ int TST_TOTAL = ARRAY_SIZE(test_cases); int main(int ac, char **av) { int i, lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ulimit/ulimit01.c b/testcases/kernel/syscalls/ulimit/ulimit01.c index f4a24ca6f..74dea91cd 100644 --- a/testcases/kernel/syscalls/ulimit/ulimit01.c +++ b/testcases/kernel/syscalls/ulimit/ulimit01.c @@ -154,7 +154,6 @@ int main(int ac, char **av) { int lc; int i; - const char *msg; int tmp; TST_TOTAL = sizeof(Scenarios) / sizeof(struct limits_t); @@ -162,9 +161,7 @@ int main(int ac, char **av) /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/umask/umask01.c b/testcases/kernel/syscalls/umask/umask01.c index 88e2fd1cb..8f0b60acb 100644 --- a/testcases/kernel/syscalls/umask/umask01.c +++ b/testcases/kernel/syscalls/umask/umask01.c @@ -125,10 +125,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/umask/umask02.c b/testcases/kernel/syscalls/umask/umask02.c index 7e8379603..0ba797c2e 100644 --- a/testcases/kernel/syscalls/umask/umask02.c +++ b/testcases/kernel/syscalls/umask/umask02.c @@ -61,14 +61,11 @@ void cleanup(void); int main(int argc, char **argv) { int lc; - const char *msg; int uret = 0, i, mskval = 0000; int failcnt = 0; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/umask/umask03.c b/testcases/kernel/syscalls/umask/umask03.c index 9e2ed2433..e10009c0f 100644 --- a/testcases/kernel/syscalls/umask/umask03.c +++ b/testcases/kernel/syscalls/umask/umask03.c @@ -64,7 +64,6 @@ void cleanup(void); int main(int argc, char **argv) { int lc; - const char *msg; struct stat statbuf; int mskval = 0000; @@ -72,8 +71,7 @@ int main(int argc, char **argv) int fildes, i; unsigned low9mode; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/umount/umount01.c b/testcases/kernel/syscalls/umount/umount01.c index cc677b7e5..3c25b564f 100644 --- a/testcases/kernel/syscalls/umount/umount01.c +++ b/testcases/kernel/syscalls/umount/umount01.c @@ -42,10 +42,8 @@ static const char *device; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/umount/umount02.c b/testcases/kernel/syscalls/umount/umount02.c index 113003015..7f172f487 100644 --- a/testcases/kernel/syscalls/umount/umount02.c +++ b/testcases/kernel/syscalls/umount/umount02.c @@ -71,10 +71,8 @@ int TST_TOTAL = ARRAY_SIZE(testcases); int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL))) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/umount/umount03.c b/testcases/kernel/syscalls/umount/umount03.c index 03a8be065..8d87ddd69 100644 --- a/testcases/kernel/syscalls/umount/umount03.c +++ b/testcases/kernel/syscalls/umount/umount03.c @@ -53,10 +53,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/uname/uname01.c b/testcases/kernel/syscalls/uname/uname01.c index 3c3af98b6..6b4e655e6 100644 --- a/testcases/kernel/syscalls/uname/uname01.c +++ b/testcases/kernel/syscalls/uname/uname01.c @@ -126,10 +126,8 @@ struct utsname un; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/uname/uname02.c b/testcases/kernel/syscalls/uname/uname02.c index e6e59e3b9..8b45a763d 100644 --- a/testcases/kernel/syscalls/uname/uname02.c +++ b/testcases/kernel/syscalls/uname/uname02.c @@ -67,10 +67,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/uname/uname03.c b/testcases/kernel/syscalls/uname/uname03.c index 21dc3abed..2f6292f0a 100644 --- a/testcases/kernel/syscalls/uname/uname03.c +++ b/testcases/kernel/syscalls/uname/uname03.c @@ -68,12 +68,9 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; struct utsname *buf; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); /* global setup */ diff --git a/testcases/kernel/syscalls/unlink/unlink05.c b/testcases/kernel/syscalls/unlink/unlink05.c index 184d0ef71..f0be94c2a 100644 --- a/testcases/kernel/syscalls/unlink/unlink05.c +++ b/testcases/kernel/syscalls/unlink/unlink05.c @@ -129,13 +129,11 @@ int fd; int main(int ac, char **av) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/unlink/unlink06.c b/testcases/kernel/syscalls/unlink/unlink06.c index ede348ab8..174794d14 100644 --- a/testcases/kernel/syscalls/unlink/unlink06.c +++ b/testcases/kernel/syscalls/unlink/unlink06.c @@ -133,15 +133,11 @@ char Fname[255]; int main(int ac, char **av) { int lc; - const char *msg; /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/unlink/unlink07.c b/testcases/kernel/syscalls/unlink/unlink07.c index 25ca4de38..d5ce6a355 100644 --- a/testcases/kernel/syscalls/unlink/unlink07.c +++ b/testcases/kernel/syscalls/unlink/unlink07.c @@ -170,7 +170,6 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; char *fname; char *desc; int ind; @@ -178,9 +177,7 @@ int main(int ac, char **av) /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/unlink/unlink08.c b/testcases/kernel/syscalls/unlink/unlink08.c index d87423ee8..8539d6a2a 100644 --- a/testcases/kernel/syscalls/unlink/unlink08.c +++ b/testcases/kernel/syscalls/unlink/unlink08.c @@ -158,7 +158,6 @@ struct test_case_t { int main(int ac, char **av) { int lc; - const char *msg; char *fname; char *desc; int ind; @@ -166,9 +165,7 @@ int main(int ac, char **av) /*************************************************************** * parse standard options ***************************************************************/ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); /*************************************************************** * perform global setup for test diff --git a/testcases/kernel/syscalls/unlinkat/unlinkat01.c b/testcases/kernel/syscalls/unlinkat/unlinkat01.c index ab255aa2c..31fe4e758 100644 --- a/testcases/kernel/syscalls/unlinkat/unlinkat01.c +++ b/testcases/kernel/syscalls/unlinkat/unlinkat01.c @@ -78,7 +78,6 @@ int myunlinkat(int dirfd, const char *filename, int flags) int main(int ac, char **av) { int lc; - const char *msg; int i; /* Disable test if the version of the kernel is less than 2.6.16 */ @@ -88,8 +87,7 @@ int main(int ac, char **av) exit(0); } - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/unshare/unshare01.c b/testcases/kernel/syscalls/unshare/unshare01.c index bc94b7683..17a5a5f15 100644 --- a/testcases/kernel/syscalls/unshare/unshare01.c +++ b/testcases/kernel/syscalls/unshare/unshare01.c @@ -155,10 +155,8 @@ int main(int ac, char **av) pid_t pid1; int lc; int rval; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/unshare/unshare02.c b/testcases/kernel/syscalls/unshare/unshare02.c index 2a9d80bfd..d3e303e0e 100644 --- a/testcases/kernel/syscalls/unshare/unshare02.c +++ b/testcases/kernel/syscalls/unshare/unshare02.c @@ -120,10 +120,8 @@ int main(int ac, char **av) pid_t pid1; int lc; int rval; - const char *msg; /* message TEST_RETURNurned from parse_opts */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ustat/ustat01.c b/testcases/kernel/syscalls/ustat/ustat01.c index 683855029..053ab75b0 100644 --- a/testcases/kernel/syscalls/ustat/ustat01.c +++ b/testcases/kernel/syscalls/ustat/ustat01.c @@ -39,10 +39,8 @@ static struct ustat ubuf; int main(int argc, char *argv[]) { int lc, i; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/ustat/ustat02.c b/testcases/kernel/syscalls/ustat/ustat02.c index 0569ea4eb..c76bd527a 100644 --- a/testcases/kernel/syscalls/ustat/ustat02.c +++ b/testcases/kernel/syscalls/ustat/ustat02.c @@ -56,10 +56,8 @@ int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/utime/utime01.c b/testcases/kernel/syscalls/utime/utime01.c index b1c325c7f..8ff1e3c2c 100644 --- a/testcases/kernel/syscalls/utime/utime01.c +++ b/testcases/kernel/syscalls/utime/utime01.c @@ -99,15 +99,10 @@ int main(int ac, char **av) struct stat stat_buf; /* struct buffer to hold file info. */ int lc; long type; - const char *msg; time_t modf_time, access_time; time_t pres_time; /* file modification/access/present time */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/utime/utime02.c b/testcases/kernel/syscalls/utime/utime02.c index 613a7d8de..2c93a04a3 100644 --- a/testcases/kernel/syscalls/utime/utime02.c +++ b/testcases/kernel/syscalls/utime/utime02.c @@ -105,15 +105,10 @@ int main(int ac, char **av) struct stat stat_buf; /* struct buffer to hold file info. */ int lc; long type; - const char *msg; time_t modf_time, access_time; time_t pres_time; /* file modification/access/present time */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/utime/utime03.c b/testcases/kernel/syscalls/utime/utime03.c index eb78d5453..b609e2371 100644 --- a/testcases/kernel/syscalls/utime/utime03.c +++ b/testcases/kernel/syscalls/utime/utime03.c @@ -114,16 +114,11 @@ int main(int ac, char **av) struct stat stat_buf; /* struct buffer to hold file info. */ int lc; long type; - const char *msg; time_t modf_time, access_time; time_t pres_time; /* file modification/access/present time */ pid_t pid; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/utime/utime04.c b/testcases/kernel/syscalls/utime/utime04.c index 7e3b02b56..11dcd006f 100644 --- a/testcases/kernel/syscalls/utime/utime04.c +++ b/testcases/kernel/syscalls/utime/utime04.c @@ -97,15 +97,10 @@ int main(int ac, char **av) { struct stat stat_buf; /* struct buffer to hold file info. */ int lc; - const char *msg; time_t modf_time, access_time; /* file modification/access time */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/utime/utime05.c b/testcases/kernel/syscalls/utime/utime05.c index ae6da69f2..baa7ca4f6 100644 --- a/testcases/kernel/syscalls/utime/utime05.c +++ b/testcases/kernel/syscalls/utime/utime05.c @@ -103,15 +103,10 @@ int main(int ac, char **av) { struct stat stat_buf; /* struct buffer to hold file info. */ int lc; - const char *msg; time_t modf_time, access_time; /* file modification/access time */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/utime/utime06.c b/testcases/kernel/syscalls/utime/utime06.c index 41a6e1237..6e666b2c8 100644 --- a/testcases/kernel/syscalls/utime/utime06.c +++ b/testcases/kernel/syscalls/utime/utime06.c @@ -84,12 +84,9 @@ static void cleanup(void); int main(int ac, char **av) { int lc; - const char *msg; int i; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/utimes/utimes01.c b/testcases/kernel/syscalls/utimes/utimes01.c index aa161ac57..ec9a4f4b9 100644 --- a/testcases/kernel/syscalls/utimes/utimes01.c +++ b/testcases/kernel/syscalls/utimes/utimes01.c @@ -94,11 +94,8 @@ int TST_TOTAL = ARRAY_SIZE(test_cases); int main(int ac, char **av) { int i, lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/vfork/vfork01.c b/testcases/kernel/syscalls/vfork/vfork01.c index dba8bea0c..b050776b7 100644 --- a/testcases/kernel/syscalls/vfork/vfork01.c +++ b/testcases/kernel/syscalls/vfork/vfork01.c @@ -107,15 +107,10 @@ void cleanup(); /* cleanup function for the test */ int main(int ac, char **av) { int lc; - const char *msg; pid_t cpid; /* process id of the child process */ int exit_status; /* exit status of child process */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/vfork/vfork02.c b/testcases/kernel/syscalls/vfork/vfork02.c index 721a4c5c7..8ba75f87a 100644 --- a/testcases/kernel/syscalls/vfork/vfork02.c +++ b/testcases/kernel/syscalls/vfork/vfork02.c @@ -89,16 +89,11 @@ void sig_handler(); /* signal catching function */ int main(int ac, char **av) { int lc; - const char *msg; pid_t cpid; /* process id of the child process */ int exit_status; /* exit status of child process */ sigset_t PendSig; /* variable to hold pending signal */ - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/vhangup/vhangup01.c b/testcases/kernel/syscalls/vhangup/vhangup01.c index 29dff0d79..6eda57bff 100644 --- a/testcases/kernel/syscalls/vhangup/vhangup01.c +++ b/testcases/kernel/syscalls/vhangup/vhangup01.c @@ -39,13 +39,11 @@ static uid_t nobody_uid; int main(int argc, char **argv) { int lc; - const char *msg; pid_t pid; int retval; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/vhangup/vhangup02.c b/testcases/kernel/syscalls/vhangup/vhangup02.c index 368612d9b..136b268ca 100644 --- a/testcases/kernel/syscalls/vhangup/vhangup02.c +++ b/testcases/kernel/syscalls/vhangup/vhangup02.c @@ -58,14 +58,11 @@ int fail; int main(int argc, char **argv) { int lc; - const char *msg; pid_t pid, pid1; int status; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/vmsplice/vmsplice01.c b/testcases/kernel/syscalls/vmsplice/vmsplice01.c index cdaf67b93..a9d7d7768 100644 --- a/testcases/kernel/syscalls/vmsplice/vmsplice01.c +++ b/testcases/kernel/syscalls/vmsplice/vmsplice01.c @@ -56,10 +56,8 @@ int TST_TOTAL = 1; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/vmsplice/vmsplice02.c b/testcases/kernel/syscalls/vmsplice/vmsplice02.c index cc87ebeb0..4468294de 100644 --- a/testcases/kernel/syscalls/vmsplice/vmsplice02.c +++ b/testcases/kernel/syscalls/vmsplice/vmsplice02.c @@ -71,11 +71,8 @@ int TST_TOTAL = ARRAY_SIZE(test_cases); int main(int ac, char **av) { int i, lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/wait/wait01.c b/testcases/kernel/syscalls/wait/wait01.c index 0f5514fa8..bd22c1191 100644 --- a/testcases/kernel/syscalls/wait/wait01.c +++ b/testcases/kernel/syscalls/wait/wait01.c @@ -36,11 +36,8 @@ static void cleanup(void); int main(int argc, char **argv) { int lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/wait/wait02.c b/testcases/kernel/syscalls/wait/wait02.c index a35e82938..5695c071c 100644 --- a/testcases/kernel/syscalls/wait/wait02.c +++ b/testcases/kernel/syscalls/wait/wait02.c @@ -52,11 +52,8 @@ static void wait_verify(void); int main(int ac, char **av) { int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/wait4/wait401.c b/testcases/kernel/syscalls/wait4/wait401.c index 39e62a832..26a5c7002 100644 --- a/testcases/kernel/syscalls/wait4/wait401.c +++ b/testcases/kernel/syscalls/wait4/wait401.c @@ -40,13 +40,11 @@ static void setup(void); int main(int ac, char **av) { int lc; - const char *msg; pid_t pid; int status = 1; struct rusage rusage; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/wait4/wait402.c b/testcases/kernel/syscalls/wait4/wait402.c index cc3ae5047..39b170253 100644 --- a/testcases/kernel/syscalls/wait4/wait402.c +++ b/testcases/kernel/syscalls/wait4/wait402.c @@ -50,14 +50,12 @@ static long get_pid_max(void) int main(int ac, char **av) { int lc; - const char *msg; pid_t epid = get_pid_max() + 1; int status = 1; struct rusage rusage; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/waitid/waitid01.c b/testcases/kernel/syscalls/waitid/waitid01.c index 4f0a0da11..c19f0da6c 100644 --- a/testcases/kernel/syscalls/waitid/waitid01.c +++ b/testcases/kernel/syscalls/waitid/waitid01.c @@ -120,11 +120,8 @@ int main(int ac, char **av) id_t pid; siginfo_t infop; int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/waitid/waitid02.c b/testcases/kernel/syscalls/waitid/waitid02.c index e6c62bb5c..b72e25e44 100644 --- a/testcases/kernel/syscalls/waitid/waitid02.c +++ b/testcases/kernel/syscalls/waitid/waitid02.c @@ -285,11 +285,8 @@ static void test_waitid(struct testcase_t *t) int main(int ac, char **av) { int lc, testno; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); for (lc = 0; TEST_LOOPING(lc); ++lc) { diff --git a/testcases/kernel/syscalls/waitpid/waitpid01.c b/testcases/kernel/syscalls/waitpid/waitpid01.c index 38031ac16..e05e783ef 100644 --- a/testcases/kernel/syscalls/waitpid/waitpid01.c +++ b/testcases/kernel/syscalls/waitpid/waitpid01.c @@ -60,14 +60,11 @@ int TST_TOTAL = 1; int main(int argc, char **argv) { int lc; - const char *msg; int pid, npid, sig, nsig; int exno, nexno, status; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/waitpid/waitpid02.c b/testcases/kernel/syscalls/waitpid/waitpid02.c index 849486638..e5d7957f3 100644 --- a/testcases/kernel/syscalls/waitpid/waitpid02.c +++ b/testcases/kernel/syscalls/waitpid/waitpid02.c @@ -67,14 +67,11 @@ int TST_TOTAL = 1; int main(int argc, char **argv) { int lc; - const char *msg; int pid, npid, sig, nsig; int exno, nexno, status; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, ""); #endif diff --git a/testcases/kernel/syscalls/waitpid/waitpid03.c b/testcases/kernel/syscalls/waitpid/waitpid03.c index 355915688..2599a92bf 100644 --- a/testcases/kernel/syscalls/waitpid/waitpid03.c +++ b/testcases/kernel/syscalls/waitpid/waitpid03.c @@ -74,13 +74,10 @@ static int ikids_uclinux; int main(int argc, char **argv) { int lc; - const char *msg; int status, pid[25], ret; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child, "d", &ikids_uclinux); #endif diff --git a/testcases/kernel/syscalls/waitpid/waitpid04.c b/testcases/kernel/syscalls/waitpid/waitpid04.c index 87f8185cd..abf94eed1 100644 --- a/testcases/kernel/syscalls/waitpid/waitpid04.c +++ b/testcases/kernel/syscalls/waitpid/waitpid04.c @@ -62,11 +62,8 @@ int main(int ac, char **av) int pid, status, ret; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/waitpid/waitpid05.c b/testcases/kernel/syscalls/waitpid/waitpid05.c index 509daf982..5466fd911 100644 --- a/testcases/kernel/syscalls/waitpid/waitpid05.c +++ b/testcases/kernel/syscalls/waitpid/waitpid05.c @@ -78,11 +78,8 @@ int main(int ac, char **av) int pid, npid, sig, nsig; int exno, nexno, status; int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_child_uclinux, "d", &sig_uclinux); diff --git a/testcases/kernel/syscalls/waitpid/waitpid06.c b/testcases/kernel/syscalls/waitpid/waitpid06.c index faa62b6a2..dbbc104df 100644 --- a/testcases/kernel/syscalls/waitpid/waitpid06.c +++ b/testcases/kernel/syscalls/waitpid/waitpid06.c @@ -74,14 +74,11 @@ static void do_child_2_uclinux(void); int main(int argc, char **argv) { int lc; - const char *msg; int fail = 0; int pid; int status; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX argv0 = argv[0]; diff --git a/testcases/kernel/syscalls/waitpid/waitpid07.c b/testcases/kernel/syscalls/waitpid/waitpid07.c index 15d5faeab..92f921d4a 100644 --- a/testcases/kernel/syscalls/waitpid/waitpid07.c +++ b/testcases/kernel/syscalls/waitpid/waitpid07.c @@ -75,15 +75,12 @@ static void do_child_2_uclinux(void); int main(int argc, char **argv) { int lc; - const char *msg; int status; int fail = 0; int pid; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX argv0 = argv[0]; diff --git a/testcases/kernel/syscalls/waitpid/waitpid08.c b/testcases/kernel/syscalls/waitpid/waitpid08.c index cd7c5cf0e..b2e9e9b8b 100644 --- a/testcases/kernel/syscalls/waitpid/waitpid08.c +++ b/testcases/kernel/syscalls/waitpid/waitpid08.c @@ -74,14 +74,11 @@ static void do_child_2_uclinux(void); int main(int argc, char **argv) { int lc; - const char *msg; int status; int pid; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX argv0 = argv[0]; diff --git a/testcases/kernel/syscalls/waitpid/waitpid09.c b/testcases/kernel/syscalls/waitpid/waitpid09.c index 68db9c725..1339c8293 100644 --- a/testcases/kernel/syscalls/waitpid/waitpid09.c +++ b/testcases/kernel/syscalls/waitpid/waitpid09.c @@ -79,13 +79,10 @@ static void do_exit_uclinux(void); int main(int argc, char **argv) { int lc; - const char *msg; int fail, pid, status, ret; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_exit_uclinux, ""); diff --git a/testcases/kernel/syscalls/waitpid/waitpid10.c b/testcases/kernel/syscalls/waitpid/waitpid10.c index 933086cb9..6378ab9ee 100644 --- a/testcases/kernel/syscalls/waitpid/waitpid10.c +++ b/testcases/kernel/syscalls/waitpid/waitpid10.c @@ -96,11 +96,8 @@ int main(int ac, char **av) int runtime; /* time(sec) to run this process */ int lc; - const char *msg; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX argv0 = av[0]; diff --git a/testcases/kernel/syscalls/waitpid/waitpid11.c b/testcases/kernel/syscalls/waitpid/waitpid11.c index ae1acc4fc..4b662d53b 100644 --- a/testcases/kernel/syscalls/waitpid/waitpid11.c +++ b/testcases/kernel/syscalls/waitpid/waitpid11.c @@ -67,17 +67,13 @@ static int fail; int main(int ac, char **av) { - const char *msg; - int kid_count, ret_val, status; int i, j, k, found; int group1, group2; int fork_kid_pid[MAXKIDS], wait_kid_pid[MAXKIDS]; int pid; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_exit_uclinux, ""); diff --git a/testcases/kernel/syscalls/waitpid/waitpid12.c b/testcases/kernel/syscalls/waitpid/waitpid12.c index a692c6247..bf64662e6 100644 --- a/testcases/kernel/syscalls/waitpid/waitpid12.c +++ b/testcases/kernel/syscalls/waitpid/waitpid12.c @@ -68,17 +68,13 @@ static int fail; int main(int argc, char **argv) { - const char *msg; - int kid_count, ret_val, status; int i, j, k, found; int group1, group2; int fork_kid_pid[MAXKIDS], wait_kid_pid[MAXKIDS]; int pid; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_exit_uclinux, ""); diff --git a/testcases/kernel/syscalls/waitpid/waitpid13.c b/testcases/kernel/syscalls/waitpid/waitpid13.c index f161bc861..5f035928f 100644 --- a/testcases/kernel/syscalls/waitpid/waitpid13.c +++ b/testcases/kernel/syscalls/waitpid/waitpid13.c @@ -68,17 +68,13 @@ static int fail; int main(int ac, char **av) { - const char *msg; - int kid_count, ret_val, status; int i, j, k, found; int group1, group2; int fork_kid_pid[MAXKIDS], wait_kid_pid[MAXKIDS]; int pid; - msg = parse_opts(ac, av, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); #ifdef UCLINUX maybe_run_child(&do_exit_uclinux, ""); diff --git a/testcases/kernel/syscalls/write/write01.c b/testcases/kernel/syscalls/write/write01.c index 75edf2ce1..c183e9955 100644 --- a/testcases/kernel/syscalls/write/write01.c +++ b/testcases/kernel/syscalls/write/write01.c @@ -134,10 +134,8 @@ char buf = 'w'; int main(int ac, char **av) { int lc; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/write/write02.c b/testcases/kernel/syscalls/write/write02.c index a9c02af93..4924422b1 100644 --- a/testcases/kernel/syscalls/write/write02.c +++ b/testcases/kernel/syscalls/write/write02.c @@ -64,7 +64,6 @@ char pfiln[40] = ""; int main(int argc, char **argv) { int lc; - const char *msg; int cwrite; int fild; @@ -72,9 +71,7 @@ int main(int argc, char **argv) int badcount = 0; char pwbuf[BUFSIZ + 1]; - if ((msg = parse_opts(argc, argv, NULL, NULL))) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); /* global setup for test */ diff --git a/testcases/kernel/syscalls/write/write03.c b/testcases/kernel/syscalls/write/write03.c index 99a431265..63ef35ab7 100644 --- a/testcases/kernel/syscalls/write/write03.c +++ b/testcases/kernel/syscalls/write/write03.c @@ -69,14 +69,11 @@ char filename[100]; int main(int argc, char **argv) { int lc; - const char *msg; char wbuf[BUFSIZ], rbuf[BUFSIZ]; int fd; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); /* global setup */ setup(); diff --git a/testcases/kernel/syscalls/write/write04.c b/testcases/kernel/syscalls/write/write04.c index 95ba7a648..d6a51460c 100644 --- a/testcases/kernel/syscalls/write/write04.c +++ b/testcases/kernel/syscalls/write/write04.c @@ -69,7 +69,6 @@ int rfd, wfd; int main(int argc, char **argv) { int lc; - const char *msg; struct stat buf; int fail; @@ -77,9 +76,7 @@ int main(int argc, char **argv) char wbuf[17 * PIPE_SIZE_TEST]; struct sigaction sigptr; /* set up signal handler */ - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); /* global setup */ setup(); diff --git a/testcases/kernel/syscalls/write/write05.c b/testcases/kernel/syscalls/write/write05.c index a8c8cc4cb..29697735f 100644 --- a/testcases/kernel/syscalls/write/write05.c +++ b/testcases/kernel/syscalls/write/write05.c @@ -74,15 +74,12 @@ char *bad_addr = 0; int main(int argc, char **argv) { int lc; - const char *msg; char pbuf[BUFSIZ]; int pipefildes[2]; int status, pid; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); /* global setup */ setup(); diff --git a/testcases/kernel/syscalls/writev/writev01.c b/testcases/kernel/syscalls/writev/writev01.c index f077ceaf6..bfa5bbab8 100644 --- a/testcases/kernel/syscalls/writev/writev01.c +++ b/testcases/kernel/syscalls/writev/writev01.c @@ -128,10 +128,8 @@ int main(int argc, char **argv) int nbytes, ret; int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/writev/writev02.c b/testcases/kernel/syscalls/writev/writev02.c index 2b8e11a76..60d9e8978 100644 --- a/testcases/kernel/syscalls/writev/writev02.c +++ b/testcases/kernel/syscalls/writev/writev02.c @@ -92,12 +92,10 @@ int fail; int main(int argc, char **argv) { int lc; - const char *msg; int nbytes; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/writev/writev03.c b/testcases/kernel/syscalls/writev/writev03.c index 8015c0a72..e5cdf4b96 100644 --- a/testcases/kernel/syscalls/writev/writev03.c +++ b/testcases/kernel/syscalls/writev/writev03.c @@ -87,12 +87,10 @@ void cleanup(void); int main(int argc, char **argv) { int lc; - const char *msg; int nbytes; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/syscalls/writev/writev04.c b/testcases/kernel/syscalls/writev/writev04.c index 86fca8d3e..954b1faa7 100644 --- a/testcases/kernel/syscalls/writev/writev04.c +++ b/testcases/kernel/syscalls/writev/writev04.c @@ -90,14 +90,10 @@ int fail; int main(int argc, char **argv) { int lc; - const char *msg; int nbytes; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); /* set "tstdir", and "testfile" vars */ diff --git a/testcases/kernel/syscalls/writev/writev05.c b/testcases/kernel/syscalls/writev/writev05.c index c0a79958d..910fa23b8 100644 --- a/testcases/kernel/syscalls/writev/writev05.c +++ b/testcases/kernel/syscalls/writev/writev05.c @@ -89,13 +89,10 @@ int fail; int main(int argc, char **argv) { int lc; - const char *msg; int nbytes; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); /* set "tstdir", and "testfile" vars */ diff --git a/testcases/kernel/syscalls/writev/writev06.c b/testcases/kernel/syscalls/writev/writev06.c index 583ea9bb1..6fe7206e8 100644 --- a/testcases/kernel/syscalls/writev/writev06.c +++ b/testcases/kernel/syscalls/writev/writev06.c @@ -78,12 +78,8 @@ int fail; int main(int argc, char **argv) { int lc; - const char *msg; - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); /* set "tstdir", and "testfile" vars */ diff --git a/testcases/kernel/timers/clock_gettime/clock_gettime02.c b/testcases/kernel/timers/clock_gettime/clock_gettime02.c index de3ad2474..e68a2070c 100644 --- a/testcases/kernel/timers/clock_gettime/clock_gettime02.c +++ b/testcases/kernel/timers/clock_gettime/clock_gettime02.c @@ -80,11 +80,9 @@ int TST_TOTAL = ARRAY_SIZE(clocks); int main(int ac, char **av) { int lc, i; - const char *msg; struct timespec spec; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/timers/clock_gettime/clock_gettime03.c b/testcases/kernel/timers/clock_gettime/clock_gettime03.c index eb8ba9fe2..2194d104a 100644 --- a/testcases/kernel/timers/clock_gettime/clock_gettime03.c +++ b/testcases/kernel/timers/clock_gettime/clock_gettime03.c @@ -89,8 +89,7 @@ int TST_TOTAL = ARRAY_SIZE(testcase); int main(int ac, char **av) { - int i, lc; /* loop counter */ - const char *msg; + int i, lc; struct timespec spec, *temp; clockid_t clocks[] = { @@ -102,8 +101,7 @@ int main(int ac, char **av) CLOCK_THREAD_CPUTIME_ID }; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); /* * PROCESS_CPUTIME_ID & THREAD_CPUTIME_ID are not supported on diff --git a/testcases/kernel/timers/clock_settime/clock_settime02.c b/testcases/kernel/timers/clock_settime/clock_settime02.c index 996fb6cc4..987399079 100644 --- a/testcases/kernel/timers/clock_settime/clock_settime02.c +++ b/testcases/kernel/timers/clock_settime/clock_settime02.c @@ -81,11 +81,9 @@ static struct timespec saved; /* Used to reset the time */ int main(int ac, char **av) { int lc; - const char *msg; struct timespec spec; /* Used to specify time for test */ - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/timers/clock_settime/clock_settime03.c b/testcases/kernel/timers/clock_settime/clock_settime03.c index 769849e24..f76b610ea 100644 --- a/testcases/kernel/timers/clock_settime/clock_settime03.c +++ b/testcases/kernel/timers/clock_settime/clock_settime03.c @@ -62,10 +62,8 @@ static struct timespec spec, *temp, saved; int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/timers/leapsec/leapsec_timer.c b/testcases/kernel/timers/leapsec/leapsec_timer.c index be9675ded..9af6882c0 100644 --- a/testcases/kernel/timers/leapsec/leapsec_timer.c +++ b/testcases/kernel/timers/leapsec/leapsec_timer.c @@ -48,12 +48,9 @@ static void cleanup(void); int main(int argc, char **argv) { - const char *msg; int lc; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/kernel/timers/timer_create/timer_create02.c b/testcases/kernel/timers/timer_create/timer_create02.c index f71499d8c..7f528ed1f 100644 --- a/testcases/kernel/timers/timer_create/timer_create02.c +++ b/testcases/kernel/timers/timer_create/timer_create02.c @@ -81,8 +81,7 @@ static struct sigevent evp, *evp_ptr; int main(int ac, char **av) { - int lc, i, j; /* loop counter */ - const char *msg; + int lc, i, j; kernel_timer_t created_timer_id; /* holds the returned timer_id */ char *message[3] = { "SIGEV_SIGNAL", @@ -91,8 +90,7 @@ int main(int ac, char **av) }; const char *mrstr = "MONOTONIC_RAW"; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/timers/timer_create/timer_create03.c b/testcases/kernel/timers/timer_create/timer_create03.c index 23dbe7cac..291fcfae5 100644 --- a/testcases/kernel/timers/timer_create/timer_create03.c +++ b/testcases/kernel/timers/timer_create/timer_create03.c @@ -90,7 +90,6 @@ void cleanup(void) int main(int ac, char **av) { int lc, i; - const char *msg; kernel_timer_t created_timer_id; /* holds the returned timer_id */ char *message[] = { "SIGEV_SIGNAL", @@ -98,9 +97,7 @@ int main(int ac, char **av) "SIGEV_NONE" }; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/timers/timer_create/timer_create04.c b/testcases/kernel/timers/timer_create/timer_create04.c index ad1adfdb8..11cfc21dc 100644 --- a/testcases/kernel/timers/timer_create/timer_create04.c +++ b/testcases/kernel/timers/timer_create/timer_create04.c @@ -99,7 +99,6 @@ void cleanup(void) int main(int ac, char **av) { int lc, i; - const char *msg; kernel_timer_t timer_id, *temp_id; /* stores the returned timer_id */ struct sigevent *temp_ev; /* used for bad address test case */ @@ -112,8 +111,7 @@ int main(int ac, char **av) CLOCK_THREAD_CPUTIME_ID }; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(ac, av, NULL, NULL); TST_TOTAL = sizeof(testcase) / sizeof(testcase[0]); diff --git a/testcases/kernel/timers/timer_delete/timer_delete02.c b/testcases/kernel/timers/timer_delete/timer_delete02.c index dada4ed7e..b9b9c7ffc 100644 --- a/testcases/kernel/timers/timer_delete/timer_delete02.c +++ b/testcases/kernel/timers/timer_delete/timer_delete02.c @@ -80,12 +80,9 @@ int TST_TOTAL = 1; /* Total number of test cases. */ int main(int ac, char **av) { int lc; - const char *msg; kernel_timer_t timer_id; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/timers/timer_delete/timer_delete03.c b/testcases/kernel/timers/timer_delete/timer_delete03.c index 275f71bb0..02506fb90 100644 --- a/testcases/kernel/timers/timer_delete/timer_delete03.c +++ b/testcases/kernel/timers/timer_delete/timer_delete03.c @@ -86,12 +86,8 @@ int TST_TOTAL = ARRAY_SIZE(testcase); int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) - != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/timers/timer_settime/timer_settime02.c b/testcases/kernel/timers/timer_settime/timer_settime02.c index 573cc5f7c..cfeb7b3d3 100644 --- a/testcases/kernel/timers/timer_settime/timer_settime02.c +++ b/testcases/kernel/timers/timer_settime/timer_settime02.c @@ -85,11 +85,8 @@ static int flag; int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/kernel/timers/timer_settime/timer_settime03.c b/testcases/kernel/timers/timer_settime/timer_settime03.c index a7e081c18..1216c117c 100644 --- a/testcases/kernel/timers/timer_settime/timer_settime03.c +++ b/testcases/kernel/timers/timer_settime/timer_settime03.c @@ -93,12 +93,8 @@ static kernel_timer_t timer, tim; int main(int ac, char **av) { int lc, i; - const char *msg; - if ((msg = parse_opts(ac, av, NULL, NULL)) - != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(ac, av, NULL, NULL); setup(); diff --git a/testcases/misc/crash/crash01.c b/testcases/misc/crash/crash01.c index cbbc3f938..05745214c 100644 --- a/testcases/misc/crash/crash01.c +++ b/testcases/misc/crash/crash01.c @@ -149,11 +149,9 @@ void record_status(unsigned int n); int main(int argc, char *argv[]) { - const char *msg; int lc; - if ((msg = parse_opts(argc, argv, options, help)) != NULL) - tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, help); if (v_opt) verbose_level = atoi(v_copt); diff --git a/testcases/misc/crash/crash02.c b/testcases/misc/crash/crash02.c index ca73fd0d5..00fee3493 100644 --- a/testcases/misc/crash/crash02.c +++ b/testcases/misc/crash/crash02.c @@ -138,11 +138,9 @@ void record_errno(unsigned int n); int main(int argc, char *argv[]) { - const char *msg; int lc; - if ((msg = parse_opts(argc, argv, options, help)) != NULL) - tst_brkm(TBROK, cleanup, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, options, help); if (v_opt) verbose_level = atoi(v_copt); diff --git a/testcases/network/lib6/asapi_01.c b/testcases/network/lib6/asapi_01.c index d53ce2338..5d8bdc744 100644 --- a/testcases/network/lib6/asapi_01.c +++ b/testcases/network/lib6/asapi_01.c @@ -206,11 +206,8 @@ int TST_TOTAL = ARRAY_SIZE(ftab); int main(int argc, char *argv[]) { int i, lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/network/lib6/asapi_02.c b/testcases/network/lib6/asapi_02.c index d195d9cb6..01bee377e 100644 --- a/testcases/network/lib6/asapi_02.c +++ b/testcases/network/lib6/asapi_02.c @@ -293,11 +293,8 @@ int TST_TOTAL = ARRAY_SIZE(ftab); int main(int argc, char *argv[]) { int i, lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/network/lib6/asapi_03.c b/testcases/network/lib6/asapi_03.c index 741c06b43..f458d7df9 100644 --- a/testcases/network/lib6/asapi_03.c +++ b/testcases/network/lib6/asapi_03.c @@ -189,11 +189,8 @@ int TST_TOTAL = ARRAY_SIZE(ftab); int main(int argc, char *argv[]) { int i, lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/network/lib6/asapi_04.c b/testcases/network/lib6/asapi_04.c index 6f2fa2dab..76de26b53 100644 --- a/testcases/network/lib6/asapi_04.c +++ b/testcases/network/lib6/asapi_04.c @@ -78,14 +78,9 @@ int csum_test(char *rhost); int main(int argc, char *argv[]) { - const char *msg; int lc; - /* Parse standard options given to run the test. */ - msg = parse_opts(argc, argv, 0, 0); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, 0, 0); pid = getpid(); diff --git a/testcases/network/lib6/asapi_05.c b/testcases/network/lib6/asapi_05.c index 8efbadb62..9acc6a238 100644 --- a/testcases/network/lib6/asapi_05.c +++ b/testcases/network/lib6/asapi_05.c @@ -60,11 +60,9 @@ void icmp6_ft(void); int main(int argc, char *argv[]) { int lc; - const char *msg; /* Parse standard options given to run the test. */ - if ((msg = parse_opts(argc, argv, NULL, NULL)) != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/network/lib6/asapi_06.c b/testcases/network/lib6/asapi_06.c index 0693e3aa4..960ebb51a 100644 --- a/testcases/network/lib6/asapi_06.c +++ b/testcases/network/lib6/asapi_06.c @@ -79,14 +79,9 @@ void setup(void), cleanup(void); int main(int argc, char *argv[]) { - const char *msg; int lc; - /* Parse standard options given to run the test. */ - msg = parse_opts(argc, argv, 0, 0); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); pid = getpid(); @@ -96,7 +91,6 @@ int main(int argc, char *argv[]) do_tests(); cleanup(); - tst_exit(); } diff --git a/testcases/network/lib6/asapi_07.c b/testcases/network/lib6/asapi_07.c index 758c707e6..826cea67b 100644 --- a/testcases/network/lib6/asapi_07.c +++ b/testcases/network/lib6/asapi_07.c @@ -94,11 +94,8 @@ int TST_TOTAL = ARRAY_SIZE(etab); int main(int argc, char *argv[]) { int i, lc; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/network/lib6/getaddrinfo_01.c b/testcases/network/lib6/getaddrinfo_01.c index fe5ad7861..ec29b5d56 100644 --- a/testcases/network/lib6/getaddrinfo_01.c +++ b/testcases/network/lib6/getaddrinfo_01.c @@ -69,13 +69,9 @@ void dumpres(struct addrinfo *); int main(int argc, char *argv[]) { int lc; - const char *msg; /* Parse standard options given to run the test. */ - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/network/lib6/in6_01.c b/testcases/network/lib6/in6_01.c index 027e28734..f7186b480 100644 --- a/testcases/network/lib6/in6_01.c +++ b/testcases/network/lib6/in6_01.c @@ -76,12 +76,8 @@ int main(int argc, char *argv[]) { int lc; int i; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/network/lib6/in6_02.c b/testcases/network/lib6/in6_02.c index 30590239b..fea1827d0 100644 --- a/testcases/network/lib6/in6_02.c +++ b/testcases/network/lib6/in6_02.c @@ -58,12 +58,8 @@ int main(int argc, char *argv[]) { int lc; int i; - const char *msg; - msg = parse_opts(argc, argv, NULL, NULL); - if (msg != NULL) { - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); - } + tst_parse_opts(argc, argv, NULL, NULL); setup(); diff --git a/testcases/network/tcp_fastopen/tcp_fastopen.c b/testcases/network/tcp_fastopen/tcp_fastopen.c index 61262d2f2..b01ca8943 100644 --- a/testcases/network/tcp_fastopen/tcp_fastopen.c +++ b/testcases/network/tcp_fastopen/tcp_fastopen.c @@ -689,10 +689,8 @@ static void check_opt_l(const char *name, char *arg, long *val, long lim) static void setup(int argc, char *argv[]) { - const char *msg; - msg = parse_opts(argc, argv, options, help); - if (msg != NULL) - tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg); + + tst_parse_opts(argc, argv, options, help); /* if client_num is not set, use num of processors */ clients_num = sysconf(_SC_NPROCESSORS_ONLN); |