From: Chris Hofstaedtler <chris.hofstaedtler@deduktiva.com>
Date: Fri, 13 Dec 2019 09:39:14 +0000 (+0100)
Subject: gpgsqlbackend: remove d_nstatement
X-Git-Tag: auth-4.3.0-beta1~16^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eeac461851e7cae4657593e34a222d7d7fa03950;p=thirdparty%2Fpdns.git

gpgsqlbackend: remove d_nstatement
---

diff --git a/modules/gpgsqlbackend/spgsql.cc b/modules/gpgsqlbackend/spgsql.cc
index 43c487214f..7ca9d42230 100644
--- a/modules/gpgsqlbackend/spgsql.cc
+++ b/modules/gpgsqlbackend/spgsql.cc
@@ -35,7 +35,7 @@
 class SPgSQLStatement: public SSqlStatement
 {
 public:
-  SPgSQLStatement(const string& query, bool dolog, int nparams, SPgSQL* db, unsigned int nstatement) {
+  SPgSQLStatement(const string& query, bool dolog, int nparams, SPgSQL* db) {
     d_query = query;
     d_dolog = dolog;
     d_parent = db;
@@ -45,7 +45,6 @@ public:
     d_res_set = NULL;
     paramValues = NULL;
     paramLengths = NULL;
-    d_nstatement = nstatement;
     d_paridx = 0;
     d_residx = 0;
     d_resnum = 0;
@@ -243,7 +242,6 @@ private:
   int d_resnum;
   int d_fnum;
   int d_cur_set;
-  unsigned int d_nstatement;
 };
 
 bool SPgSQL::s_dolog;
@@ -254,7 +252,6 @@ SPgSQL::SPgSQL(const string &database, const string &host, const string& port, c
   d_db=0;
   d_in_trx = false;
   d_connectstr="";
-  d_nstatement = 0;
 
   if (!database.empty())
     d_connectstr+="dbname="+database;
@@ -321,8 +318,7 @@ void SPgSQL::execute(const string& query)
 
 std::unique_ptr<SSqlStatement> SPgSQL::prepare(const string& query, int nparams)
 {
-  d_nstatement++;
-  return std::unique_ptr<SSqlStatement>(new SPgSQLStatement(query, s_dolog, nparams, this, d_nstatement));
+  return std::unique_ptr<SSqlStatement>(new SPgSQLStatement(query, s_dolog, nparams, this));
 }
 
 void SPgSQL::startTransaction() {
diff --git a/modules/gpgsqlbackend/spgsql.hh b/modules/gpgsqlbackend/spgsql.hh
index 35631e45df..91720e08c5 100644
--- a/modules/gpgsqlbackend/spgsql.hh
+++ b/modules/gpgsqlbackend/spgsql.hh
@@ -55,7 +55,6 @@ private:
   string d_connectlogstr;
   static bool s_dolog;
   bool d_in_trx;
-  unsigned int d_nstatement;
 };
 
 #endif /* SPGSQL_HH */