X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=win%2Finspircd_win32wrapper.cpp;h=c32d31d5a2b81045387d0e8e6dbea6735bc976ca;hb=225f37a376d9a556695ac8c84816cf538a3a5448;hp=af50828c4b1a123474a368cc9890134702076709;hpb=8bfb41c3cd70a2316a6671df21d7160de6683a06;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/win/inspircd_win32wrapper.cpp b/win/inspircd_win32wrapper.cpp index af50828c4..c32d31d5a 100644 --- a/win/inspircd_win32wrapper.cpp +++ b/win/inspircd_win32wrapper.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -302,7 +302,6 @@ int getopt_long_only(int ___argc, char *const *___argv, const char *__shortopts, return -1; const char * opt = ___argv[arg_counter]; - int return_val = 0; // if we're not an option, return an error. if (strnicmp(opt, "--", 2) != 0) @@ -390,14 +389,14 @@ void IPC::Check() if (!res) { if (GetLastError() != ERROR_SEM_TIMEOUT) - Instance->Log(DEFAULT, "IPC Pipe Error %u: %s", GetLastError(), dlerror()); + Instance->Logs->Log("win32",DEFAULT, "IPC Pipe Error %u: %s", GetLastError(), dlerror()); return; } switch (action) { case IPC_MESSAGE_REHASH: - Instance->Rehash(); + Instance->Rehash("due to IPC message"); break; case IPC_MESSAGE_DIE: @@ -523,7 +522,7 @@ void ClearConsole() */ void ChangeWindowsSpecificPointers(InspIRCd* Instance) { - Instance->Log(DEBUG,"Changing to windows specific pointer and functor set"); + Instance->Logs->Log("win32",DEBUG,"Changing to windows specific pointer and functor set"); Instance->Config->DNSServerValidator = &ValidateWindowsDnsServer; } @@ -631,7 +630,7 @@ bool ValidateWindowsDnsServer(ServerConfig* conf, const char* tag, const char* v if (!*(data.GetString())) { std::string nameserver; - conf->GetInstance()->Log(DEFAULT,"WARNING: not defined, attempting to find working server in the registry..."); + conf->GetInstance()->Logs->Log("win32",DEFAULT,"WARNING: not defined, attempting to find working server in the registry..."); nameserver = FindNameServerWin(); /* Windows stacks multiple nameservers in one registry key, seperated by commas. * Spotted by Cataclysm. @@ -644,7 +643,7 @@ bool ValidateWindowsDnsServer(ServerConfig* conf, const char* tag, const char* v if (nameserver.find(' ') != std::string::npos) nameserver = nameserver.substr(0, nameserver.find(' ')); data.Set(nameserver.c_str()); - conf->GetInstance()->Log(DEFAULT," set to '%s' as first active resolver in registry.", nameserver.c_str()); + conf->GetInstance()->Logs->Log("win32",DEFAULT," set to '%s' as first active resolver in registry.", nameserver.c_str()); } return true; }