From: Kees Monshouwer <mind04@monshouwer.org>
Date: Wed, 1 Jan 2014 21:50:54 +0000 (+0100)
Subject: whitespace and comment changes goracle backend
X-Git-Tag: rec-3.6.0-rc1~274^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ee1e0857b17b74101926e592b98991ce0279eb6;p=pdns

whitespace and comment changes goracle backend
---

diff --git a/modules/goraclebackend/Makefile.am b/modules/goraclebackend/Makefile.am
index 42d4928ee..bb10cfa88 100644
--- a/modules/goraclebackend/Makefile.am
+++ b/modules/goraclebackend/Makefile.am
@@ -1,19 +1,9 @@
 AM_CPPFLAGS=$(ORACLE_CFLAGS) @THREADFLAGS@
 lib_LTLIBRARIES = libgoraclebackend.la
-#bin_PROGRAMS = soracle
-
-#soracle_SOURCES=soracle.cc soracle.hh 
 
 EXTRA_DIST=OBJECTFILES OBJECTLIBS
 
 libgoraclebackend_la_SOURCES=goraclebackend.cc goraclebackend.hh \
-		soracle.hh soracle.cc
-
+    soracle.hh soracle.cc
 
 libgoraclebackend_la_LDFLAGS=-module -avoid-version $(ORACLE_LIBS)
-#soracle_LDFLAGS=-module  -L$(ORACLE_HOME)/lib -lclient9  -lclntst9 -ldl -pthread
-
-#	-Wl,-Bstatic -lpq++ -lpq -Wl,-Bdynamic -lssl -lcrypt -lcrypto
-
-
-	
diff --git a/modules/goraclebackend/OBJECTFILES b/modules/goraclebackend/OBJECTFILES
index 59149cd85..4ea82a04c 100644
--- a/modules/goraclebackend/OBJECTFILES
+++ b/modules/goraclebackend/OBJECTFILES
@@ -1 +1 @@
-goraclebackend.lo soracle.lo
\ No newline at end of file
+goraclebackend.lo soracle.lo
diff --git a/modules/goraclebackend/goracle-schema.sql b/modules/goraclebackend/goracle-schema.sql
index 6ee48b21e..981cb84a4 100644
--- a/modules/goraclebackend/goracle-schema.sql
+++ b/modules/goraclebackend/goracle-schema.sql
@@ -1,12 +1,12 @@
 create table domains (
-	id              NUMBER,
-	name            VARCHAR(255) NOT NULL,
-	master          VARCHAR(128) DEFAULT NULL,
-	last_check      INT DEFAULT NULL,
-	type            VARCHAR(6) NOT NULL,
-	notified_serial INT DEFAULT NULL,
-	account         VARCHAR(40) DEFAULT NULL,
-	primary key (id)
+  id              NUMBER,
+  name            VARCHAR(255) NOT NULL,
+  master          VARCHAR(128) DEFAULT NULL,
+  last_check      INT DEFAULT NULL,
+  type            VARCHAR(6) NOT NULL,
+  notified_serial INT DEFAULT NULL,
+  account         VARCHAR(40) DEFAULT NULL,
+  primary key (id)
 );
 
 create sequence DOMAINS_ID_SEQUENCE;
@@ -14,17 +14,17 @@ create index DOMAINS$NAME on domains (NAME);
 
 
 CREATE TABLE records (
-	id              number(11) not NULL,
-	domain_id       INT DEFAULT NULL REFERENCES Domains(ID) ON DELETE CASCADE,
-	name            VARCHAR(255) DEFAULT NULL,
-	type            VARCHAR(10) DEFAULT NULL,
-	content         VARCHAR2(4000) DEFAULT NULL,
-	ttl             INT DEFAULT NULL,
-	prio            INT DEFAULT NULL,
-	change_date     INT DEFAULT NULL,
-	ordername       VARCHAR(255) DEFAULT NULL,
-	auth            INT DEFAULT NULL,
-	primary key (id)
+  id              number(11) not NULL,
+  domain_id       INT DEFAULT NULL REFERENCES Domains(ID) ON DELETE CASCADE,
+  name            VARCHAR(255) DEFAULT NULL,
+  type            VARCHAR(10) DEFAULT NULL,
+  content         VARCHAR2(4000) DEFAULT NULL,
+  ttl             INT DEFAULT NULL,
+  prio            INT DEFAULT NULL,
+  change_date     INT DEFAULT NULL,
+  ordername       VARCHAR(255) DEFAULT NULL,
+  auth            INT DEFAULT NULL,
+  primary key (id)
 ) pctfree 40;
 
 create index records$nametype on records (name, type);
@@ -34,19 +34,19 @@ create sequence records_id_sequence;
 
 
 create table supermasters (
-	ip              VARCHAR(64) NOT NULL,
-	nameserver      VARCHAR(255) NOT NULL,
-	account         VARCHAR(40) DEFAULT NULL,
-	PRIMARY KEY(ip, nameserver)
+  ip              VARCHAR(64) NOT NULL,
+  nameserver      VARCHAR(255) NOT NULL,
+  account         VARCHAR(40) DEFAULT NULL,
+  PRIMARY KEY(ip, nameserver)
 );
 
 
 create table domainmetadata (
-	id              NUMBER,
-	domain_id       INT NOT NULL,
-	kind            VARCHAR(16),
-	content         VARCHAR2(4000),
-	primary key(id)
+  id              NUMBER,
+  domain_id       INT NOT NULL,
+  kind            VARCHAR(16),
+  content         VARCHAR2(4000),
+  primary key(id)
 );
 
 create sequence DOMAINMETADATA_ID_SEQUENCE;
@@ -54,12 +54,12 @@ create index domainmetadata$domainid on domainmetadata(domain_id);
 
 
 create table cryptokeys (
-	id              NUMBER,
-	domain_id       INT NOT NULL,
-	flags           INT NOT NULL,
-	active          INT NOT NULL,
-	content         VARCHAR2(4000),
-	primary key(id)
+  id              NUMBER,
+  domain_id       INT NOT NULL,
+  flags           INT NOT NULL,
+  active          INT NOT NULL,
+  content         VARCHAR2(4000),
+  primary key(id)
 );
 
 create sequence CRYPTOKEYS_ID_SEQUENCE;
@@ -67,11 +67,11 @@ create index cryptokeys$domainid on cryptokeys(domain_id);
 
 
 create table tsigkeys (
-	id              NUMBER,
-	name            VARCHAR(255),
-	algorithm       VARCHAR(50),
-	secret          VARCHAR(255),
-	primary key(id)
+  id              NUMBER,
+  name            VARCHAR(255),
+  algorithm       VARCHAR(50),
+  secret          VARCHAR(255),
+  primary key(id)
 );
 
 create sequence TSIGKEYS_ID_SEQUENCE;
diff --git a/modules/goraclebackend/goraclebackend.cc b/modules/goraclebackend/goraclebackend.cc
index 94373a4ea..a63df2862 100644
--- a/modules/goraclebackend/goraclebackend.cc
+++ b/modules/goraclebackend/goraclebackend.cc
@@ -20,14 +20,14 @@ gOracleBackend::gOracleBackend(const string &mode, const string &suffix)  : GSQL
     setenv("ORACLE_HOME", getArg("home").c_str(), 1);
     setenv("ORACLE_SID", getArg("sid").c_str(), 1);
     setenv("NLS_LANG", getArg("nls-lang").c_str(), 1);
- 
+
     setDB(new SOracle(getArg("tnsname"),
-        	     getArg("user"),
-        	     getArg("password")));
-    
+                      getArg("user"),
+                      getArg("password")));
+
   }
 
-  catch(SSqlException &e) {
+  catch (SSqlException &e) {
     L<<Logger::Error<<mode<<" Connection failed: "<<e.txtReason()<<endl;
     throw PDNSException("Unable to launch "+mode+" connection: "+e.txtReason());
   }
@@ -39,8 +39,7 @@ class gOracleFactory : public BackendFactory
 public:
   gOracleFactory(const string &mode) : BackendFactory(mode),d_mode(mode) {}
 
-  void declareArguments(const string &suffix="")
-  {
+  void declareArguments(const string &suffix="") {
     declare(suffix,"home", "Oracle home path", "");
     declare(suffix,"sid", "Oracle sid", "XE");
     declare(suffix,"nls-lang", "Oracle language", "AMERICAN_AMERICA.AL32UTF8");
@@ -138,8 +137,7 @@ public:
     declare(suffix,"get-all-domains-query", "Retrieve all domains", "select records.domain_id, records.name, records.content, domains.type, domains.master, domains.notified_serial, domains.last_check from records, domains where records.domain_id=domains.id and records.type='SOA'");
   }
 
-  DNSBackend *make(const string &suffix="")
-  {
+  DNSBackend* make(const string &suffix="") {
     return new gOracleBackend(d_mode,suffix);
   }
 private:
@@ -152,8 +150,7 @@ class gOracleLoader
 {
 public:
   //! This reports us to the main UeberBackend class
-  gOracleLoader()
-  {
+  gOracleLoader() {
     BackendMakers().report(new gOracleFactory("goracle"));
     L<<Logger::Warning<<"This is module goraclebackend.so reporting"<<endl;
   }
diff --git a/modules/goraclebackend/soracle.cc b/modules/goraclebackend/soracle.cc
index 02de4124d..926f96dcd 100644
--- a/modules/goraclebackend/soracle.cc
+++ b/modules/goraclebackend/soracle.cc
@@ -1,4 +1,4 @@
-/* Copyright 2005 Netherlabs BV, bert.hubert@netherlabs.nl. See LICENSE 
+/* Copyright 2005 Netherlabs BV, bert.hubert@netherlabs.nl. See LICENSE
    for more information. */
 
 #include "soracle.hh"
@@ -20,59 +20,60 @@ string SOracle::getOracleError()
   if (d_errorHandle != NULL) {
     text  msg[512];
     sb4   errcode = 0;
-    
-    memset( msg, 0, 512);
-    
-    OCIErrorGet((dvoid *) d_errorHandle,1, NULL, &errcode, msg, sizeof(msg), OCI_HTYPE_ERROR);
+
+    memset(msg, 0, 512);
+
+    OCIErrorGet((dvoid*) d_errorHandle,1, NULL, &errcode, msg, sizeof(msg), OCI_HTYPE_ERROR);
     if (errcode) {
-      char *p = (char*) msg;
+      char* p = (char*) msg;
       while (*p++ != 0x00) {
         if (*p == '\n' || *p == '\r') {
           *p = ';';
         }
       }
-      
+
       mReason = (char*) msg;
     }
   }
   return mReason;
 }
 
-SOracle::SOracle(const string &database, 
-        	 const string &user, 
-        	 const string &password)
+SOracle::SOracle(const string &database,
+                 const string &user,
+                 const string &password)
 {
-   d_environmentHandle = NULL;
-   d_errorHandle = NULL;
-   d_serviceContextHandle = NULL;
-   d_handle = NULL;
-   
-   int err = OCIInitialize(OCI_THREADED, 0,  NULL, NULL, NULL);
-   if (err) {
-     throw sPerrorException("OCIInitialize");
-   }
-   
-   err = OCIEnvInit(&d_environmentHandle, OCI_DEFAULT, 0, 0);
-   if (err) {
-     throw sPerrorException("OCIEnvInit");
-   }
-  
-   // Allocate an error handle
-   
-   err = OCIHandleAlloc(d_environmentHandle, (dvoid**) &d_errorHandle, OCI_HTYPE_ERROR, 0, NULL);
-   if (err) {
-     throw sPerrorException("OCIHandleAlloc");
-   }
-  
-   // Logon to the database
-   
-   const char *username = user.c_str();
-
-   err = OCILogon(d_environmentHandle, d_errorHandle, &d_serviceContextHandle, (OraText*) username, strlen(username),
-        	  (OraText*) password.c_str(),  strlen(password.c_str()), (OraText*) database.c_str(), strlen(database.c_str()));
-   
-   if (err) 
-     throw sPerrorException("Loging in to Oracle gave error: " + getOracleError());
+  d_environmentHandle = NULL;
+  d_errorHandle = NULL;
+  d_serviceContextHandle = NULL;
+  d_handle = NULL;
+
+  int err = OCIInitialize(OCI_THREADED, 0,  NULL, NULL, NULL);
+  if (err) {
+    throw sPerrorException("OCIInitialize");
+  }
+
+  err = OCIEnvInit(&d_environmentHandle, OCI_DEFAULT, 0, 0);
+  if (err) {
+    throw sPerrorException("OCIEnvInit");
+  }
+
+  // Allocate an error handle
+
+  err = OCIHandleAlloc(d_environmentHandle, (dvoid**) &d_errorHandle, OCI_HTYPE_ERROR, 0, NULL);
+  if (err) {
+    throw sPerrorException("OCIHandleAlloc");
+  }
+
+  // Logon to the database
+
+  const char* username = user.c_str();
+
+  err = OCILogon(d_environmentHandle, d_errorHandle, &d_serviceContextHandle, (OraText*) username, strlen(username),
+                 (OraText*) password.c_str(),  strlen(password.c_str()), (OraText*) database.c_str(), strlen(database.c_str()));
+
+  if (err) {
+    throw sPerrorException("Loging in to Oracle gave error: " + getOracleError());
+  }
 }
 
 void SOracle::setLog(bool state)
@@ -82,24 +83,24 @@ void SOracle::setLog(bool state)
 
 SOracle::~SOracle()
 {
-  if(d_handle) {
+  if (d_handle) {
     OCIHandleFree(d_handle, OCI_HTYPE_STMT);
     d_handle=0;
   }
 
   int err;
   if (d_serviceContextHandle != NULL) {
-    err=OCILogoff(d_serviceContextHandle, d_errorHandle); 
-    if(err) {
+    err=OCILogoff(d_serviceContextHandle, d_errorHandle);
+    if (err) {
       cerr<<"Problems logging out: "+getOracleError()<<endl;
     }
   }
-   
+
   if (d_errorHandle != NULL) {
     OCIHandleFree(d_errorHandle, OCI_HTYPE_ERROR);
     d_errorHandle = NULL;
   }
-  
+
   if (d_environmentHandle != NULL) {
     OCIHandleFree(d_environmentHandle, OCI_HTYPE_ENV);
     d_environmentHandle = NULL;
@@ -122,52 +123,56 @@ int SOracle::doCommand(const string &query)
   return retval;
 }
 
-int getNumFields(const string& query)
+int getNumFields(const string &query)
 {
   string lquery=toLower(query);
-  const char* delim[]={" from ", "\tfrom\t", "\tfrom ", " from\t", 0};
+  const char* delim[]= {" from ", "\tfrom\t", "\tfrom ", " from\t", 0};
   int n=0;
   string::size_type pos;
-  for(n=0; delim[n] && (pos=lquery.find(delim[n]))==string::npos; ++n)
+  for (n=0; delim[n] && (pos=lquery.find(delim[n]))==string::npos; ++n)
     ;
 
-  if(!delim[n])
+  if (!delim[n]) {
     return -1;
+  }
 
   unsigned int num=1;
 
-  for(unsigned int n=0; n < pos; ++n)
-    if(lquery[n]==',')
+  for (unsigned int n=0; n < pos; ++n)
+    if (lquery[n]==',') {
       num++;
+    }
 
   return num;
 }
 
 int SOracle::doQuery(const string &query)
 {
-  if(query=="begin") // oracle does this implicitly
+  if (query=="begin") { // oracle does this implicitly
     return 0;
+  }
 
-  if(s_dolog)
+  if (s_dolog) {
     L<<Logger::Warning<<"Query: "<<query<<endl;
+  }
+
+  int err = OCIHandleAlloc(d_environmentHandle, (dvoid**) &d_handle, OCI_HTYPE_STMT, 0, NULL);
 
-  int err = OCIHandleAlloc(d_environmentHandle, (dvoid **) &d_handle, OCI_HTYPE_STMT, 0, NULL);
-         
   if (err) {
     throw sPerrorException("Allocating a query handle: "+getOracleError());
   }
 
   err = OCIStmtPrepare(d_handle, d_errorHandle, (text*) query.c_str(), strlen(query.c_str()),
-        	       OCI_NTV_SYNTAX, OCI_DEFAULT);
-  
+                       OCI_NTV_SYNTAX, OCI_DEFAULT);
+
   if (err) {
     throw sPerrorException("Preparing statement: "+getOracleError());
   }
 
   ub4 prefetch=1000;
   err=OCIAttrSet(d_handle, (ub4) OCI_HTYPE_STMT,
-             (dvoid *) &prefetch, (ub4) sizeof(ub4), 
-             (ub4) OCI_ATTR_PREFETCH_ROWS, d_errorHandle);
+                 (dvoid*) &prefetch, (ub4) sizeof(ub4),
+                 (ub4) OCI_ATTR_PREFETCH_ROWS, d_errorHandle);
 
   if (err) {
     throw sPerrorException("setting prefetch: "+getOracleError());
@@ -178,12 +183,12 @@ int SOracle::doQuery(const string &query)
 
   d_numfields=getNumFields(query);
 
-  for(int n=0; n < d_numfields ; ++n) {
+  for (int n=0; n < d_numfields ; ++n) {
     //    cerr<<"bind: "<<n<<endl;
-    OCIDefine *theDefineHandle = NULL; 
+    OCIDefine* theDefineHandle = NULL;
     err = OCIDefineByPos(d_handle, &theDefineHandle, d_errorHandle, n+1, d_fields[n].content,
-        		 sizeof(d_fields[n].content) - 1, SQLT_STR, (dvoid*) &d_fields[n].indicator, NULL, NULL, OCI_DEFAULT);
-    
+                         sizeof(d_fields[n].content) - 1, SQLT_STR, (dvoid*) &d_fields[n].indicator, NULL, NULL, OCI_DEFAULT);
+
     if (err) {
       throw sPerrorException("Error binding returns: "+getOracleError());
     }
@@ -192,8 +197,8 @@ int SOracle::doQuery(const string &query)
   //  cerr<<"Done binding fields"<<endl;
 
   d_queryResult = OCIStmtExecute(d_serviceContextHandle, d_handle, d_errorHandle, 1, 0,
-        			 (OCISnapshot *)NULL, (OCISnapshot*) NULL, OCI_DEFAULT);
-  
+                                 (OCISnapshot*)NULL, (OCISnapshot*) NULL, OCI_DEFAULT);
+
   if (d_queryResult != OCI_SUCCESS && d_queryResult != OCI_SUCCESS_WITH_INFO && d_queryResult != OCI_NO_DATA) {
     throw sPerrorException("executing oracle query: "+getOracleError());
   }
@@ -211,8 +216,9 @@ int SOracle::doQuery(const string &query, result_t &result)
   doQuery(query);
 
   row_t row;
-  while(getRow(row))
+  while (getRow(row)) {
     result.push_back(row);
+  }
 
   return result.size();
 }
@@ -225,20 +231,20 @@ bool SOracle::getRow(row_t &row)
     OCIHandleFree(d_handle, OCI_HTYPE_STMT);
     d_handle=0;
     return false;
-  }
-  else {
-    for(int n=0;n < d_numfields ;++n)
-      if(!d_fields[n].indicator)
+  } else {
+    for (int n=0; n < d_numfields ; ++n)
+      if (!d_fields[n].indicator) {
         row.push_back(d_fields[n].content);
-      else
+      } else {
         row.push_back("");
+      }
   }
 
   d_queryResult = OCIStmtFetch(d_handle, d_errorHandle, 1, 0, 0);
   if (d_queryResult != OCI_SUCCESS && d_queryResult != OCI_SUCCESS_WITH_INFO && d_queryResult != OCI_NO_DATA) {
     throw sPerrorException("fetching next row of oracle query: "+getOracleError());
   }
-  
+
 
   return true;
 }
@@ -247,9 +253,10 @@ string SOracle::escape(const string &name)
 {
   string a;
 
-  for(string::const_iterator i=name.begin();i!=name.end();++i) {
-    if(*i=='\\' || *i=='\'')
+  for (string::const_iterator i=name.begin(); i!=name.end(); ++i) {
+    if (*i=='\\' || *i=='\'') {
       a+='\\';
+    }
     a+=*i;
   }
   return a;
@@ -257,37 +264,37 @@ string SOracle::escape(const string &name)
 
 #if 0
 
-int main(int argc, char **argv)
+int main(int argc, char** argv)
 {
-  for(int outer=0;outer<2; ++outer) {
-  try {
-    SOracle s(argv[1],"",0,"",argv[2],argv[3]);
-
-    cerr<<"Ready to do queries"<<endl;
-    time_t then=time(0);
-    
-    int loops;
-    for(loops=0;loops < 6; ++loops) {
-      s.doQuery("select id, content from records");
-      
-      SSql::row_t row;
-      
-      while(s.getRow(row)) {
-        for(SSql::row_t::const_iterator j=row.begin();j!=row.end();++j)
-          cout <<"'"<< *j<<"', ";
-        cout<<"\n";
+  for (int outer=0; outer<2; ++outer) {
+    try {
+      SOracle s(argv[1],"",0,"",argv[2],argv[3]);
+
+      cerr<<"Ready to do queries"<<endl;
+      time_t then=time(0);
+
+      int loops;
+      for (loops=0; loops < 6; ++loops) {
+        s.doQuery("select id, content from records");
+
+        SSql::row_t row;
+
+        while (s.getRow(row)) {
+          for (SSql::row_t::const_iterator j=row.begin(); j!=row.end(); ++j) {
+            cout <<"'"<< *j<<"', ";
+          }
+          cout<<"\n";
+        }
+      }
+      time_t spent=time(0)-then;
+      if (spent) {
+        cerr<<"Loops per second: "<< loops/spent<<endl;
       }
+    } catch (string &e) {
+      cerr<<"fatal: "<<e<<endl;
+    } catch (SSqlException &e) {
+      cerr<<e.txtReason()<<endl;
     }
-    time_t spent=time(0)-then;
-    if(spent)
-      cerr<<"Loops per second: "<< loops/spent<<endl;
-  }
-  catch(string &e) {
-    cerr<<"fatal: "<<e<<endl;
-  }
-  catch(SSqlException &e) {
-    cerr<<e.txtReason()<<endl;
-  }
   }
 }
 
diff --git a/modules/goraclebackend/soracle.hh b/modules/goraclebackend/soracle.hh
index 70034674a..4c9579a8c 100644
--- a/modules/goraclebackend/soracle.hh
+++ b/modules/goraclebackend/soracle.hh
@@ -1,11 +1,11 @@
-/* Copyright 2005 Netherlabs BV, bert.hubert@netherlabs.nl. See LICENSE 
+/* Copyright 2005 Netherlabs BV, bert.hubert@netherlabs.nl. See LICENSE
    for more information. */
 
 #ifndef SORACLE_HH
 #define SORACLE_HH
 
 #include "pdns/backends/gsql/ssql.hh"
-#include "pdns/utility.hh" 
+#include "pdns/utility.hh"
 #include <oci.h>
 
 #ifndef dsword
@@ -15,27 +15,27 @@ typedef sb4 dsword;
 class SOracle : public SSql
 {
 public:
-  SOracle(const string &database, 
-          const string &user="", 
+  SOracle(const string &database,
+          const string &user="",
           const string &password="");
-  
+
   ~SOracle();
-  
+
   SSqlException sPerrorException(const string &reason);
   int doQuery(const string &query, result_t &result);
   int doQuery(const string &query);
   int doCommand(const string &query);
   bool getRow(row_t &row);
-  string escape(const string &str);    
+  string escape(const string &str);
   void setLog(bool state);
 private:
-  OCIEnv    *d_environmentHandle;
-  OCIError  *d_errorHandle;
-  OCISvcCtx *d_serviceContextHandle;
-  OCIStmt   *d_statementHandles[10];
+  OCIEnv*    d_environmentHandle;
+  OCIError*  d_errorHandle;
+  OCISvcCtx* d_serviceContextHandle;
+  OCIStmt*   d_statementHandles[10];
 
   struct oresult {
-  char content[4000];
+    char content[4000];
     sb2 indicator;
   } d_fields[10];
   OCIStmt* d_handle;
@@ -48,5 +48,5 @@ private:
   int d_numfields;
   //  int getNumFields(const string& query);
 };
-      
+
 #endif /* SSORACLE_HH */