X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_mysql.cpp;h=465992d304578da9a7b916ad2e3cdb935970dfd3;hb=0da6b3a13def40e8fd002b9fc60f955467f6372d;hp=4fbf4f1f4a1331c95cf9ef3eddf98fb4e3abf638;hpb=59dbcc1245468218ec7e2372b2678351382a34f0;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_mysql.cpp b/src/modules/extra/m_mysql.cpp
index 4fbf4f1f4..465992d30 100644
--- a/src/modules/extra/m_mysql.cpp
+++ b/src/modules/extra/m_mysql.cpp
@@ -101,7 +101,7 @@ class ModuleSQL : public Module
 	 ~ModuleSQL();
 	 unsigned long NewID();
 	 const char* OnRequest(Request* request);
-	 void OnRehash(User* user, const std::string &parameter);
+	 void OnRehash(User* user);
 	 Version GetVersion();
 };
 
@@ -746,7 +746,7 @@ const char* ModuleSQL::OnRequest(Request* request)
 	return NULL;
 }
 
-void ModuleSQL::OnRehash(User* user, const std::string &parameter)
+void ModuleSQL::OnRehash(User* user)
 {
 	Dispatcher->LockQueue();
 	rehashing = true;
@@ -762,6 +762,8 @@ void DispatcherThread::Run()
 {
 	LoadDatabases(Parent->Conf, Parent->PublicServerInstance, Parent);
 
+	SQLConnection* conn = NULL;
+
 	this->LockQueue();
 	while (!this->GetExitFlag())
 	{
@@ -771,6 +773,7 @@ void DispatcherThread::Run()
 			LoadDatabases(Parent->Conf, Parent->PublicServerInstance, Parent);
 		}
 
+		conn = NULL;
 		Parent->ConnMutex.Lock();
 		for (ConnMap::iterator i = Connections.begin(); i != Connections.end(); i++)
 		{
@@ -804,9 +807,10 @@ void DispatcherThread::Run()
 
 void DispatcherThread::OnNotify()
 {
+	SQLConnection* conn;
 	while (1)
 	{
-		SQLConnection* conn = NULL;
+		conn = NULL;
 		Parent->ConnMutex.Lock();
 		for (ConnMap::iterator iter = Connections.begin(); iter != Connections.end(); iter++)
 		{