diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/modules/m_cban.cpp | 4 | ||||
-rw-r--r-- | src/modules/m_filter.cpp | 12 | ||||
-rw-r--r-- | src/modules/m_rline.cpp | 4 | ||||
-rw-r--r-- | src/modules/m_shun.cpp | 2 | ||||
-rw-r--r-- | src/modules/m_spanningtree/addline.cpp | 2 | ||||
-rw-r--r-- | src/modules/m_svshold.cpp | 4 | ||||
-rw-r--r-- | src/xline.cpp | 10 |
7 files changed, 19 insertions, 19 deletions
diff --git a/src/modules/m_cban.cpp b/src/modules/m_cban.cpp index d1fb23620..250acd2b5 100644 --- a/src/modules/m_cban.cpp +++ b/src/modules/m_cban.cpp @@ -38,7 +38,7 @@ private: std::string matchtext; public: - CBan(time_t s_time, long d, const std::string& src, const std::string& re, const std::string& ch) + CBan(time_t s_time, unsigned long d, const std::string& src, const std::string& re, const std::string& ch) : XLine(s_time, d, src, re, "CBAN") , matchtext(ch) { @@ -70,7 +70,7 @@ class CBanFactory : public XLineFactory /** Generate a CBAN */ - XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE { return new CBan(set_time, duration, source, reason, xline_specific_mask); } diff --git a/src/modules/m_filter.cpp b/src/modules/m_filter.cpp index cfba6c067..357fbf738 100644 --- a/src/modules/m_filter.cpp +++ b/src/modules/m_filter.cpp @@ -54,7 +54,7 @@ class FilterResult std::string freeform; std::string reason; FilterAction action; - long duration; + unsigned long duration; bool from_config; bool flag_no_opers; @@ -64,7 +64,7 @@ class FilterResult bool flag_notice; bool flag_strip_color; - FilterResult(dynamic_reference<RegexFactory>& RegexEngine, const std::string& free, const std::string& rea, FilterAction act, long gt, const std::string& fla, bool cfg) + FilterResult(dynamic_reference<RegexFactory>& RegexEngine, const std::string& free, const std::string& rea, FilterAction act, unsigned long gt, const std::string& fla, bool cfg) : freeform(free) , reason(rea) , action(act) @@ -193,7 +193,7 @@ class ModuleFilter : public Module, public ServerEventListener, public Stats::Ev ModResult OnUserPreMessage(User* user, const MessageTarget& target, MessageDetails& details) CXX11_OVERRIDE; FilterResult* FilterMatch(User* user, const std::string &text, int flags); bool DeleteFilter(const std::string &freeform); - std::pair<bool, std::string> AddFilter(const std::string &freeform, FilterAction type, const std::string &reason, long duration, const std::string &flags); + std::pair<bool, std::string> AddFilter(const std::string& freeform, FilterAction type, const std::string& reason, unsigned long duration, const std::string& flags); void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE; Version GetVersion() CXX11_OVERRIDE; std::string EncodeFilter(FilterResult* filter); @@ -236,7 +236,7 @@ CmdResult CommandFilter::Handle(User* user, const Params& parameters) FilterAction type; const std::string& flags = parameters[2]; unsigned int reasonindex; - long duration = 0; + unsigned long duration = 0; if (!ModuleFilter::StringToFilterAction(parameters[1], type)) { @@ -637,7 +637,7 @@ FilterResult ModuleFilter::DecodeFilter(const std::string &data) std::string duration; tokens.GetMiddle(duration); - res.duration = ConvToNum<long>(duration); + res.duration = ConvToNum<unsigned long>(duration); tokens.GetTrailing(res.reason); @@ -716,7 +716,7 @@ bool ModuleFilter::DeleteFilter(const std::string &freeform) return false; } -std::pair<bool, std::string> ModuleFilter::AddFilter(const std::string &freeform, FilterAction type, const std::string &reason, long duration, const std::string &flgs) +std::pair<bool, std::string> ModuleFilter::AddFilter(const std::string& freeform, FilterAction type, const std::string& reason, unsigned long duration, const std::string& flgs) { for (std::vector<FilterResult>::iterator i = filters.begin(); i != filters.end(); i++) { diff --git a/src/modules/m_rline.cpp b/src/modules/m_rline.cpp index bf6a64d84..c1eeb7b9a 100644 --- a/src/modules/m_rline.cpp +++ b/src/modules/m_rline.cpp @@ -40,7 +40,7 @@ class RLine : public XLine * @param regex Pattern to match with * @ */ - RLine(time_t s_time, long d, const std::string& src, const std::string& re, const std::string& regexs, dynamic_reference<RegexFactory>& rxfactory) + RLine(time_t s_time, unsigned long d, const std::string& src, const std::string& re, const std::string& regexs, dynamic_reference<RegexFactory>& rxfactory) : XLine(s_time, d, src, re, "R") , matchtext(regexs) { @@ -114,7 +114,7 @@ class RLineFactory : public XLineFactory /** Generate a RLine */ - XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE { if (!rxfactory) { diff --git a/src/modules/m_shun.cpp b/src/modules/m_shun.cpp index da090e4f8..91933e7c4 100644 --- a/src/modules/m_shun.cpp +++ b/src/modules/m_shun.cpp @@ -35,7 +35,7 @@ class ShunFactory : public XLineFactory /** Generate a shun */ - XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE { return new Shun(set_time, duration, source, reason, xline_specific_mask); } diff --git a/src/modules/m_spanningtree/addline.cpp b/src/modules/m_spanningtree/addline.cpp index 623942d95..5124339fb 100644 --- a/src/modules/m_spanningtree/addline.cpp +++ b/src/modules/m_spanningtree/addline.cpp @@ -38,7 +38,7 @@ CmdResult CommandAddLine::Handle(User* usr, Params& params) XLine* xl = NULL; try { - xl = xlf->Generate(ServerInstance->Time(), ConvToNum<long>(params[4]), params[2], params[5], params[1]); + xl = xlf->Generate(ServerInstance->Time(), ConvToNum<unsigned long>(params[4]), params[2], params[5], params[1]); } catch (ModuleException &e) { diff --git a/src/modules/m_svshold.cpp b/src/modules/m_svshold.cpp index 2b38653c5..8eecd377d 100644 --- a/src/modules/m_svshold.cpp +++ b/src/modules/m_svshold.cpp @@ -36,7 +36,7 @@ class SVSHold : public XLine public: std::string nickname; - SVSHold(time_t s_time, long d, const std::string& src, const std::string& re, const std::string& nick) + SVSHold(time_t s_time, unsigned long d, const std::string& src, const std::string& re, const std::string& nick) : XLine(s_time, d, src, re, "SVSHOLD") { this->nickname = nick; @@ -78,7 +78,7 @@ class SVSHoldFactory : public XLineFactory /** Generate a shun */ - XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE { return new SVSHold(set_time, duration, source, reason, xline_specific_mask); } diff --git a/src/xline.cpp b/src/xline.cpp index e0151b661..9c84101e1 100644 --- a/src/xline.cpp +++ b/src/xline.cpp @@ -34,7 +34,7 @@ class GLineFactory : public XLineFactory /** Generate a GLine */ - XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE { IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask); return new GLine(set_time, duration, source, reason, ih.first, ih.second); @@ -50,7 +50,7 @@ class ELineFactory : public XLineFactory /** Generate an ELine */ - XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE { IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask); return new ELine(set_time, duration, source, reason, ih.first, ih.second); @@ -66,7 +66,7 @@ class KLineFactory : public XLineFactory /** Generate a KLine */ - XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE { IdentHostPair ih = ServerInstance->XLines->IdentSplit(xline_specific_mask); return new KLine(set_time, duration, source, reason, ih.first, ih.second); @@ -82,7 +82,7 @@ class QLineFactory : public XLineFactory /** Generate a QLine */ - XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE { return new QLine(set_time, duration, source, reason, xline_specific_mask); } @@ -97,7 +97,7 @@ class ZLineFactory : public XLineFactory /** Generate a ZLine */ - XLine* Generate(time_t set_time, long duration, std::string source, std::string reason, std::string xline_specific_mask) CXX11_OVERRIDE + XLine* Generate(time_t set_time, unsigned long duration, const std::string& source, const std::string& reason, const std::string& xline_specific_mask) CXX11_OVERRIDE { return new ZLine(set_time, duration, source, reason, xline_specific_mask); } |