X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincd.c;h=1e111a25155b3ff1c7b9735c2dea08475b5c0eb7;hb=d6b45d005530496e48325a6174ecdd889a17bfc1;hp=ab4d92128725acdab52c41c1f130cf4d61d63da1;hpb=f6e87ab476a0faf8b124ecaaa27f967d825e6457;p=tinc diff --git a/src/tincd.c b/src/tincd.c index ab4d9212..1e111a25 100644 --- a/src/tincd.c +++ b/src/tincd.c @@ -1,7 +1,7 @@ /* tincd.c -- the main file for tincd Copyright (C) 1998-2005 Ivo Timmermans - 2000-2016 Guus Sliepen + 2000-2018 Guus Sliepen 2008 Max Rijevski 2009 Michael Tokarev 2010 Julien Muchembled @@ -344,10 +344,15 @@ static bool drop_privs(void) { # define setpriority(level) !SetPriorityClass(GetCurrentProcess(), (level)) static void stop_handler(void *data, int flags) { + (void)data; + (void)flags; + event_exit(); } static BOOL WINAPI console_ctrl_handler(DWORD type) { + (void)type; + logger(DEBUG_ALWAYS, LOG_NOTICE, "Got console shutdown request"); if(WSASetEvent(stop_io.event) == FALSE) { @@ -370,13 +375,10 @@ int main(int argc, char **argv) { return 1; } - make_names(true); - chdir(confbase); - if(show_version) { printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE, BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR); - printf("Copyright (C) 1998-2016 Ivo Timmermans, Guus Sliepen and others.\n" + printf("Copyright (C) 1998-2018 Ivo Timmermans, Guus Sliepen and others.\n" "See the AUTHORS file for a complete list.\n\n" "tinc comes with ABSOLUTELY NO WARRANTY. This is free software,\n" "and you are welcome to redistribute it under certain conditions;\n" @@ -390,6 +392,9 @@ int main(int argc, char **argv) { return 0; } + make_names(true); + chdir(confbase); + #ifdef HAVE_MINGW if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) { @@ -481,6 +486,8 @@ int main(int argc, char **argv) { } int main2(int argc, char **argv) { + (void)argc; + (void)argv; #endif char *priority = NULL;