Fix Windows build

src/modules/antimixedutf8.c

@@ -177,7 +177,8 @@ CMD_OVERRIDE_FUNC(override_msg)
 	if (!MyUser(client) || (parc < 3) || BadPtr(parv[2]))
 	{
 		/* Short circuit for: remote clients or insufficient parameters */
-		return CallCommandOverride(ovr, client, recv_mtags, parc, parv);
+		CallCommandOverride(ovr, client, recv_mtags, parc, parv);
+		return;
 	}
 
 	score = lookalikespam_score(StripControlCodes(parv[2]));
@@ -201,7 +202,7 @@ CMD_OVERRIDE_FUNC(override_msg)
 		}
 	}
 
-	return CallCommandOverride(ovr, client, recv_mtags, parc, parv);
+	CallCommandOverride(ovr, client, recv_mtags, parc, parv);
 }
 
 /*** rest is module and config stuff ****/

src/modules/cap.c

@@ -415,5 +415,5 @@ CMD_FUNC(cmd_cap)
 		return;
 	}
 
-	return (cmd->func)(client, parv[2]);
+	cmd->func(client, parv[2]);
 }

src/modules/hideserver.c

@@ -323,7 +323,10 @@ CMD_OVERRIDE_FUNC(override_map)
 		parv[1] = "*";
 	
 	if (IsOper(client))
-		return CallCommandOverride(ovr, client, recv_mtags, parc, parv);
+	{
+		CallCommandOverride(ovr, client, recv_mtags, parc, parv);
+		return;
+	}
 
 	if (Settings.disable_map)
 	{
@@ -360,7 +363,10 @@ CMD_OVERRIDE_FUNC(override_links)
 	int flat = (FLAT_MAP && !IsOper(client)) ? 1 : 0;
 
 	if (IsOper(client))
-		return CallCommandOverride(ovr, client, recv_mtags, parc, parv);
+	{
+		CallCommandOverride(ovr, client, recv_mtags, parc, parv);
+		return;
+	}
 
 	if (Settings.disable_links)
 	{

src/modules/invite.c

@@ -79,7 +79,10 @@ CMD_FUNC(cmd_invite)
 	Hook *h;
 
 	if (parc == 1)
-		return send_invite_list(client);
+	{
+		send_invite_list(client);
+		return;
+	}
 	
 	if (parc < 3 || *parv[1] == '\0')
 	{

src/modules/mode.c

@@ -108,13 +108,15 @@ CMD_FUNC(cmd_mode)
 			channel = find_channel(parv[1], NULL);
 			if (!channel)
 			{
-				return cmd_umode(client, recv_mtags, parc, parv);
+				cmd_umode(client, recv_mtags, parc, parv);
+				return;
 			}
+		} else
+		{
+			cmd_umode(client, recv_mtags, parc, parv);
+			return;
 		}
-		else
-			return cmd_umode(client, recv_mtags, parc, parv);
-	}
-	else
+	} else
 	{
 		sendnumeric(client, ERR_NEEDMOREPARAMS, "MODE");
 		return;

src/modules/pingpong.c

@@ -156,7 +156,10 @@ CMD_FUNC(cmd_pong)
 	char *origin, *destination;
 
 	if (!IsRegistered(client))
-		return cmd_nospoof(client, recv_mtags, parc, parv);
+	{
+		cmd_nospoof(client, recv_mtags, parc, parv);
+		return;
+	}
 
 	if (parc < 2 || *parv[1] == '\0')
 	{

src/modules/reputation.c

@@ -833,10 +833,9 @@ CMD_FUNC(reputation_server_cmd)
 CMD_FUNC(reputation_cmd)
 {
 	if (MyUser(client))
-		return reputation_user_cmd(client, recv_mtags, parc, parv);
-
-	if (IsServer(client))
-		return reputation_server_cmd(client, recv_mtags, parc, parv);
+		reputation_user_cmd(client, recv_mtags, parc, parv);
+	else if (IsServer(client))
+		reputation_server_cmd(client, recv_mtags, parc, parv);
 }
 
 int reputation_whois(Client *client, Client *target)

src/modules/restrict-commands.c

@@ -366,7 +366,10 @@ CMD_OVERRIDE_FUNC(rcmd_override)
 	RestrictedCommand *rcmd;
 
 	if (!MyUser(client) || !client->local || IsOper(client) || IsULine(client))
-		return CallCommandOverride(ovr, client, recv_mtags, parc, parv);
+	{
+		CallCommandOverride(ovr, client, recv_mtags, parc, parv);
+		return;
+	}
 
 	rcmd = find_restrictions_bycmd(ovr->command->cmd);
 	if (rcmd)
@@ -384,5 +387,5 @@ CMD_OVERRIDE_FUNC(rcmd_override)
 	}
 
 	// No restrictions apply, process command as normal =]
-	return CallCommandOverride(ovr, client, recv_mtags, parc, parv);
+	CallCommandOverride(ovr, client, recv_mtags, parc, parv);
 }

src/modules/rmtkl.c

@@ -179,7 +179,8 @@ int rmtkl_tryremove(Client *client, TKLType *tkltype, TKL *tkl, char *uhmask, ch
 	return 1;
 }
 
-CMD_FUNC(rmtkl) {
+CMD_FUNC(rmtkl)
+{
 	TKL *tkl, *next;
 	TKLType *tkltype;
 	char *types, *uhmask, *commentmask, *p;
@@ -195,7 +196,10 @@ CMD_FUNC(rmtkl) {
 	}
 
 	if (IsNotParam(1))
-		return dump_str(client, rmtkl_help);
+	{
+		dump_str(client, rmtkl_help);
+		return;
+	}
 
 	if (IsNotParam(2))
 	{

src/modules/server.c

@@ -620,7 +620,8 @@ CMD_FUNC(cmd_server)
 	}
 	else
 	{
-		return cmd_server_remote(client, recv_mtags, parc, parv);
+		cmd_server_remote(client, recv_mtags, parc, parv);
+		return;
 	}
 }
 

src/modules/sinfo.c

@@ -157,7 +157,7 @@ CMD_FUNC(sinfo_user)
 CMD_FUNC(cmd_sinfo)
 {
 	if (IsServer(client))
-		return sinfo_server(client, recv_mtags, parc, parv);
+		sinfo_server(client, recv_mtags, parc, parv);
 	else if (MyUser(client))
-		return sinfo_user(client, recv_mtags, parc, parv);
+		sinfo_user(client, recv_mtags, parc, parv);
 }

src/modules/svsnolag.c

@@ -96,10 +96,10 @@ void do_svsnolag(Client *client, int parc, char *parv[], int show_change)
 
 CMD_FUNC(cmd_svsnolag)
 {
-	return do_svsnolag(client, parc, parv, 0);
+	do_svsnolag(client, parc, parv, 0);
 }
 
 CMD_FUNC(cmd_svs2nolag)
 {
-	return do_svsnolag(client, parc, parv, 1);
+	do_svsnolag(client, parc, parv, 1);
 }

src/modules/svssno.c

@@ -124,10 +124,10 @@ void do_svssno(Client *client, int parc, char *parv[], int show_change)
 
 CMD_FUNC(cmd_svssno)
 {
-	return do_svssno(client, parc, parv, 0);
+	do_svssno(client, parc, parv, 0);
 }
 
 CMD_FUNC(cmd_svs2sno)
 {
-	return do_svssno(client, parc, parv, 1);
+	do_svssno(client, parc, parv, 1);
 }

src/modules/tkl.c

@@ -1416,7 +1416,10 @@ CMD_FUNC(cmd_eline)
 	 * The 'add' case is checked later.
 	 */
 	if ((parc < 2) || BadPtr(parv[1]))
-		return eline_syntax(client);
+	{
+		eline_syntax(client);
+		return;
+	}
 
 	mask = parv[1];
 	if (*mask == '-')
@@ -1436,7 +1439,10 @@ CMD_FUNC(cmd_eline)
 	if (add)
 	{
 		if ((parc < 5) || BadPtr(parv[4]))
-			return eline_syntax(client);
+		{
+			eline_syntax(client);
+			return;
+		}
 		bantypes = parv[2];
 		reason = parv[4];
 	}
@@ -1524,7 +1530,8 @@ CMD_FUNC(cmd_eline)
 		if ((secs <= 0) && (*parv[3] != '0'))
 		{
 			sendnotice(client, "*** [error] The expiry time you specified is out of range!");
-			return eline_syntax(client);
+			eline_syntax(client);
+			return;
 		}
 	}
 
@@ -1578,7 +1585,7 @@ void spamfilter_new_usage(Client *client, char *parv[])
 	if (*parv[2] != '-')
 		sendnotice(client, "Using the old 3.2.x /SPAMFILTER syntax? Note the new -regex/-posix/-simple field!!");
 
-	return spamfilter_usage(client);
+	spamfilter_usage(client);
 } 
 
 /** Delete a spamfilter by ID (the ID can be obtained via '/SPAMFILTER del' */
@@ -1707,14 +1714,21 @@ CMD_FUNC(cmd_spamfilter)
 			do_cmd(client, recv_mtags, "STATS", 4, parv);
 			return;
 		}
-		return spamfilter_del_by_id(client, parv[2]);
+		spamfilter_del_by_id(client, parv[2]);
+		return;
 	}
 
 	if ((parc == 7) && (*parv[2] != '-'))
-		return spamfilter_new_usage(client,parv);
+	{
+		spamfilter_new_usage(client,parv);
+		return;
+	}
 
 	if ((parc < 8) || BadPtr(parv[7]))
-		return spamfilter_usage(client);
+	{
+		spamfilter_usage(client);
+		return;
+	}
 
 	/* parv[1]: [add|del|+|-]
 	 * parv[2]: match-type
@@ -1731,7 +1745,8 @@ CMD_FUNC(cmd_spamfilter)
 	else
 	{
 		sendnotice(client, "1st parameter invalid");
-		return spamfilter_usage(client);
+		spamfilter_usage(client);
+		return;
 	}
 
 	if ((whattodo == 0) && !strcasecmp(parv[2]+1, "posix"))
@@ -1744,12 +1759,16 @@ CMD_FUNC(cmd_spamfilter)
 	match_type = unreal_match_method_strtoval(parv[2]+1);
 	if (!match_type)
 	{
-		return spamfilter_new_usage(client,parv);
+		spamfilter_new_usage(client, parv);
+		return;
 	}
 
 	targets = spamfilter_gettargets(parv[3], client);
 	if (!targets)
-		return spamfilter_usage(client);
+	{
+		spamfilter_usage(client);
+		return;
+	}
 
 	strlcpy(targetbuf, spamfilter_target_inttostring(targets), sizeof(targetbuf));
 
@@ -1757,7 +1776,8 @@ CMD_FUNC(cmd_spamfilter)
 	if (!action)
 	{
 		sendnotice(client, "Invalid 'action' field (%s)", parv[4]);
-		return spamfilter_usage(client);
+		spamfilter_usage(client);
+		return;
 	}
 	actionbuf[0] = banact_valtochar(action);
 	actionbuf[1] = '\0';
@@ -4023,9 +4043,9 @@ CMD_FUNC(_cmd_tkl)
 	switch (*parv[1])
 	{
 		case '+':
-			return cmd_tkl_add(client, recv_mtags, parc, parv);
+			cmd_tkl_add(client, recv_mtags, parc, parv);
 		case '-':
-			return cmd_tkl_del(client, recv_mtags, parc, parv);
+			cmd_tkl_del(client, recv_mtags, parc, parv);
 		default:
 			break;
 	}

src/modules/umode2.c

@@ -70,5 +70,5 @@ CMD_FUNC(cmd_umode2)
 
 	if (!parv[1])
 		return;
-	return cmd_umode(client, recv_mtags, (parc > 3) ? 4 : 3, xparv);
+	cmd_umode(client, recv_mtags, (parc > 3) ? 4 : 3, xparv);
 }

src/modules/webirc.c

@@ -437,7 +437,7 @@ CMD_FUNC(cmd_webirc)
 	}
 
 	/* And do our job.. */
-	return dowebirc(client, ip, host, options);
+	dowebirc(client, ip, host, options);
 }
 
 int webirc_check_init(Client *client, char *sockn, size_t size)