From 4be79b163029aae7f322bd9699bb8855a96e0547 Mon Sep 17 00:00:00 2001 From: brain Date: Tue, 23 Oct 2007 20:09:58 +0000 Subject: Pedantic safe git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8317 e03df62e-2008-0410-955e-edbf42e46eb7 --- src/dynamic.cpp | 2 +- src/filelogger.cpp | 2 +- src/helperfuncs.cpp | 2 +- src/inspsocket.cpp | 6 +++--- src/modes/cmode_b.cpp | 10 +++++----- src/modes/cmode_h.cpp | 6 +++--- src/modes/cmode_i.cpp | 2 +- src/modes/cmode_k.cpp | 8 ++++---- src/modes/cmode_l.cpp | 6 +++--- src/modes/cmode_m.cpp | 2 +- src/modes/cmode_n.cpp | 2 +- src/modes/cmode_o.cpp | 6 +++--- src/modes/cmode_p.cpp | 2 +- src/modes/cmode_s.cpp | 2 +- src/modes/cmode_t.cpp | 2 +- src/modes/cmode_v.cpp | 6 +++--- src/modes/umode_i.cpp | 2 +- src/modes/umode_n.cpp | 4 ++-- src/modes/umode_o.cpp | 2 +- src/modes/umode_s.cpp | 2 +- src/modes/umode_w.cpp | 2 +- 21 files changed, 39 insertions(+), 39 deletions(-) (limited to 'src') diff --git a/src/dynamic.cpp b/src/dynamic.cpp index 97660a7a3..0344cfab1 100644 --- a/src/dynamic.cpp +++ b/src/dynamic.cpp @@ -19,7 +19,7 @@ #include #endif -DLLManager::DLLManager(InspIRCd* ServerInstance, const char *fname) +DLLManager::DLLManager(InspIRCd*, const char *fname) { err = NULL; diff --git a/src/filelogger.cpp b/src/filelogger.cpp index 57291efe3..f67ce483c 100644 --- a/src/filelogger.cpp +++ b/src/filelogger.cpp @@ -35,7 +35,7 @@ bool FileLogger::Readable() return false; } -void FileLogger::HandleEvent(EventType et, int errornum) +void FileLogger::HandleEvent(EventType, int) { WriteLogLine(""); if (log) diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp index 15629cd1f..a1d40cc5f 100644 --- a/src/helperfuncs.cpp +++ b/src/helperfuncs.cpp @@ -507,7 +507,7 @@ bool IsIdentHandler::Call(const char* n) } /* open the proper logfile */ -bool InspIRCd::OpenLog(char** argv, int argc) +bool InspIRCd::OpenLog(char**, int) { Config->MyDir = Config->GetFullProgDir(); diff --git a/src/inspsocket.cpp b/src/inspsocket.cpp index f29f23351..d05418472 100644 --- a/src/inspsocket.cpp +++ b/src/inspsocket.cpp @@ -528,7 +528,7 @@ bool BufferedSocket::FlushWriteBuffer() return (fd < 0); } -void SocketTimeout::Tick(time_t now) +void SocketTimeout::Tick(time_t) { if (ServerInstance->SE->GetRef(this->sfd) != this->sock) return; @@ -666,9 +666,9 @@ int BufferedSocket::GetFd() } bool BufferedSocket::OnConnected() { return true; } -void BufferedSocket::OnError(BufferedSocketError e) { return; } +void BufferedSocket::OnError(BufferedSocketError) { return; } int BufferedSocket::OnDisconnect() { return 0; } -int BufferedSocket::OnIncomingConnection(int newfd, char* ip) { return 0; } +int BufferedSocket::OnIncomingConnection(int, char*) { return 0; } bool BufferedSocket::OnDataReady() { return true; } bool BufferedSocket::OnWriteReady() { return true; } void BufferedSocket::OnTimeout() { return; } diff --git a/src/modes/cmode_b.cpp b/src/modes/cmode_b.cpp index 4192a95ce..171727bf3 100644 --- a/src/modes/cmode_b.cpp +++ b/src/modes/cmode_b.cpp @@ -29,7 +29,7 @@ ModeChannelBan::ModeChannelBan(InspIRCd* Instance) : ModeHandler(Instance, 'b', { } -ModeAction ModeChannelBan::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelBan::OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding) { int status = channel->GetStatus(source); /* Call the correct method depending on wether we're adding or removing the mode */ @@ -67,7 +67,7 @@ void ModeChannelBan::RemoveMode(Channel* channel) } } -void ModeChannelBan::RemoveMode(User* user) +void ModeChannelBan::RemoveMode(User*) { } @@ -87,7 +87,7 @@ void ModeChannelBan::DisplayEmptyList(User* user, Channel* channel) user->WriteServ("368 %s %s :End of channel ban list",user->nick, channel->name); } -std::string& ModeChannelBan::AddBan(User *user,std::string &dest,Channel *chan,int status) +std::string& ModeChannelBan::AddBan(User *user, std::string &dest, Channel *chan, int) { if ((!user) || (!chan)) { @@ -142,7 +142,7 @@ std::string& ModeChannelBan::AddBan(User *user,std::string &dest,Channel *chan,i return dest; } -ModePair ModeChannelBan::ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) +ModePair ModeChannelBan::ModeSet(User*, User*, Channel* channel, const std::string ¶meter) { for (BanList::iterator i = channel->bans.begin(); i != channel->bans.end(); i++) { @@ -154,7 +154,7 @@ ModePair ModeChannelBan::ModeSet(User* source, User* dest, Channel* channel, con return std::make_pair(false, parameter); } -std::string& ModeChannelBan::DelBan(User *user,std::string& dest,Channel *chan,int status) +std::string& ModeChannelBan::DelBan(User *user, std::string& dest, Channel *chan, int) { if ((!user) || (!chan)) { diff --git a/src/modes/cmode_h.cpp b/src/modes/cmode_h.cpp index 98187b089..c69a9d6e2 100644 --- a/src/modes/cmode_h.cpp +++ b/src/modes/cmode_h.cpp @@ -28,7 +28,7 @@ unsigned int ModeChannelHalfOp::GetPrefixRank() return HALFOP_VALUE; } -ModePair ModeChannelHalfOp::ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) +ModePair ModeChannelHalfOp::ModeSet(User*, User*, Channel* channel, const std::string ¶meter) { User* x = ServerInstance->FindNick(parameter); if (x) @@ -66,11 +66,11 @@ void ModeChannelHalfOp::RemoveMode(Channel* channel) } -void ModeChannelHalfOp::RemoveMode(User* user) +void ModeChannelHalfOp::RemoveMode(User*) { } -ModeAction ModeChannelHalfOp::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelHalfOp::OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding) { /* If halfops are not enabled in the conf, we don't execute * anything in this class at all. diff --git a/src/modes/cmode_i.cpp b/src/modes/cmode_i.cpp index 550ea24d1..5dd2572bf 100644 --- a/src/modes/cmode_i.cpp +++ b/src/modes/cmode_i.cpp @@ -21,7 +21,7 @@ ModeChannelInviteOnly::ModeChannelInviteOnly(InspIRCd* Instance) : ModeHandler(I { } -ModeAction ModeChannelInviteOnly::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelInviteOnly::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding) { if (channel->modes[CM_INVITEONLY] != adding) { diff --git a/src/modes/cmode_k.cpp b/src/modes/cmode_k.cpp index 34d8a6452..11f13c323 100644 --- a/src/modes/cmode_k.cpp +++ b/src/modes/cmode_k.cpp @@ -21,7 +21,7 @@ ModeChannelKey::ModeChannelKey(InspIRCd* Instance) : ModeHandler(Instance, 'k', { } -ModePair ModeChannelKey::ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) +ModePair ModeChannelKey::ModeSet(User*, User*, Channel* channel, const std::string ¶meter) { if (channel->modes[CM_KEY]) { @@ -48,17 +48,17 @@ void ModeChannelKey::RemoveMode(Channel* channel) } } -void ModeChannelKey::RemoveMode(User* user) +void ModeChannelKey::RemoveMode(User*) { } -bool ModeChannelKey::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel) +bool ModeChannelKey::CheckTimeStamp(time_t, time_t, const std::string &their_param, const std::string &our_param, Channel*) { /* When TS is equal, the alphabetically later channel key wins */ return (their_param < our_param); } -ModeAction ModeChannelKey::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelKey::OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding) { if ((channel->modes[CM_KEY] != adding) || (!IS_LOCAL(source))) { diff --git a/src/modes/cmode_l.cpp b/src/modes/cmode_l.cpp index 50ee28683..39e8b675b 100644 --- a/src/modes/cmode_l.cpp +++ b/src/modes/cmode_l.cpp @@ -21,7 +21,7 @@ ModeChannelLimit::ModeChannelLimit(InspIRCd* Instance) : ModeHandler(Instance, ' { } -ModePair ModeChannelLimit::ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) +ModePair ModeChannelLimit::ModeSet(User*, User*, Channel* channel, const std::string ¶meter) { if (channel->limit) { @@ -33,13 +33,13 @@ ModePair ModeChannelLimit::ModeSet(User* source, User* dest, Channel* channel, c } } -bool ModeChannelLimit::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel) +bool ModeChannelLimit::CheckTimeStamp(time_t, time_t, const std::string &their_param, const std::string &our_param, Channel*) { /* When TS is equal, the higher channel limit wins */ return (atoi(their_param.c_str()) < atoi(our_param.c_str())); } -ModeAction ModeChannelLimit::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelLimit::OnModeChange(User*, User*, Channel* channel, std::string ¶meter, bool adding) { if (adding) { diff --git a/src/modes/cmode_m.cpp b/src/modes/cmode_m.cpp index ad17d5d30..40a49dd88 100644 --- a/src/modes/cmode_m.cpp +++ b/src/modes/cmode_m.cpp @@ -21,7 +21,7 @@ ModeChannelModerated::ModeChannelModerated(InspIRCd* Instance) : ModeHandler(Ins { } -ModeAction ModeChannelModerated::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelModerated::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding) { if (channel->modes[CM_MODERATED] != adding) { diff --git a/src/modes/cmode_n.cpp b/src/modes/cmode_n.cpp index 1bad2f92f..7324287b2 100644 --- a/src/modes/cmode_n.cpp +++ b/src/modes/cmode_n.cpp @@ -21,7 +21,7 @@ ModeChannelNoExternal::ModeChannelNoExternal(InspIRCd* Instance) : ModeHandler(I { } -ModeAction ModeChannelNoExternal::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelNoExternal::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding) { if (channel->modes[CM_NOEXTERNAL] != adding) { diff --git a/src/modes/cmode_o.cpp b/src/modes/cmode_o.cpp index a43eaeac9..239f75070 100644 --- a/src/modes/cmode_o.cpp +++ b/src/modes/cmode_o.cpp @@ -28,7 +28,7 @@ unsigned int ModeChannelOp::GetPrefixRank() return OP_VALUE; } -ModePair ModeChannelOp::ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) +ModePair ModeChannelOp::ModeSet(User*, User*, Channel* channel, const std::string ¶meter) { User* x = ServerInstance->FindNick(parameter); if (x) @@ -66,11 +66,11 @@ void ModeChannelOp::RemoveMode(Channel* channel) } } -void ModeChannelOp::RemoveMode(User* user) +void ModeChannelOp::RemoveMode(User*) { } -ModeAction ModeChannelOp::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelOp::OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding) { int status = channel->GetStatus(source); diff --git a/src/modes/cmode_p.cpp b/src/modes/cmode_p.cpp index c9749dc38..83282248b 100644 --- a/src/modes/cmode_p.cpp +++ b/src/modes/cmode_p.cpp @@ -21,7 +21,7 @@ ModeChannelPrivate::ModeChannelPrivate(InspIRCd* Instance) : ModeHandler(Instanc { } -ModeAction ModeChannelPrivate::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelPrivate::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding) { if (channel->modes[CM_PRIVATE] != adding) { diff --git a/src/modes/cmode_s.cpp b/src/modes/cmode_s.cpp index 47e66d139..fa85caaac 100644 --- a/src/modes/cmode_s.cpp +++ b/src/modes/cmode_s.cpp @@ -21,7 +21,7 @@ ModeChannelSecret::ModeChannelSecret(InspIRCd* Instance) : ModeHandler(Instance, { } -ModeAction ModeChannelSecret::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelSecret::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding) { if (channel->modes[CM_SECRET] != adding) { diff --git a/src/modes/cmode_t.cpp b/src/modes/cmode_t.cpp index 7124ecec4..7a6c8a4a7 100644 --- a/src/modes/cmode_t.cpp +++ b/src/modes/cmode_t.cpp @@ -21,7 +21,7 @@ ModeChannelTopicOps::ModeChannelTopicOps(InspIRCd* Instance) : ModeHandler(Insta { } -ModeAction ModeChannelTopicOps::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelTopicOps::OnModeChange(User*, User*, Channel* channel, std::string&, bool adding) { if (channel->modes[CM_TOPICLOCK] != adding) { diff --git a/src/modes/cmode_v.cpp b/src/modes/cmode_v.cpp index b472cb1fc..aa33d7944 100644 --- a/src/modes/cmode_v.cpp +++ b/src/modes/cmode_v.cpp @@ -28,7 +28,7 @@ unsigned int ModeChannelVoice::GetPrefixRank() return VOICE_VALUE; } -ModePair ModeChannelVoice::ModeSet(User* source, User* dest, Channel* channel, const std::string ¶meter) +ModePair ModeChannelVoice::ModeSet(User*, User*, Channel* channel, const std::string ¶meter) { User* x = ServerInstance->FindNick(parameter); if (x) @@ -65,11 +65,11 @@ void ModeChannelVoice::RemoveMode(Channel* channel) } } -void ModeChannelVoice::RemoveMode(User* user) +void ModeChannelVoice::RemoveMode(User*) { } -ModeAction ModeChannelVoice::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +ModeAction ModeChannelVoice::OnModeChange(User* source, User*, Channel* channel, std::string ¶meter, bool adding) { int status = channel->GetStatus(source); diff --git a/src/modes/umode_i.cpp b/src/modes/umode_i.cpp index e6a142459..63ee885c6 100644 --- a/src/modes/umode_i.cpp +++ b/src/modes/umode_i.cpp @@ -21,7 +21,7 @@ ModeUserInvisible::ModeUserInvisible(InspIRCd* Instance) : ModeHandler(Instance, { } -ModeAction ModeUserInvisible::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +ModeAction ModeUserInvisible::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding) { /* Only opers can change other users modes */ if ((source != dest) && (!*source->oper)) diff --git a/src/modes/umode_n.cpp b/src/modes/umode_n.cpp index 0ffffac10..217e06ea1 100644 --- a/src/modes/umode_n.cpp +++ b/src/modes/umode_n.cpp @@ -21,13 +21,13 @@ ModeUserServerNoticeMask::ModeUserServerNoticeMask(InspIRCd* Instance) : ModeHan { } -ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +ModeAction ModeUserServerNoticeMask::OnModeChange(User* source, User* dest, Channel*, std::string ¶meter, bool adding) { /* Only opers can change other users modes */ if ((source != dest) && (!*source->oper)) return MODEACTION_DENY; - /* Set the bitfields */ + /* Set the array fields */ if (adding) { /* Fix for bug #310 reported by Smartys */ diff --git a/src/modes/umode_o.cpp b/src/modes/umode_o.cpp index 2415a940a..5a3b8f7c6 100644 --- a/src/modes/umode_o.cpp +++ b/src/modes/umode_o.cpp @@ -21,7 +21,7 @@ ModeUserOperator::ModeUserOperator(InspIRCd* Instance) : ModeHandler(Instance, ' { } -ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +ModeAction ModeUserOperator::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding) { /* Only opers can execute this class at all */ if (!*source->oper) diff --git a/src/modes/umode_s.cpp b/src/modes/umode_s.cpp index 01e57da5b..02ba9a8f5 100644 --- a/src/modes/umode_s.cpp +++ b/src/modes/umode_s.cpp @@ -21,7 +21,7 @@ ModeUserServerNotice::ModeUserServerNotice(InspIRCd* Instance) : ModeHandler(Ins { } -ModeAction ModeUserServerNotice::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +ModeAction ModeUserServerNotice::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding) { /* Only opers can change other users modes */ if ((source != dest) && (!*source->oper)) diff --git a/src/modes/umode_w.cpp b/src/modes/umode_w.cpp index 914327cbd..7a24e0d62 100644 --- a/src/modes/umode_w.cpp +++ b/src/modes/umode_w.cpp @@ -21,7 +21,7 @@ ModeUserWallops::ModeUserWallops(InspIRCd* Instance) : ModeHandler(Instance, 'w' { } -ModeAction ModeUserWallops::OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding) +ModeAction ModeUserWallops::OnModeChange(User* source, User* dest, Channel*, std::string&, bool adding) { /* Only opers can change other users modes */ if ((source != dest) && (!*source->oper)) -- cgit v1.2.3