Fix a ton of -Wsign-conversion warnings.

6 files changed, 15 insertions, 14 deletions

diff --git a/src/coremods/core_info/cmd_modules.cpp b/src/coremods/core_info/cmd_modules.cpp
index 47dd2dc92..fa8c2aebb 100644
--- a/src/coremods/core_info/cmd_modules.cpp
+++ b/src/coremods/core_info/cmd_modules.cpp
@@ -66,7 +66,7 @@ CmdResult CommandModules::Handle (const std::vector<std::string>& parameters, Us
 		if (IS_LOCAL(user) && user->HasPrivPermission("servers/auspex"))
 		{
 			std::string flags("VCO");
-			int pos = 0;
+			size_t pos = 0;
 			for (int mult = 2; mult <= VF_OPTCOMMON; mult *= 2, ++pos)
 				if (!(V.Flags & mult))
 					flags[pos] = '-';
diff --git a/src/coremods/core_list.cpp b/src/coremods/core_list.cpp
index 6a62d122f..3c29f7883 100644
--- a/src/coremods/core_list.cpp
+++ b/src/coremods/core_list.cpp
@@ -51,7 +51,7 @@ class CommandList : public Command
  */
 CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User *user)
 {
-	int minusers = 0, maxusers = 0;
+	size_t minusers = 0, maxusers = 0;
 
 	user->WriteNumeric(RPL_LISTSTART, "Channel", "Users Name");
 
@@ -59,11 +59,11 @@ CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User
 	{
 		if (parameters[0][0] == '<')
 		{
-			maxusers = atoi((parameters[0].c_str())+1);
+			maxusers = strtoul((parameters[0].c_str() + 1), NULL, 10);
 		}
 		else if (parameters[0][0] == '>')
 		{
-			minusers = atoi((parameters[0].c_str())+1);
+			minusers = strtoul((parameters[0].c_str() + 1), NULL, 10);
 		}
 	}
 
@@ -76,7 +76,7 @@ CmdResult CommandList::Handle (const std::vector<std::string>& parameters, User
 		Channel* const chan = i->second;
 
 		// attempt to match a glob pattern
-		long users = chan->GetUserCounter();
+		size_t users = chan->GetUserCounter();
 
 		bool too_few = (minusers && (users <= minusers));
 		bool too_many = (maxusers && (users >= maxusers));
diff --git a/src/coremods/core_oper/cmd_kill.cpp b/src/coremods/core_oper/cmd_kill.cpp
index 8a453f7f1..20bbe5a26 100644
--- a/src/coremods/core_oper/cmd_kill.cpp
+++ b/src/coremods/core_oper/cmd_kill.cpp
@@ -136,7 +136,7 @@ RouteDescriptor CommandKill::GetRouting(User* user, const std::vector<std::strin
 }
 
 
-void CommandKill::EncodeParameter(std::string& param, int index)
+void CommandKill::EncodeParameter(std::string& param, unsigned int index)
 {
 	// Manually translate the nick -> uuid (see above), and also the reason (params[1])
 	// because we decorate it if the oper is local and want remote servers to see the
diff --git a/src/coremods/core_oper/core_oper.h b/src/coremods/core_oper/core_oper.h
index 338a369f5..619fdf1fa 100644
--- a/src/coremods/core_oper/core_oper.h
+++ b/src/coremods/core_oper/core_oper.h
@@ -74,7 +74,7 @@ class CommandKill : public Command
 	CmdResult Handle(const std::vector<std::string>& parameters, User* user);
 	RouteDescriptor GetRouting(User* user, const std::vector<std::string>& parameters);
 
-	void EncodeParameter(std::string& param, int index);
+	void EncodeParameter(std::string& param, unsigned int index);
 };
 
 /** Handle /OPER.
diff --git a/src/coremods/core_who.cpp b/src/coremods/core_who.cpp
index 196bf0479..ba1883e77 100644
--- a/src/coremods/core_who.cpp
+++ b/src/coremods/core_who.cpp
@@ -146,10 +146,10 @@ bool CommandWho::whomatch(User* cuser, User* user, const char* matchtext)
 			match = InspIRCd::Match(user->awaymsg, matchtext);
 		else if (opt_time)
 		{
-			long seconds = InspIRCd::Duration(matchtext);
+			time_t seconds = ServerInstance->Time() - InspIRCd::Duration(matchtext);
 
 			// Okay, so time matching, we want all users connected `seconds' ago
-			if (user->signon >= ServerInstance->Time() - seconds)
+			if (user->signon >= seconds)
 				match = true;
 		}
 
diff --git a/src/coremods/core_whois.cpp b/src/coremods/core_whois.cpp
index c2fac7577..d726b6b6c 100644
--- a/src/coremods/core_whois.cpp
+++ b/src/coremods/core_whois.cpp
@@ -55,7 +55,7 @@ class CommandWhois : public SplitCommand
 	Events::ModuleEventProvider evprov;
 	Events::ModuleEventProvider lineevprov;
 
-	void DoWhois(LocalUser* user, User* dest, unsigned long signon, unsigned long idle);
+	void DoWhois(LocalUser* user, User* dest, time_t signon, unsigned long idle);
 	void SendChanList(WhoisContextImpl& whois);
 
  public:
@@ -173,7 +173,7 @@ void CommandWhois::SendChanList(WhoisContextImpl& whois)
 	chanlist.Flush(whois);
 }
 
-void CommandWhois::DoWhois(LocalUser* user, User* dest, unsigned long signon, unsigned long idle)
+void CommandWhois::DoWhois(LocalUser* user, User* dest, time_t signon, unsigned long idle)
 {
 	WhoisContextImpl whois(user, dest, lineevprov);
 
@@ -247,7 +247,7 @@ CmdResult CommandWhois::HandleRemote(const std::vector<std::string>& parameters,
 	if (!localuser)
 		return CMD_FAILURE;
 
-	unsigned long idle = ConvToInt(parameters.back());
+	unsigned long idle = ConvToNum<unsigned long>(parameters.back());
 	DoWhois(localuser, target, target->signon, idle);
 
 	return CMD_SUCCESS;
@@ -256,8 +256,9 @@ CmdResult CommandWhois::HandleRemote(const std::vector<std::string>& parameters,
 CmdResult CommandWhois::HandleLocal(const std::vector<std::string>& parameters, LocalUser* user)
 {
 	User *dest;
-	int userindex = 0;
-	unsigned long idle = 0, signon = 0;
+	unsigned int userindex = 0;
+	unsigned long idle = 0;
+	time_t signon = 0;
 
 	if (CommandParser::LoopCall(user, this, parameters, 0))
 		return CMD_SUCCESS;