Commit 3faa15cf authored by Monty's avatar Monty

Don't give warnings from safemalloc for aria_pack --help

parent 6736f152
...@@ -204,6 +204,7 @@ static QUEUE queue; ...@@ -204,6 +204,7 @@ static QUEUE queue;
static HUFF_COUNTS *global_count; static HUFF_COUNTS *global_count;
static char zero_string[]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; static char zero_string[]={0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
static const char *load_default_groups[]= { "ariapack",0 }; static const char *load_default_groups[]= { "ariapack",0 };
static char **default_argv;
/* /*
Register handler error messages for usage with my_error() Register handler error messages for usage with my_error()
...@@ -225,7 +226,6 @@ int main(int argc, char **argv) ...@@ -225,7 +226,6 @@ int main(int argc, char **argv)
{ {
int error,ok; int error,ok;
PACK_MRG_INFO merge; PACK_MRG_INFO merge;
char **default_argv;
my_bool no_control_file= 0; my_bool no_control_file= 0;
MY_INIT(argv[0]); MY_INIT(argv[0]);
...@@ -293,6 +293,14 @@ int main(int argc, char **argv) ...@@ -293,6 +293,14 @@ int main(int argc, char **argv)
#endif #endif
} }
static void my_exit(int error)
{
free_defaults(default_argv);
maria_end();
my_end(verbose ? MY_CHECK_ERROR | MY_GIVE_INFO : MY_CHECK_ERROR);
exit(error);
}
enum options_mp {OPT_CHARSETS_DIR_MP=256, OPT_AUTO_CLOSE}; enum options_mp {OPT_CHARSETS_DIR_MP=256, OPT_AUTO_CLOSE};
static struct my_option my_long_options[] = static struct my_option my_long_options[] =
...@@ -414,11 +422,12 @@ get_one_option(const struct my_option *opt, ...@@ -414,11 +422,12 @@ get_one_option(const struct my_option *opt,
break; break;
case 'V': case 'V':
print_version(); print_version();
exit(0); my_exit(0);
break;
case 'I': case 'I':
case '?': case '?':
usage(); usage();
exit(0); my_exit(0);
} }
return 0; return 0;
} }
...@@ -435,12 +444,12 @@ static void get_options(int *argc,char ***argv) ...@@ -435,12 +444,12 @@ static void get_options(int *argc,char ***argv)
write_loop=1; write_loop=1;
if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option))) if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))
exit(ho_error); my_exit(ho_error);
if (!*argc) if (!*argc)
{ {
usage(); usage();
exit(1); my_exit(1);
} }
if (join_table) if (join_table)
{ {
......
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