From 352eb2b29f2e3f759ef74344b4807b1b6dff8e59 Mon Sep 17 00:00:00 2001 From: brain Date: Tue, 23 Oct 2007 20:45:09 +0000 Subject: All the core is now pedantic safe! NOTE: I changed ModeHandler removing a redundant param. Devs, if you find stuff that doesnt compile, change AddMode(handler, 'l') to AddMode(handler); and it will :p git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8319 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/commands/cmd_commands.cpp | 2 +- src/commands/cmd_connect.cpp | 2 +- src/commands/cmd_info.cpp | 2 +- src/commands/cmd_links.cpp | 2 +- src/commands/cmd_loadmodule.cpp | 2 +- src/commands/cmd_lusers.cpp | 2 +- src/commands/cmd_map.cpp | 2 +- src/commands/cmd_modules.cpp | 2 +- src/commands/cmd_motd.cpp | 2 +- src/commands/cmd_nick.cpp | 4 ++-- src/commands/cmd_oper.cpp | 2 +- src/commands/cmd_pass.cpp | 2 +- src/commands/cmd_ping.cpp | 2 +- src/commands/cmd_pong.cpp | 2 +- src/commands/cmd_reloadmodule.cpp | 2 +- src/commands/cmd_restart.cpp | 2 +- src/commands/cmd_server.cpp | 2 +- src/commands/cmd_squit.cpp | 2 +- src/commands/cmd_time.cpp | 2 +- src/commands/cmd_trace.cpp | 2 +- src/commands/cmd_unloadmodule.cpp | 2 +- src/commands/cmd_user.cpp | 2 +- src/commands/cmd_version.cpp | 2 +- src/commands/cmd_wallops.cpp | 2 +- src/commands/cmd_whowas.cpp | 4 ++-- src/socket.cpp | 7 ++++--- 26 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/commands/cmd_commands.cpp b/src/commands/cmd_commands.cpp index 68c5a8c78..764a76b9a 100644 --- a/src/commands/cmd_commands.cpp +++ b/src/commands/cmd_commands.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new CommandCommands(Instance); } -CmdResult CommandCommands::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandCommands::Handle (const char**, int, User *user) { for (Commandable::iterator i = ServerInstance->Parser->cmdlist.begin(); i != ServerInstance->Parser->cmdlist.end(); i++) { diff --git a/src/commands/cmd_connect.cpp b/src/commands/cmd_connect.cpp index b44264123..45acdb5c6 100644 --- a/src/commands/cmd_connect.cpp +++ b/src/commands/cmd_connect.cpp @@ -25,7 +25,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /CONNECT */ -CmdResult CommandConnect::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandConnect::Handle (const char**, int, User *user) { user->WriteServ( "NOTICE %s :Look into loading a linking module (like m_spanningtree) if you want this to do anything useful.", user->nick); return CMD_SUCCESS; diff --git a/src/commands/cmd_info.cpp b/src/commands/cmd_info.cpp index 959f04a39..bf0d0cc80 100644 --- a/src/commands/cmd_info.cpp +++ b/src/commands/cmd_info.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /INFO */ -CmdResult CommandInfo::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandInfo::Handle (const char**, int, User *user) { user->WriteServ( "371 %s : -/\\- \2InspIRCd\2 -\\/-", user->nick); user->WriteServ( "371 %s : November 2002 - Present", user->nick); diff --git a/src/commands/cmd_links.cpp b/src/commands/cmd_links.cpp index 4c50b2684..f216dbc2c 100644 --- a/src/commands/cmd_links.cpp +++ b/src/commands/cmd_links.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /LINKS */ -CmdResult CommandLinks::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandLinks::Handle (const char**, int, User *user) { user->WriteServ("364 %s %s %s :0 %s",user->nick,ServerInstance->Config->ServerName,ServerInstance->Config->ServerName,ServerInstance->Config->ServerDesc); user->WriteServ("365 %s * :End of /LINKS list.",user->nick); diff --git a/src/commands/cmd_loadmodule.cpp b/src/commands/cmd_loadmodule.cpp index c6f0a611c..14ea660f9 100644 --- a/src/commands/cmd_loadmodule.cpp +++ b/src/commands/cmd_loadmodule.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /LOADMODULE */ -CmdResult CommandLoadmodule::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandLoadmodule::Handle (const char** parameters, int, User *user) { if (ServerInstance->Modules->Load(parameters[0])) { diff --git a/src/commands/cmd_lusers.cpp b/src/commands/cmd_lusers.cpp index 3088169a7..a00b2143f 100644 --- a/src/commands/cmd_lusers.cpp +++ b/src/commands/cmd_lusers.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /LUSERS */ -CmdResult CommandLusers::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandLusers::Handle (const char**, int, User *user) { // this lusers command shows one server at all times because // a protocol module must override it to show those stats. diff --git a/src/commands/cmd_map.cpp b/src/commands/cmd_map.cpp index 7d391d275..1cf2dca52 100644 --- a/src/commands/cmd_map.cpp +++ b/src/commands/cmd_map.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /MAP */ -CmdResult CommandMap::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandMap::Handle (const char**, int, User *user) { // as with /LUSERS this does nothing without a linking // module to override its behaviour and display something diff --git a/src/commands/cmd_modules.cpp b/src/commands/cmd_modules.cpp index 1ff8c1c75..f961b6268 100644 --- a/src/commands/cmd_modules.cpp +++ b/src/commands/cmd_modules.cpp @@ -38,7 +38,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /MODULES */ -CmdResult CommandModules::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandModules::Handle (const char**, int, User *user) { for (unsigned int i = 0; i < ServerInstance->Config->module_names.size(); i++) { diff --git a/src/commands/cmd_motd.cpp b/src/commands/cmd_motd.cpp index 8098b2007..74c9740f1 100644 --- a/src/commands/cmd_motd.cpp +++ b/src/commands/cmd_motd.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** Handle /MOTD */ -CmdResult CommandMotd::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandMotd::Handle (const char**, int, User *user) { user->ShowMOTD(); return CMD_SUCCESS; diff --git a/src/commands/cmd_nick.cpp b/src/commands/cmd_nick.cpp index 52e562d02..04b03055e 100644 --- a/src/commands/cmd_nick.cpp +++ b/src/commands/cmd_nick.cpp @@ -25,7 +25,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) * for the client introduction code in here, youre in the wrong place. * You need to look in the spanningtree module for this! */ -CmdResult CommandNick::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandNick::Handle (const char** parameters, int, User *user) { char oldnick[NICKMAX]; @@ -161,7 +161,7 @@ CmdResult CommandNick::Handle (const char** parameters, int pcnt, User *user) } -CmdResult CommandNick::HandleInternal(const unsigned int id, const std::deque ¶meters) +CmdResult CommandNick::HandleInternal(const unsigned int id, const std::deque&) { allowinvalid = (id != 0); return CMD_SUCCESS; diff --git a/src/commands/cmd_oper.cpp b/src/commands/cmd_oper.cpp index bcb2991b7..70376c894 100644 --- a/src/commands/cmd_oper.cpp +++ b/src/commands/cmd_oper.cpp @@ -35,7 +35,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new CommandOper(Instance); } -CmdResult CommandOper::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandOper::Handle (const char** parameters, int, User *user) { char LoginName[MAXBUF]; char Password[MAXBUF]; diff --git a/src/commands/cmd_pass.cpp b/src/commands/cmd_pass.cpp index 801d9923b..9c6b7ac03 100644 --- a/src/commands/cmd_pass.cpp +++ b/src/commands/cmd_pass.cpp @@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new CommandPass(Instance); } -CmdResult CommandPass::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandPass::Handle (const char** parameters, int, User *user) { // Check to make sure they havnt registered -- Fix by FCS if (user->registered == REG_ALL) diff --git a/src/commands/cmd_ping.cpp b/src/commands/cmd_ping.cpp index fb0b03829..a4ed9e8f1 100644 --- a/src/commands/cmd_ping.cpp +++ b/src/commands/cmd_ping.cpp @@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new CommandPing(Instance); } -CmdResult CommandPing::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandPing::Handle (const char** parameters, int, User *user) { user->WriteServ("PONG %s :%s",ServerInstance->Config->ServerName,parameters[0]); return CMD_SUCCESS; diff --git a/src/commands/cmd_pong.cpp b/src/commands/cmd_pong.cpp index e1927deab..5457e4eda 100644 --- a/src/commands/cmd_pong.cpp +++ b/src/commands/cmd_pong.cpp @@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new CommandPong(Instance); } -CmdResult CommandPong::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandPong::Handle (const char**, int, User *user) { // set the user as alive so they survive to next ping user->lastping = 1; diff --git a/src/commands/cmd_reloadmodule.cpp b/src/commands/cmd_reloadmodule.cpp index 5180807b2..8be2110ec 100644 --- a/src/commands/cmd_reloadmodule.cpp +++ b/src/commands/cmd_reloadmodule.cpp @@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new CommandReloadmodule(Instance); } -CmdResult CommandReloadmodule::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandReloadmodule::Handle (const char** parameters, int, User *user) { if (ServerInstance->Modules->Unload(parameters[0])) { diff --git a/src/commands/cmd_restart.cpp b/src/commands/cmd_restart.cpp index 3f1ff13b8..9e1661bea 100644 --- a/src/commands/cmd_restart.cpp +++ b/src/commands/cmd_restart.cpp @@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new CommandRestart(Instance); } -CmdResult CommandRestart::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandRestart::Handle (const char** parameters, int, User *user) { ServerInstance->Log(DEFAULT,"Restart: %s",user->nick); if (!strcmp(parameters[0],ServerInstance->Config->restartpass)) diff --git a/src/commands/cmd_server.cpp b/src/commands/cmd_server.cpp index 9e80cc386..9b57b6fa4 100644 --- a/src/commands/cmd_server.cpp +++ b/src/commands/cmd_server.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new CommandServer(Instance); } -CmdResult CommandServer::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandServer::Handle (const char**, int, User *user) { user->WriteServ("666 %s :You cannot identify as a server, you are a USER. IRC Operators informed.",user->nick); ServerInstance->WriteOpers("*** WARNING: %s attempted to issue a SERVER command and is registered as a user!",user->nick); diff --git a/src/commands/cmd_squit.cpp b/src/commands/cmd_squit.cpp index 8f1cbf43d..f6c8c7b1e 100644 --- a/src/commands/cmd_squit.cpp +++ b/src/commands/cmd_squit.cpp @@ -24,7 +24,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new CommandSquit(Instance); } -CmdResult CommandSquit::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandSquit::Handle (const char**, int, User *user) { user->WriteServ( "NOTICE %s :Look into loading a linking module (like m_spanningtree) if you want this to do anything useful.", user->nick); return CMD_FAILURE; diff --git a/src/commands/cmd_time.cpp b/src/commands/cmd_time.cpp index 97f4eb5ae..7d35c7128 100644 --- a/src/commands/cmd_time.cpp +++ b/src/commands/cmd_time.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new CommandTime(Instance); } -CmdResult CommandTime::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandTime::Handle (const char**, int, User *user) { struct tm* timeinfo; time_t local = ServerInstance->Time(); diff --git a/src/commands/cmd_trace.cpp b/src/commands/cmd_trace.cpp index d1e57ab00..7b2b86e5c 100644 --- a/src/commands/cmd_trace.cpp +++ b/src/commands/cmd_trace.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) /** XXX: This is crap. someone fix this when you have time, to be more useful. */ -CmdResult CommandTrace::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandTrace::Handle (const char**, int, User *user) { for (user_hash::iterator i = ServerInstance->clientlist->begin(); i != ServerInstance->clientlist->end(); i++) { diff --git a/src/commands/cmd_unloadmodule.cpp b/src/commands/cmd_unloadmodule.cpp index fc20d4895..3c66d52e0 100644 --- a/src/commands/cmd_unloadmodule.cpp +++ b/src/commands/cmd_unloadmodule.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new CommandUnloadmodule(Instance); } -CmdResult CommandUnloadmodule::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandUnloadmodule::Handle (const char** parameters, int, User *user) { if (ServerInstance->Modules->Unload(parameters[0])) { diff --git a/src/commands/cmd_user.cpp b/src/commands/cmd_user.cpp index 0f64600e9..7d3f73a3f 100644 --- a/src/commands/cmd_user.cpp +++ b/src/commands/cmd_user.cpp @@ -19,7 +19,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new CommandUser(Instance); } -CmdResult CommandUser::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandUser::Handle (const char** parameters, int, User *user) { /* A user may only send the USER command once */ if (!(user->registered & REG_USER)) diff --git a/src/commands/cmd_version.cpp b/src/commands/cmd_version.cpp index 19bb9e4af..7c1a20f45 100644 --- a/src/commands/cmd_version.cpp +++ b/src/commands/cmd_version.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new CommandVersion(Instance); } -CmdResult CommandVersion::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandVersion::Handle (const char**, int, User *user) { user->WriteServ("351 %s :%s",user->nick,ServerInstance->GetVersionString().c_str()); ServerInstance->Config->Send005(user); diff --git a/src/commands/cmd_wallops.cpp b/src/commands/cmd_wallops.cpp index f2a4ddfd9..ffdb05805 100644 --- a/src/commands/cmd_wallops.cpp +++ b/src/commands/cmd_wallops.cpp @@ -21,7 +21,7 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) return new CommandWallops(Instance); } -CmdResult CommandWallops::Handle (const char** parameters, int pcnt, User *user) +CmdResult CommandWallops::Handle (const char** parameters, int, User *user) { user->WriteWallOps(std::string(parameters[0])); FOREACH_MOD(I_OnWallops,OnWallops(user,parameters[0])); diff --git a/src/commands/cmd_whowas.cpp b/src/commands/cmd_whowas.cpp index 005a23489..c6680a22a 100644 --- a/src/commands/cmd_whowas.cpp +++ b/src/commands/cmd_whowas.cpp @@ -28,7 +28,7 @@ CommandWhowas::CommandWhowas(InspIRCd* Instance) : Command(Instance, "WHOWAS", 0 Instance->Timers->AddTimer(timer); } -CmdResult CommandWhowas::Handle (const char** parameters, int pcnt, User* user) +CmdResult CommandWhowas::Handle (const char** parameters, int, User* user) { /* if whowas disabled in config */ if (ServerInstance->Config->WhoWasGroupSize == 0 || ServerInstance->Config->WhoWasMaxGroups == 0) @@ -337,7 +337,7 @@ WhoWasGroup::~WhoWasGroup() } /* every hour, run this function which removes all entries older than Config->WhoWasMaxKeep */ -void WhoWasMaintainTimer::Tick(time_t t) +void WhoWasMaintainTimer::Tick(time_t) { Command* whowas_command = ServerInstance->Parser->GetHandler("WHOWAS"); if (whowas_command) diff --git a/src/socket.cpp b/src/socket.cpp index 324f7633a..09885eca1 100644 --- a/src/socket.cpp +++ b/src/socket.cpp @@ -65,7 +65,7 @@ ListenSocket::~ListenSocket() } } -void ListenSocket::HandleEvent(EventType et, int errornum) +void ListenSocket::HandleEvent(EventType, int) { sockaddr* sock_us = new sockaddr[2]; // our port number sockaddr* client = new sockaddr[2]; @@ -426,7 +426,8 @@ int irc::sockets::OpenTCPSocket(char* addr, int socktype) { int sockfd; int on = 1; - struct linger linger = { 0 }; + addr = addr; + struct linger linger = { 0, 0 }; #ifdef IPV6 if (strchr(addr,':') || (!*addr)) sockfd = socket (PF_INET6, socktype, 0); @@ -450,7 +451,7 @@ int irc::sockets::OpenTCPSocket(char* addr, int socktype) } } -int InspIRCd::BindPorts(bool bail, int &ports_found, FailedPortList &failed_ports) +int InspIRCd::BindPorts(bool, int &ports_found, FailedPortList &failed_ports) { char configToken[MAXBUF], Addr[MAXBUF], Type[MAXBUF]; int bound = 0; -- cgit v1.2.3