X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmodules%2Fextra%2Fm_pgsql.cpp;h=fb282fb98a5e35e3ae6d66d2e7e2fa5223c4a2a8;hb=b07868e77c0527642ed72bce84bf5895bf921e87;hp=1e8813e2e48e0eaab968158a6f49596dd8b616be;hpb=e4acbc95b8b6cd5b28d38a2242c02e8ff4991e4a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 1e8813e2e..fb282fb98 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -111,7 +111,7 @@ class SQLresolver : public Resolver
 
 	virtual void OnError(ResolverError e, const std::string &errormessage)
 	{
-		ServerInstance->Log(DEBUG, "PgSQL: DNS lookup failed (%s), dying horribly", errormessage.c_str());
+		ServerInstance->Logs->Log("m_pgsql",DEBUG, "PgSQL: DNS lookup failed (%s), dying horribly", errormessage.c_str());
 	}
 };
 
@@ -132,8 +132,8 @@ class PgSQLresult : public SQLresult
 	SQLfieldList* fieldlist;
 	SQLfieldMap* fieldmap;
 public:
-	PgSQLresult(Module* self, Module* to, unsigned long id, PGresult* result)
-	: SQLresult(self, to, id), res(result), currentrow(0), fieldlist(NULL), fieldmap(NULL)
+	PgSQLresult(Module* self, Module* to, unsigned long rid, PGresult* result)
+	: SQLresult(self, to, rid), res(result), currentrow(0), fieldlist(NULL), fieldmap(NULL)
 	{
 		rows = PQntuples(res);
 		cols = PQnfields(res);
@@ -219,9 +219,9 @@ public:
 
 		if(currentrow < PQntuples(res))
 		{
-			int cols = PQnfields(res);
+			int ncols = PQnfields(res);
 
-			for(int i = 0; i < cols; i++)
+			for(int i = 0; i < ncols; i++)
 			{
 				fieldlist->push_back(GetValue(currentrow, i));
 			}
@@ -248,9 +248,9 @@ public:
 
 		if(currentrow < PQntuples(res))
 		{
-			int cols = PQnfields(res);
+			int ncols = PQnfields(res);
 
-			for(int i = 0; i < cols; i++)
+			for(int i = 0; i < ncols; i++)
 			{
 				fieldmap->insert(std::make_pair(ColName(i), GetValue(currentrow, i)));
 			}
@@ -267,9 +267,9 @@ public:
 
 		if(currentrow < PQntuples(res))
 		{
-			int cols = PQnfields(res);
+			int ncols = PQnfields(res);
 
-			for(int i = 0; i < cols; i++)
+			for(int i = 0; i < ncols; i++)
 			{
 				fl->push_back(GetValue(currentrow, i));
 			}
@@ -286,9 +286,9 @@ public:
 
 		if(currentrow < PQntuples(res))
 		{
-			int cols = PQnfields(res);
+			int ncols = PQnfields(res);
 
-			for(int i = 0; i < cols; i++)
+			for(int i = 0; i < ncols; i++)
 			{
 				fm->insert(std::make_pair(ColName(i), GetValue(currentrow, i)));
 			}
@@ -331,7 +331,7 @@ class SQLConn : public EventHandler
 		idle = this->Instance->Time();
 		if(!DoConnect())
 		{
-			Instance->Log(DEFAULT, "WARNING: Could not connect to database with id: " + ConvToStr(hi.id));
+			Instance->Logs->Log("m_pgsql",DEFAULT, "WARNING: Could not connect to database with id: " + ConvToStr(hi.id));
 			DelayReconnect();
 		}
 	}
@@ -383,7 +383,7 @@ class SQLConn : public EventHandler
 
 		if (!this->Instance->SE->AddFd(this))
 		{
-			Instance->Log(DEBUG, "BUG: Couldn't add pgsql socket to socket engine");
+			Instance->Logs->Log("m_pgsql",DEBUG, "BUG: Couldn't add pgsql socket to socket engine");
 			return false;
 		}
 
@@ -621,7 +621,7 @@ class SQLConn : public EventHandler
 #endif
 							if(error)
 							{
-								Instance->Log(DEBUG, "BUG: Apparently PQescapeStringConn() failed somehow...don't know how or what to do...");
+								Instance->Logs->Log("m_pgsql",DEBUG, "BUG: Apparently PQescapeStringConn() failed somehow...don't know how or what to do...");
 							}
 
 							/* Incremenet queryend to the end of the newly escaped parameter */
@@ -632,7 +632,7 @@ class SQLConn : public EventHandler
 						}
 						else
 						{
-							Instance->Log(DEBUG, "BUG: Found a substitution location but no parameter to substitute :|");
+							Instance->Logs->Log("m_pgsql",DEBUG, "BUG: Found a substitution location but no parameter to substitute :|");
 							break;
 						}
 					}
@@ -698,7 +698,7 @@ class SQLConn : public EventHandler
 			}
 			else
 			{
-				Instance->Log(DEBUG, "BUG: PQsocket cant be removed from socket engine!");
+				Instance->Logs->Log("m_pgsql",DEBUG, "BUG: PQsocket cant be removed from socket engine!");
 			}
 		}
 
@@ -846,7 +846,7 @@ class ModulePgSQL : public Module
 			else
 			{
 				/* Invalid address family, die horribly. */
-				ServerInstance->Log(DEBUG, "BUG: insp_aton failed returning -1, oh noes.");
+				ServerInstance->Logs->Log("m_pgsql",DEBUG, "BUG: insp_aton failed returning -1, oh noes.");
 			}
 		}
 	}
@@ -880,7 +880,7 @@ class ModulePgSQL : public Module
 	{
 		if (HasHost(hi))
 		{
-			ServerInstance->Log(DEFAULT, "WARNING: A pgsql connection with id: %s already exists, possibly due to DNS delay. Aborting connection attempt.", hi.id.c_str());
+			ServerInstance->Logs->Log("m_pgsql",DEFAULT, "WARNING: A pgsql connection with id: %s already exists, possibly due to DNS delay. Aborting connection attempt.", hi.id.c_str());
 			return;
 		}
 
@@ -907,7 +907,7 @@ class ModulePgSQL : public Module
 		ServerInstance->Timers->AddTimer(retimer);
 	}
 
-	virtual char* OnRequest(Request* request)
+	virtual const char* OnRequest(Request* request)
 	{
 		if(strcmp(SQLREQID, request->GetId()) == 0)
 		{
@@ -954,7 +954,7 @@ class ModulePgSQL : public Module
 
 	virtual Version GetVersion()
 	{
-		return Version(1, 1, 0, 0, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
+		return Version(1, 2, 0, 0, VF_VENDOR|VF_SERVICEPROVIDER, API_VERSION);
 	}
 };