diff options
| author | monty@mysql.com <> | 2004-09-01 04:12:09 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-09-01 04:12:09 +0300 |
| commit | 054cea4ca8c1c86bd4434d5d068cf21e8623a5ff (patch) | |
| tree | 4ad5995c2fe0e62dfd3c25bcb2a946ad44728c19 /extra | |
| parent | ba4d4ce97ab4287dd0c3da55f1bae0aaa963a309 (diff) | |
| parent | 3f0f1a4fb2b3b1b8e60471a5ef8a83e2b978acda (diff) | |
| download | mariadb-git-054cea4ca8c1c86bd4434d5d068cf21e8623a5ff.tar.gz | |
Merge with 4.0
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/my_print_defaults.c | 2 | ||||
| -rw-r--r-- | extra/mysql_waitpid.c | 2 | ||||
| -rw-r--r-- | extra/perror.c | 2 | ||||
| -rw-r--r-- | extra/resolve_stack_dump.c | 2 | ||||
| -rw-r--r-- | extra/resolveip.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c index a0af98e5f1c..f4da839f8e2 100644 --- a/extra/my_print_defaults.c +++ b/extra/my_print_defaults.c @@ -99,7 +99,7 @@ static int get_options(int *argc,char ***argv) { int ho_error; - if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option, NULL))) + if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option))) exit(ho_error); if (*argc < 1) diff --git a/extra/mysql_waitpid.c b/extra/mysql_waitpid.c index 0894d81a5ae..c228cc52c8b 100644 --- a/extra/mysql_waitpid.c +++ b/extra/mysql_waitpid.c @@ -67,7 +67,7 @@ int main(int argc, char *argv[]) progname= argv[0]; - if (handle_options(&argc, &argv, my_long_options, get_one_option, NULL)) + if (handle_options(&argc, &argv, my_long_options, get_one_option)) exit(-1); if (!argv[0] || !argv[1] || (pid= atoi(argv[0])) <= 0 || (t= atoi(argv[1])) <= 0) diff --git a/extra/perror.c b/extra/perror.c index b029d87040f..a28626fd873 100644 --- a/extra/perror.c +++ b/extra/perror.c @@ -157,7 +157,7 @@ static int get_options(int *argc,char ***argv) { int ho_error; - if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option, NULL))) + if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option))) exit(ho_error); if (!*argc && !print_all_codes) diff --git a/extra/resolve_stack_dump.c b/extra/resolve_stack_dump.c index 3c26c315dea..06a670b935d 100644 --- a/extra/resolve_stack_dump.c +++ b/extra/resolve_stack_dump.c @@ -121,7 +121,7 @@ static int parse_args(int argc, char **argv) { int ho_error; - if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option, NULL))) + if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option))) exit(ho_error); /* diff --git a/extra/resolveip.c b/extra/resolveip.c index a995b038770..f8cff2a976c 100644 --- a/extra/resolveip.c +++ b/extra/resolveip.c @@ -90,7 +90,7 @@ static int get_options(int *argc,char ***argv) { int ho_error; - if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option, NULL))) + if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option))) exit(ho_error); if (*argc == 0) |