Merge do_restart_services and services_restart().

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@2445 5417fbe8-f217-4b02-8779-1006273d7864

1 files changed, 5 insertions, 16 deletions

diff --git a/src/main.c b/src/main.c
index 5b6ef9091..a8ee4aeb1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -157,9 +157,12 @@ void save_databases()
 /*************************************************************************/
 
 /* Restarts services */
-
-static void services_restart()
+void do_restart_services()
 {
+	if (!readonly) {
+		expire_all();
+		save_databases();
+	}
 	alog("Restarting");
 
 	FOREACH_MOD(I_OnPreRestart, OnPreRestart());
@@ -179,20 +182,6 @@ static void services_restart()
 		log_perror("Restart failed");
 		close_log();
 	}
-}
-
-/*************************************************************************/
-/**
- * Added to allow do_restart from operserv access to the static functions without making them
- * fair game to every other function - not exactly ideal :|
- **/
-void do_restart_services()
-{
-	if (!readonly) {
-		expire_all();
-		save_databases();
-	}
-	services_restart();
 	exit(1);
 }