database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Don't give warnings from perror or resolveip with safemalloc

Browse Source 
- Added my_end(0) before exit
- Fixed typo in mysql_install_db
This commit is contained in:
Michael Widenius
2018-07-29 10:56:11 +03:00
parent 255328d393
commit 0c745c743c
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
extra/resolveip.c
View File

@@ -79,6 +79,7 @@ get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
case 'I':
case '?':
usage();
my_end(0);
exit(0);
}
return 0;
@@ -91,7 +92,10 @@ static int get_options(int *argc,char ***argv)
int ho_error;
if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))
{
my_end(0);
exit(ho_error);
}
if (*argc == 0)
{
@@ -113,10 +117,14 @@ int main(int argc, char **argv)
MY_INIT(argv[0]);
if (get_options(&argc,&argv))
{
my_end(0);
exit(1);
}
while (argc--)
{
my_bool do_more;
#ifndef WIN32
struct in_addr addr;
#endif
@@ -125,13 +133,13 @@ int main(int argc, char **argv)
/* Not compatible with IPv6! Probably should use getnameinfo(). */
#ifdef WIN32
taddr = inet_addr(ip);
if(taddr != INADDR_NONE)
{
do_more= (taddr != INADDR_NONE);
#else
if (inet_aton(ip, &addr) != 0)
{
if ((do_more= (inet_aton(ip, &addr) != 0)))
taddr= addr.s_addr;
#endif
if (do_more)
{
if (taddr == htonl(INADDR_BROADCAST))
{
puts("Broadcast");
@@ -205,5 +213,6 @@ int main(int argc, char **argv)
}
}
}
my_end(0);
exit(error);
}