From b9a80f28f73fc031bada963590f4a8e05b62dcf6 Mon Sep 17 00:00:00 2001
From: cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864>
Date: Fri, 13 Feb 2009 03:44:51 +0000
Subject: [PATCH] Audited os_modload, os_modunload, os_shutdown, os_stats, and
 os_svsnick.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2031 5417fbe8-f217-4b02-8779-1006273d7864
---
 TODO                  | 5 -----
 src/core/os_modload.c | 9 +--------
 src/core/os_stats.c   | 6 +++---
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/TODO b/TODO
index 007fb06e3..6bd7d2894 100644
--- a/TODO
+++ b/TODO
@@ -94,8 +94,6 @@ Legend:
 		src/core/os_mode.c
 		src/core/os_modinfo.c
 		src/core/os_modlist.c
-		src/core/os_modload.c
-		src/core/os_modunload.c
 		src/core/os_news.c
 		src/core/os_noop.c
 		src/core/os_oline.c
@@ -106,11 +104,8 @@ Legend:
 		src/core/os_session.c
 		src/core/os_set.c
 		src/core/os_sgline.c
-		src/core/os_shutdown.c
 		src/core/os_sqline.c
 		src/core/os_staff.c
-		src/core/os_stats.c
-		src/core/os_svsnick.c
 		src/core/os_szline.c
 		src/modules/cs_appendtopic.c
 		src/modules/cs_enforce.c
diff --git a/src/core/os_modload.c b/src/core/os_modload.c
index 050a3f8ba..328d89412 100644
--- a/src/core/os_modload.c
+++ b/src/core/os_modload.c
@@ -26,14 +26,7 @@ class CommandOSModLoad : public Command
 
 	CommandReturn Execute(User *u, std::vector<std::string> &params)
 	{
-		char *name;
-
-		name = strtok(NULL, "");
-		if (!name)
-		{
-			syntax_error(s_OperServ, u, "MODLOAD", OPER_MODULE_LOAD_SYNTAX);
-			return MOD_CONT;
-		}
+		const char *name = params[0].c_str();
 
 		Module *m = findModule(name);
 		if (m)
diff --git a/src/core/os_stats.c b/src/core/os_stats.c
index c8d8de86a..4c996e793 100644
--- a/src/core/os_stats.c
+++ b/src/core/os_stats.c
@@ -300,13 +300,13 @@ class CommandOSStats : public Command
 		}
 
 		if (!extra || (stricmp(extra, "MEMORY") && stricmp(extra, "UPLINK")))
-			return this->DoStatsUptime(u, params);
+			this->DoStatsUptime(u, params);
 
 		if (extra && (!stricmp(extra, "ALL") || !stricmp(extra, "UPLINK")) && is_services_admin(u))
-			return this->DoStatsUplink(u, params);
+			this->DoStatsUplink(u, params);
 
 		if (extra && (!stricmp(extra, "ALL") || !stricmp(extra, "MEMORY")) && is_services_admin(u))
-			return this->DoStatsMemory(u, params);
+			this->DoStatsMemory(u, params);
 
 		return MOD_CONT;
 	}