diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/bots.cpp | 6 | ||||
| -rw-r--r-- | src/command.cpp | 2 | ||||
| -rw-r--r-- | src/config.cpp | 6 | ||||
| -rw-r--r-- | src/dns.cpp | 2 | ||||
| -rw-r--r-- | src/memoserv.cpp | 2 | ||||
| -rw-r--r-- | src/sessions.cpp | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/src/bots.cpp b/src/bots.cpp index fbb5de3c7..e1d70d05a 100644 --- a/src/bots.cpp +++ b/src/bots.cpp @@ -155,9 +155,9 @@ void BotInfo::Join(Channel *c, bool update_ts) } Anope::string Limit; - int limit = 0; - if (c->GetParam(CMODE_LIMIT, Limit) && Limit.is_number_only()) - limit = convertTo<int>(Limit); + unsigned limit = 0; + if (c->GetParam(CMODE_LIMIT, Limit) && Limit.is_pos_number_only()) + limit = convertTo<unsigned>(Limit); /* Should we be invited? */ if (c->HasMode(CMODE_INVITE) || (limit && c->users.size() >= limit)) diff --git a/src/command.cpp b/src/command.cpp index 93c1f978c..19ca62544 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -46,7 +46,7 @@ bool Command::DelSubcommand(Command *c) return false; } -Command *Command::FindSubcommand(const Anope::string &name) +Command *Command::FindSubcommand(const Anope::string &subcommand) { return NULL; } diff --git a/src/config.cpp b/src/config.cpp index e692682b8..898f9bf70 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -1101,7 +1101,7 @@ void ServerConfig::Read() {"nickserv", "resenddelay", "0", new ValueContainerTime(&this->NSResendDelay), DT_TIME, NoValidation}, {"nickserv", "expire", "21d", new ValueContainerTime(&this->NSExpire), DT_TIME, NoValidation}, {"nickserv", "preregexpire", "0", new ValueContainerTime(&this->NSRExpire), DT_TIME, ValidateEmailReg}, - {"nickserv", "maxaliases", "0", new ValueContainerInt(&this->NSMaxAliases), DT_INTEGER, NoValidation}, + {"nickserv", "maxaliases", "0", new ValueContainerUInt(&this->NSMaxAliases), DT_UINTEGER, NoValidation}, {"nickserv", "accessmax", "0", new ValueContainerUInt(&this->NSAccessMax), DT_UINTEGER, ValidateNotZero}, {"nickserv", "enforceruser", "", new ValueContainerString(&temp_nsuserhost), DT_STRING, ValidateNotEmpty}, {"nickserv", "releasetimeout", "0", new ValueContainerTime(&this->NSReleaseTimeout), DT_TIME, ValidateNotZero}, @@ -1176,7 +1176,7 @@ void ServerConfig::Read() {"operserv", "exceptionexpiry", "0", new ValueContainerTime(&this->ExceptionExpiry), DT_TIME, ValidateOperServ}, {"operserv", "sessionlimitexceeded", "", new ValueContainerString(&this->SessionLimitExceeded), DT_STRING, NoValidation}, {"operserv", "sessionlimitdetailsloc", "", new ValueContainerString(&this->SessionLimitDetailsLoc), DT_STRING, NoValidation}, - {"operserv", "maxsessionkill", "0", new ValueContainerInt(&this->MaxSessionKill), DT_INTEGER, NoValidation}, + {"operserv", "maxsessionkill", "0", new ValueContainerUInt(&this->MaxSessionKill), DT_UINTEGER, NoValidation}, {"operserv", "sessionautokillexpiry", "0", new ValueContainerTime(&this->SessionAutoKillExpiry), DT_TIME, NoValidation}, {"operserv", "addakiller", "no", new ValueContainerBool(&this->AddAkiller), DT_BOOLEAN, NoValidation}, {"operserv", "opersonly", "no", new ValueContainerBool(&this->OSOpersOnly), DT_BOOLEAN, NoValidation}, @@ -1187,7 +1187,7 @@ void ServerConfig::Read() {"defcon", "level3", "", new ValueContainerString(&DefCon3), DT_STRING, ValidateDefCon}, {"defcon", "level2", "", new ValueContainerString(&DefCon2), DT_STRING, ValidateDefCon}, {"defcon", "level1", "", new ValueContainerString(&DefCon1), DT_STRING, ValidateDefCon}, - {"defcon", "sessionlimit", "0", new ValueContainerInt(&this->DefConSessionLimit), DT_INTEGER, ValidateDefCon}, + {"defcon", "sessionlimit", "0", new ValueContainerUInt(&this->DefConSessionLimit), DT_UINTEGER, ValidateDefCon}, {"defcon", "akillexpire", "0", new ValueContainerTime(&this->DefConAKILL), DT_TIME, ValidateDefCon}, {"defcon", "chanmodes", "", new ValueContainerString(&this->DefConChanModes), DT_STRING, ValidateDefCon}, {"defcon", "timeout", "0", new ValueContainerTime(&this->DefConTimeOut), DT_TIME, NoValidation}, diff --git a/src/dns.cpp b/src/dns.cpp index 2c586b02e..c4cfbda51 100644 --- a/src/dns.cpp +++ b/src/dns.cpp @@ -38,7 +38,7 @@ DNSRequest::DNSRequest(const Anope::string &addr, QueryType qt, bool cache, Modu return; } - short packet_id; + unsigned short packet_id; while (DNSEngine->requests.count((packet_id = GetRandomID()))); p->id = this->id = packet_id; diff --git a/src/memoserv.cpp b/src/memoserv.cpp index f27db9742..3d45dac2e 100644 --- a/src/memoserv.cpp +++ b/src/memoserv.cpp @@ -296,7 +296,7 @@ void memo_send(User *u, const Anope::string &name, const Anope::string &text, in * @param num Memo number to delete * @return int 1 if the memo was found, else 0. */ -bool delmemo(MemoInfo *mi, int num) +bool delmemo(MemoInfo *mi, unsigned num) { if (mi->memos.empty()) return false; diff --git a/src/sessions.cpp b/src/sessions.cpp index 38dfedef5..f13683050 100644 --- a/src/sessions.cpp +++ b/src/sessions.cpp @@ -255,7 +255,7 @@ Exception *find_hostip_exception(const Anope::string &host, const Anope::string /************************ Exception Manipulation *************************/ /*************************************************************************/ -int exception_add(User *u, const Anope::string &mask, int limit, const Anope::string &reason, const Anope::string &who, time_t expires) +int exception_add(User *u, const Anope::string &mask, unsigned limit, const Anope::string &reason, const Anope::string &who, time_t expires) { /* Check if an exception already exists for this mask */ for (std::vector<Exception *>::iterator it = exceptions.begin(), it_end = exceptions.end(); it != it_end; ++it) |