Changeset 2560

Timestamp:

04/11/12 12:40:41 (14 months ago)

Author:

peter

Message:

replace asprintf with boost::format. Improves portability and gets rid of two gcc warnings. Patch by Ruben d'Arco

Files:

• trunk/pdns/pdns/backends/gsql/gsqlbackend.cc (modified) (1 diff)

trunk/pdns/pdns/backends/gsql/gsqlbackend.cc

@@ -763 +763 @@
 bool GSQLBackend::feedRecord(const DNSResourceRecord &r)
 {
-  char *output;
+  string output;
   if(d_dnssecQueries) {
-    asprintf(&output, d_InsertRecordQuery.c_str(),
-      sqlEscape(r.content).c_str(),
-      r.ttl, r.priority,
-      sqlEscape(r.qtype.getName()).c_str(),
-      r.domain_id, toLower(sqlEscape(r.qname)).c_str(), (int)r.auth); 
-  }
-  else {
-    asprintf(&output, d_InsertRecordQuery.c_str(),
-      sqlEscape(r.content).c_str(),
-      r.ttl, r.priority,
-      sqlEscape(r.qtype.getName()).c_str(),
-      r.domain_id, toLower(sqlEscape(r.qname)).c_str()); 
+    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();
+  } 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();
   }
      
-     
-  try {
-    d_db->doCommand(output);
-    free(output);
-  }
-  catch (SSqlException &e) {
-    free(output);
+  try {
+    d_db->doCommand(output.c_str());
+  }
+  catch (SSqlException &e) {
     throw AhuException(e.txtReason());
   }