From: Christian Hofstaedtler <christian@hofstaedtler.name>
Date: Fri, 31 Jan 2014 14:56:30 +0000 (+0100)
Subject: gsqlbackend: reformat feedRecord
X-Git-Tag: rec-3.6.0-rc1~210^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34f5db798d27df8b258fa64c4411b9f67808d5c3;p=thirdparty%2Fpdns.git

gsqlbackend: reformat feedRecord

Those boost::format() calls with everything in one line are a pain
to read.
---

diff --git a/pdns/backends/gsql/gsqlbackend.cc b/pdns/backends/gsql/gsqlbackend.cc
index 04aad3a062..c1405507d5 100644
--- a/pdns/backends/gsql/gsqlbackend.cc
+++ b/pdns/backends/gsql/gsqlbackend.cc
@@ -1077,18 +1077,42 @@ bool GSQLBackend::replaceRRSet(uint32_t domain_id, const string& qname, const QT
 
 bool GSQLBackend::feedRecord(const DNSResourceRecord &r, string *ordername)
 {
-  string output;
+  string query;
   if(d_dnssecQueries) {
     if(ordername)
-      output = (boost::format(d_InsertRecordOrderQuery) % sqlEscape(r.content) % r.ttl % r.priority % sqlEscape(r.qtype.getName()) % r.domain_id % toLower(sqlEscape(r.qname)) % sqlEscape(*ordername) % (int)r.auth).str();
+      query = (boost::format(d_InsertRecordOrderQuery)
+               % sqlEscape(r.content)
+               % r.ttl
+               % r.priority
+               % sqlEscape(r.qtype.getName())
+               % r.domain_id
+               % toLower(sqlEscape(r.qname))
+               % sqlEscape(*ordername)
+               % (int)r.auth
+        ).str();
     else
-      output = (boost::format(d_InsertRecordQuery) % sqlEscape(r.content) % r.ttl % r.priority % sqlEscape(r.qtype.getName()) % r.domain_id % toLower(sqlEscape(r.qname)) % (int)r.auth).str();
+      query = (boost::format(d_InsertRecordQuery)
+               % sqlEscape(r.content)
+               % r.ttl
+               % r.priority
+               % sqlEscape(r.qtype.getName())
+               % r.domain_id
+               % toLower(sqlEscape(r.qname))
+               % (int)r.auth
+        ).str();
   } else {
-    output = (boost::format(d_InsertRecordQuery) % sqlEscape(r.content) % r.ttl % r.priority % sqlEscape(r.qtype.getName()) % r.domain_id % toLower(sqlEscape(r.qname))).str();
+    query = (boost::format(d_InsertRecordQuery)
+             % sqlEscape(r.content)
+             % r.ttl
+             % r.priority
+             % sqlEscape(r.qtype.getName())
+             % r.domain_id
+             % toLower(sqlEscape(r.qname))
+      ).str();
   }
 
   try {
-    d_db->doCommand(output.c_str());
+    d_db->doCommand(query);
   }
   catch (SSqlException &e) {
     throw PDNSException("GSQLBackend unable to feed record: "+e.txtReason());