TheCloneArmy/mcrcon
1
0
Fork 0
mirror of https://github.com/Tiiffi/mcrcon.git synced 2025-10-27 11:21:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Changed program return values to EXIT_FAILURE and EXIT_SUCCESS macros.

Browse Source
This commit is contained in:
Tiiffi
2016-12-16 21:39:30 +02:00
parent 46e7ed1781
commit d0e293f249
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
mcrcon.c
View File

@ -131,13 +131,13 @@ void sighandler(/*int sig*/)
{ {
connection_alive = 0; connection_alive = 0;
#ifndef _WIN32 #ifndef _WIN32
exit(-1); exit(EXIT_SUCCESS);
#endif #endif
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
int opt, ret = 0; int opt;
int terminal_mode = 0; int terminal_mode = 0;
char *host = getenv("MCRCON_HOST"); char *host = getenv("MCRCON_HOST");
@ -171,7 +171,7 @@ int main(int argc, char *argv[])
case 'r': raw_output = 1; break; case 'r': raw_output = 1; break;
case 'v': case 'v':
puts(VER_STR"\nhttps://github.com/Tiiffi/mcrcon"); puts(VER_STR"\nhttps://github.com/Tiiffi/mcrcon");
exit(0); exit(EXIT_SUCCESS);
break; break;
case 'h': case 'h':
case '?': usage(); break; case '?': usage(); break;
@ -181,7 +181,7 @@ int main(int argc, char *argv[])
else fprintf (stderr, "Unknown option -%c\n\n", optopt); else fprintf (stderr, "Unknown option -%c\n\n", optopt);
*/ */
default: exit(-1); default: exit(EXIT_FAILURE);
} }
} }
@ -220,20 +220,17 @@ int main(int argc, char *argv[])
if (rcon_auth(rsock, pass)) if (rcon_auth(rsock, pass))
{ {
if (terminal_mode) if (terminal_mode)
ret = run_terminal_mode(rsock); run_terminal_mode(rsock);
else else
ret = run_commands(argc, argv); run_commands(argc, argv);
} }
else // auth failed else // auth failed
{
ret = -1;
fprintf(stdout, "Authentication failed!\n"); fprintf(stdout, "Authentication failed!\n");
}
net_close(rsock); net_close(rsock);
rsock = -1; rsock = -1;
return ret; return EXIT_SUCCESS;
} }
void usage(void) void usage(void)
@ -268,7 +265,7 @@ void usage(void)
getchar(); getchar();
#endif #endif
exit(0); exit(EXIT_SUCCESS);
} }
#ifdef _WIN32 #ifdef _WIN32
@ -284,7 +281,7 @@ void net_init_WSA(void)
if (err != 0) if (err != 0)
{ {
fprintf(stderr, "WSAStartup failed. Error: %d.\n", err); fprintf(stderr, "WSAStartup failed. Error: %d.\n", err);
exit(-1); exit(EXIT_FAILURE);
} }
} }
#endif #endif