Code cleanup and some optimizations.

parent 340ba1cf
...@@ -11494,11 +11494,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)), ...@@ -11494,11 +11494,11 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
return 0; return 0;
} }
static void get_options(int argc, char **argv) static void get_options(int *argc, char ***argv)
{ {
int ho_error; int ho_error;
if ((ho_error= handle_options(&argc, &argv, client_test_long_options, if ((ho_error= handle_options(argc, argv, client_test_long_options,
get_one_option))) get_one_option)))
exit(ho_error); exit(ho_error);
...@@ -11541,7 +11541,7 @@ int main(int argc, char **argv) ...@@ -11541,7 +11541,7 @@ int main(int argc, char **argv)
load_defaults("my", client_test_load_default_groups, &argc, &argv); load_defaults("my", client_test_load_default_groups, &argc, &argv);
defaults_argv= argv; defaults_argv= argv;
get_options(argc, argv); get_options(&argc, &argv);
client_connect(); /* connect to server */ client_connect(); /* connect to server */
...@@ -11552,29 +11552,27 @@ int main(int argc, char **argv) ...@@ -11552,29 +11552,27 @@ int main(int argc, char **argv)
test_count= 1; test_count= 1;
start_time= time((time_t *)0); start_time= time((time_t *)0);
int i, name_ok; if (!argc)
if (!argv[1])
{ {
for (fptr= my_tests; fptr->name; fptr++) for (fptr= my_tests; fptr->name; fptr++)
(*fptr->function)(); (*fptr->function)();
} }
else else
{ {
for (i= 1; argv[i]; i++) for ( ; *argv ; argv++)
{ {
name_ok= 0;
for (fptr= my_tests; fptr->name; fptr++) for (fptr= my_tests; fptr->name; fptr++)
{ {
if (!strcmp(fptr->name, argv[i])) if (!strcmp(fptr->name, *argv))
{ {
name_ok= 1;
(*fptr->function)(); (*fptr->function)();
break;
} }
} }
if (!name_ok) if (!fptr->name)
{ {
printf("\n\nGiven test not found: '%s'\n", argv[i]); fprintf(stderr, "\n\nGiven test not found: '%s'\n", *argv);
printf("See legal test names with %s -T\n\nAborting!\n", fprintf(stderr, "See legal test names with %s -T\n\nAborting!\n",
my_progname); my_progname);
client_disconnect(); client_disconnect();
free_defaults(defaults_argv); free_defaults(defaults_argv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment