From 6ffca6b9565b04aa9a4ffb83732d2c077dfc681d Mon Sep 17 00:00:00 2001
From: aquanight
Date: Tue, 12 Feb 2008 01:42:11 +0000
Subject: -Wshadow fixes for some modules in extra/

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8907 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/modules/extra/m_pgsql.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/modules/extra/m_pgsql.cpp')

diff --git a/src/modules/extra/m_pgsql.cpp b/src/modules/extra/m_pgsql.cpp
index 1e8813e2e..8320c9408 100644
--- a/src/modules/extra/m_pgsql.cpp
+++ b/src/modules/extra/m_pgsql.cpp
@@ -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)));
 			}
-- 
cgit v1.3.1-10-gc9f91